You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by cb...@apache.org on 2012/03/09 10:38:48 UTC

svn commit: r1298769 - in /xmlgraphics/site/src/documentation: content/xdocs/charter.xml content/xdocs/index.xml content/xdocs/legal.xml content/xdocs/mail.xml content/xdocs/repo.xml content/xdocs/site.xml content/xdocs/team.xml skinconf.xml

Author: cbowditch
Date: Fri Mar  9 09:38:47 2012
New Revision: 1298769

URL: http://svn.apache.org/viewvc?rev=1298769&view=rev
Log:
Make sure Apache™ is used on main site
Add link to Security page
Update year
Remove Apachecon 2011

Modified:
    xmlgraphics/site/src/documentation/content/xdocs/charter.xml
    xmlgraphics/site/src/documentation/content/xdocs/index.xml
    xmlgraphics/site/src/documentation/content/xdocs/legal.xml
    xmlgraphics/site/src/documentation/content/xdocs/mail.xml
    xmlgraphics/site/src/documentation/content/xdocs/repo.xml
    xmlgraphics/site/src/documentation/content/xdocs/site.xml
    xmlgraphics/site/src/documentation/content/xdocs/team.xml
    xmlgraphics/site/src/documentation/skinconf.xml

Modified: xmlgraphics/site/src/documentation/content/xdocs/charter.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/charter.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/charter.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/charter.xml Fri Mar  9 09:38:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>The Apache XML Graphics Project Charter</title> 
+    <title>The Apache™ XML Graphics Project Charter</title> 
     <notice></notice>
     <abstract></abstract> 
   </header> 
@@ -28,7 +28,7 @@
 1 INTRODUCTION
 ==============
 
-1.1 Apache XML Graphics is a collaborative software development project 
+1.1 Apache™ XML Graphics is a collaborative software development project 
 dedicated to providing robust, full-featured, commercial-quality, and freely 
 available software packages for the conversion of XML to graphical output and 
 for related components. This project is managed in cooperation with various 

Modified: xmlgraphics/site/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/index.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/index.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/index.xml Fri Mar  9 09:38:47 2012
@@ -18,13 +18,13 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>xmlgraphics.apache.org</title> 
+    <title>Apache™ XML Graphics</title> 
   </header> 
   <body> 
     <section>
-      <title>Welcome to the Apache XML Graphics Project</title>
-      <p>The <em>Apache XML Graphics Project</em> is responsible for software
-        licensed to the <a href="http://www.apache.org/">Apache Software Foundation</a>
+      <title>Welcome to the Apache™ XML Graphics Project</title>
+      <p>The <em>Apache™ XML Graphics Project</em> is responsible for software
+        licensed to the <a href="http://www.apache.org/">Apache™ Software Foundation</a>
         intended for the creation &amp; maintenance of:</p>
         <ul>
           <li>the conversion of XML formats to graphical output</li>
@@ -32,15 +32,15 @@
         </ul>
     </section>
     <section>
-      <title>Apache XML Graphics Project - Current Projects</title>
-      <p>The <em>Apache XML Graphics Project</em> currently consists of the following sub-projects, each focused on a different aspect of XML Graphics:</p>
+      <title>Apache™ XML Graphics Project - Current Projects</title>
+      <p>The <em>Apache™ XML Graphics Project</em> currently consists of the following sub-projects, each focused on a different aspect of XML Graphics:</p>
       <ul>
-        <li><em><a href="ext:batik">Apache Batik</a></em> - A toolkit for Scalable Vector Graphics (SVG), based in Java</li>
-        <li><em><a href="ext:fop">Apache FOP</a></em> - A print formatter &amp; renderer for XSL-FO (FO=formatting objects), based in Java</li>
-        <li><em><a href="ext:commons">Apache XML Graphics Commons</a></em> - A library with various components used by Apache Batik and Apache FOP, written in Java</li>
+        <li><em><a href="ext:batik">Apache™ Batik</a></em> - A toolkit for Scalable Vector Graphics (SVG), based in Java</li>
+        <li><em><a href="ext:fop">Apache™ FOP</a></em> - A print formatter &amp; renderer for XSL-FO (FO=formatting objects), based in Java</li>
+        <li><em><a href="ext:commons">Apache™ XML Graphics Commons</a></em> - A library with various components used by Apache Batik and Apache FOP, written in Java</li>
       </ul>
       <section id="batik">
-        <title>Apache Batik: a Java-based SVG toolkit </title>
+        <title>Apache™ Batik: a Java-based SVG toolkit </title>
         <p>Batik is a Java(tm) technology based toolkit for applications  or applets that want to use images in the <a href="http://www.w3.org/TR/SVG/">Scalable Vector Graphics (SVG)</a> format for various purposes, such as viewing, generation or manipulation.
         </p>
         <p>
@@ -50,11 +50,11 @@
           <li>the <a href="http://xmlgraphics.apache.org/batik/svggen.html">SVG Generator</a></li>
           <li>the <a href="http://xmlgraphics.apache.org/batik/domapi.html">SVG DOM</a></li>
         </ul>
-        <p>Another ambition for the Batik project is to make it highly <a href="http://xmlgraphics.apache.org/batik/extendingBatik.html">extensible</a> (for example, Batik allows the developer to handle custom SVG tags). Even though the goal of the project is to provide a set of core modules, one of the deliverables is a full fledged <a href="http://xmlgraphics.apache.org/batik/svgviewer.html">SVG Browser</a> implementation, which validates the various modules and their inter-operability.</p>
+        <p>Another ambition for the Apache™ Batik project is to make it highly <a href="http://xmlgraphics.apache.org/batik/extendingBatik.html">extensible</a> (for example, Batik allows the developer to handle custom SVG tags). Even though the goal of the project is to provide a set of core modules, one of the deliverables is a full fledged <a href="http://xmlgraphics.apache.org/batik/svgviewer.html">SVG Browser</a> implementation, which validates the various modules and their inter-operability.</p>
         <p>Find out more about <a href="ext:batik">Apache Batik</a>.</p>
       </section>
       <section id="fop">
-        <title>Apache FOP: a Java-based XSL-FO (Formatting Objects) processor</title>
+        <title>Apache™ FOP: a Java-based XSL-FO (Formatting Objects) processor</title>
         <p>FOP (Formatting Objects Processor) is the world's first print formatter driven by <a href="http://www.w3.org/TR/xsl/">XSL formatting objects (XSL-FO)</a> and the world's first output independent formatter. It is a  Java application that reads a formatting object (FO) tree and  renders the resulting pages to a specified output. The primary output target is PDF but other <a href="http://xmlgraphics.apache.org/fop/output.html">output formats</a> currently supported include:</p>
         <ul>
           <li>PDF (Portable Document Format)</li>
@@ -72,16 +72,16 @@
         <p>Find out more about <a href="ext:fop">Apache FOP</a>.</p>
       </section>
       <section id="commons">
-        <title>Apache XML Graphics Commons</title>
+        <title>Apache™ XML Graphics Commons</title>
         <p>
-          Apache XML Graphics Commons is a library that consists of several reusable components 
+          Apache™ XML Graphics Commons is a library that consists of several reusable components 
           used by Apache Batik and Apache FOP. Many of these components can easily be used 
           separately outside the domains of SVG and XSL-FO. You'll find components such as a PDF
           library, an RTF library, Graphics2D implementations that let you generate PDF and 
           PostScript files and much more.
         </p>
         <p>
-          Apache XML Graphics Commons has only just started. It's in the process of being
+          Apache™ XML Graphics Commons has only just started. It's in the process of being
           populated with components coming from Apache Batik and Apache FOP. Stay tuned for
           exciting treasures made available.
         </p>
@@ -89,7 +89,7 @@
           In the Wiki, we have a <a href="http://wiki.apache.org/xmlgraphics/XmlGraphicsCommonComponents">plan for building Apache XML Graphics Commons</a>.
           The plan will give you an idea of what you can expect to find here when we're finished migrating components.
         </p>
-        <p>Find out more about <a href="ext:commons">Apache XML Graphics Commons</a>.</p>
+        <p>Find out more about <a href="ext:commons">Apache™ XML Graphics Commons</a>.</p>
       </section>
     </section>
   </body>

Modified: xmlgraphics/site/src/documentation/content/xdocs/legal.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/legal.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/legal.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/legal.xml Fri Mar  9 09:38:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>The Apache XML Graphics Project - Legal Stuff</title> 
+    <title>The Apache™ XML Graphics Project - Legal Stuff</title> 
     <notice></notice>
     <abstract></abstract> 
   </header> 

Modified: xmlgraphics/site/src/documentation/content/xdocs/mail.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/mail.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/mail.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/mail.xml Fri Mar  9 09:38:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>The Apache XML Graphics Project - Mailing Lists</title>
+    <title>The Apache™ XML Graphics Project - Mailing Lists</title>
   </header>
   <body>
     <p>

Modified: xmlgraphics/site/src/documentation/content/xdocs/repo.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/repo.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/repo.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/repo.xml Fri Mar  9 09:38:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,26 +18,26 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>The Apache XML Graphics Project - Code Repositories</title> 
+    <title>The Apache™ XML Graphics Project - Code Repositories</title> 
   </header> 
   <body> 
 
     <section id="web-access">
       <title>Web Access to the Repositories</title>
-      <p>The Apache XML Graphics project uses Subversion (SVN) as version control tool.</p>
+      <p>The Apache™ XML Graphics project uses Subversion (SVN) as version control tool.</p>
       <p>You can browse the repositories belonging to the XML Graphics project via the web:</p>
       <ul>
         <li>
-          Apache Batik: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/batik/">http://svn.apache.org/viewvc/xmlgraphics/batik/</a> (SVN repository)
+          Apache™ Batik: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/batik/">http://svn.apache.org/viewvc/xmlgraphics/batik/</a> (SVN repository)
         </li>
         <li>
-          Apache FOP: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/fop/">http://svn.apache.org/viewvc/xmlgraphics/fop/</a> (SVN repository)
+          Apache™ FOP: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/fop/">http://svn.apache.org/viewvc/xmlgraphics/fop/</a> (SVN repository)
         </li>
         <li>
-          Apache XML Graphics Commons: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/commons/">http://svn.apache.org/viewvc/xmlgraphics/commons/</a> (SVN repository)
+          Apache™ XML Graphics Commons: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/commons/">http://svn.apache.org/viewvc/xmlgraphics/commons/</a> (SVN repository)
         </li>
         <li>
-          Apache XML Graphics Site: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/site/">http://svn.apache.org/viewvc/xmlgraphics/site/</a> (SVN repository)
+          Apache™ XML Graphics Site: <a class="fork" href="http://svn.apache.org/viewvc/xmlgraphics/site/">http://svn.apache.org/viewvc/xmlgraphics/site/</a> (SVN repository)
         </li>
       </ul>
     </section>

Modified: xmlgraphics/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/site.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/site.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/site.xml Fri Mar  9 09:38:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -32,19 +32,20 @@ See http://forrest.apache.org/docs/linki
 
 <site label="XMLGraphics" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
 
-  <about label="XML Graphics">
+  <about label="Apache™ XML Graphics">
     <index label="Overview" href="index.html" description="Welcome to the Apache XML Graphics Project"/>
     <team label="Who We Are" href="team.html" description="The Apache XML Graphics Project Team"/>
     <legal label="Legal Stuff" href="legal.html" description="Legalities"/>
     <charter label="Project Charter" href="charter.html" description="The Project Charter"/>
     <mail label="Mailing Lists" href="mail.html" description="Information on Mailing Lists"/>
     <repo label="Code Repositories" href="repo.html" description="Information on Code Repositories"/>
-    <asf-sponsorship label="ASF Sponsorship Program" href="http://www.apache.org/foundation/sponsorship.html"/>"
-    <asf-thanks label="ASF Thanks" href="http://www.apache.org/foundation/thanks.html"/>"
+    <asf-sponsorship label="ASF Sponsorship Program" href="http://www.apache.org/foundation/sponsorship.html"/>
+    <asf-thanks label="ASF Thanks" href="http://www.apache.org/foundation/thanks.html"/>
+	<asf-security label="Security" href="http://www.apache.org/security/"/>
     <subprojects label="Subprojects">
-      <batik label="Batik" href="ext:batik" description="Apache Batik - SVG Implementation"/>
-      <fop label="FOP" href="ext:fop" description="Apache FOP - XSL-FO Implementation"/>
-      <commons label="Commons" href="ext:commons" description="Apache XML Graphics Commons"/>
+      <batik label="Apache™ Batik" href="ext:batik" description="Apache™ Batik - SVG Implementation"/>
+      <fop label="Apache™ FOP" href="ext:fop" description="Apache™ FOP - XSL-FO Implementation"/>
+      <commons label="Apache™ XML Graphics Commons" href="ext:commons" description="Apache™ XML Graphics Commons"/>
     </subprojects>
   </about>
 

Modified: xmlgraphics/site/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/content/xdocs/team.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/site/src/documentation/content/xdocs/team.xml Fri Mar  9 09:38:47 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>The Apache XML Graphics Project - Community</title> 
+    <title>The Apache™ XML Graphics Project - Community</title> 
     <notice></notice>
     <abstract></abstract> 
   </header> 
@@ -27,7 +27,7 @@
     <section id="WhoWeAre">
       <title>Who We Are</title>
       <p>
-        The <em>Apache XML Graphics Project</em> operates on a meritocracy: the more you do, 
+        The <em>Apache™ XML Graphics Project</em> operates on a meritocracy: the more you do, 
         the more responsibility you can obtain. This page lists all of the people who have gone the 
         extra mile and are Committers or members of the Project Management Committee. If you would 
         like to get involved, the first step is to join the <a href="mail.html">community mailing lists</a>
@@ -35,7 +35,7 @@
     </section>
 
     <section id="PMC">
-      <title>Apache XML Graphics Project - Project Management Committee</title>
+      <title>Apache™ XML Graphics Project - Project Management Committee</title>
         <ul>
           <li><a href="mailto:bowditch_chris@hotmail.com">Chris Bowditch</a></li>
           <li><a href="mailto:acumiskey@apache.org">Adrian Cumiskey</a></li>
@@ -56,7 +56,7 @@
           </ul>
         </section>
         <note>
-          If you need to get into contact with the Apache XML Graphics PMC and require confidentiality,
+          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>.
           Otherwise, please send your mail to <a href="mailto:general@xmlgraphics.apache.org"><code>general@xmlgraphics.apache.org</code></a>.
           If you want to ask a question about one of the XML Graphics projects's products, please send your mail

Modified: xmlgraphics/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/src/documentation/skinconf.xml?rev=1298769&r1=1298768&r2=1298769&view=diff
==============================================================================
--- xmlgraphics/site/src/documentation/skinconf.xml (original)
+++ xmlgraphics/site/src/documentation/skinconf.xml Fri Mar  9 09:38:47 2012
@@ -91,7 +91,7 @@ See main/fresh-site/src/documentation/sk
   <favicon-url>favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2004-2011</year>
+  <year>2004-2012</year>
   <vendor>The Apache Software Foundation. Licensed under Apache License 2.0</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
 <!-- Optional text trademark statement below the copyright statement -->
@@ -365,13 +365,7 @@ See main/fresh-site/src/documentation/sk
       <height>125</height>
     </credit>
     -->
-    <credit box-location="alt2">
-      <name>ApacheCon NA 2011</name>
-      <url>http://www.apachecon.com/</url>
-      <image>http://apache.org/ads/ApacheCon/2011-na-125x125.png</image>
-      <width>125</width>
-      <height>125</height>
-    </credit>
+
     <!-- A credit with @role="pdf" will be used to compose a footer
      for each page in the PDF, using either "name" or "url" or both.
     -->



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org