svn commit: r1224809 - in /incubator/ooo/site/trunk: content/openofficeorg/bug-tracking.mdtext content/openofficeorg/index.mdtext content/openofficeorg/license.mdtext content/openofficeorg/trademarks.mdtext templates/sidenav.mdtext

[wa...@apache.org]

Author: wave
Date: Mon Dec 26 20:58:05 2011
New Revision: 1224809

URL: http://svn.apache.org/viewvc?rev=1224809&view=rev
Log:
several tweaks to the podling site. when migrated the issue handling on www.openoffice.org/qa is properly connected.

Modified:
    incubator/ooo/site/trunk/content/openofficeorg/bug-tracking.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/index.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/license.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext
    incubator/ooo/site/trunk/templates/sidenav.mdtext

Modified: incubator/ooo/site/trunk/content/openofficeorg/bug-tracking.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/bug-tracking.mdtext?rev=1224809&r1=1224808&r2=1224809&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/bug-tracking.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/bug-tracking.mdtext Mon Dec 26 20:58:05 2011
@@ -24,7 +24,10 @@ All bugs are tracked and managed in Bugz
 <a href="https://issues.apache.org/ooo/query.cgi"><img src="https://issues.apache.org/ooo/skins/standard/index/search.png" /></a>
 <a href="https://issues.apache.org/ooo/userprefs.cgi"><img src="https://issues.apache.org/ooo/skins/standard/index/new-account.png" /></a></div>
 
+The [issue handling pages][2] of the [OpenOffice.org][3] website is useful. 
 
-[1]: http://issues.apache.org/ooo/
 
+[1]: http://issues.apache.org/ooo/
+[2]: http://www.openoffice.org/qa/issue_handling/pre_submission.html
+[3]: http://www.openoffice.org/
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/index.mdtext?rev=1224809&r1=1224808&r2=1224809&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/index.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/index.mdtext Mon Dec 26 20:58:05 2011
@@ -1,4 +1,4 @@
-Title: Apache OpenOffice(Incubating)
+Title: Apache OpenOffice (Incubating)
 
 Apache OpenOffice is comprised of six personal productivity applications: a word processor (and its web-authoring component), 
 spreadsheet, presentation graphics, drawing, equation editor, and database. OpenOffice is released on Windows, Solaris, Linux and 

Modified: incubator/ooo/site/trunk/content/openofficeorg/license.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/license.mdtext?rev=1224809&r1=1224808&r2=1224809&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/license.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/license.mdtext Mon Dec 26 20:58:05 2011
@@ -1,4 +1,4 @@
-Title:
+Title: Apache License
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext?rev=1224809&r1=1224808&r2=1224809&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext Mon Dec 26 20:58:05 2011
@@ -16,11 +16,11 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-The Apache Software Foundation hold trademarks on behalf of its
+The Apache Software Foundation holds trademarks on behalf of its
 projects.  For the Apache OpenOffice project these trademarks include
 the names Apache OpenOffice and OpenOffice.org, as well as the
 graphical logo.  Use of these marks is prohibited without explicit
-permission from ASF.
+permission from the ASF.
 
 However, the Apache OpenOffice project is happy to work with 3rd
 parties who desire to use these trademarks in ways that are beneficial

Modified: incubator/ooo/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/sidenav.mdtext?rev=1224809&r1=1224808&r2=1224809&view=diff
==============================================================================
--- incubator/ooo/site/trunk/templates/sidenav.mdtext (original)
+++ incubator/ooo/site/trunk/templates/sidenav.mdtext Mon Dec 26 20:58:05 2011
@@ -21,7 +21,7 @@
   - [Security Reports](/openofficeorg/security.html)
   - [Developer FAQs](/openofficeorg/developer-faqs.html)
   
-# Project Management (P)PMC
+# Project Management PPMC
 
   - [Project Blog](http://blogs.apache.org/OOo/)
   - [Incubation Status](http://incubator.apache.org/projects/openofficeorg.html)
@@ -30,8 +30,8 @@
 # Apache Software Foundation
 
   - [Website](http://www.apache.org/)
-  - [Thanks](http://www.apache.org/foundation/thanks.html)
   - [Donations](http://www.apache.org/foundation/contributing.html)
   - [Sponsorship](http://www.apache.org/foundation/sponsorship.html)
+  - [Thanks](http://www.apache.org/foundation/thanks.html)