Return-Path: 
 <ooo-commits-return-5273-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id DA3049AAD
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Tue, 20 Dec 2011 14:53:13 +0000 (UTC)
Received: (qmail 6502 invoked by uid 500); 20 Dec 2011 14:53:13 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 6478 invoked by uid 500); 20 Dec 2011 14:53:13 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 6471 invoked by uid 99); 20 Dec 2011 14:53:13 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 14:53:13 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 14:53:10 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B4D3823889EC;
	Tue, 20 Dec 2011 14:52:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1221295 - in /incubator/ooo/ooo-site/trunk: content/
 content/distribution/cdrom/ content/oopm/ content/porting/mac/news/2007/ lib/
Date: Tue, 20 Dec 2011 14:52:48 -0000
To: ooo-commits@incubator.apache.org
From: wave@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111220145248.B4D3823889EC@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wave
Date: Tue Dec 20 14:52:47 2011
New Revision: 1221295

URL: http://svn.apache.org/viewvc?rev=1221295&view=rev
Log:
Wrap .htm files like .html. Comment a couple of PayPal references. The page "donate-thanks.html" states that it is landing page after PayPal donations to TOO - changed to request donations to the ASF. (Not sure if it is still used.)

Removed:
    incubator/ooo/ooo-site/trunk/content/oopm/
Modified:
    incubator/ooo/ooo-site/trunk/content/distribution/cdrom/index.html
    incubator/ooo/ooo-site/trunk/content/distribution/cdrom/indextest.html
    incubator/ooo/ooo-site/trunk/content/donate-thanks.html
    incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070203toptenbeforealpha.html
    incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070818top5beforealpha.html
    incubator/ooo/ooo-site/trunk/lib/path.pm

Modified: incubator/ooo/ooo-site/trunk/content/distribution/cdrom/index.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/distribution/cdrom/index.html?rev=1221295&r1=1221294&r2=1221295&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/distribution/cdrom/index.html (original)
+++ incubator/ooo/ooo-site/trunk/content/distribution/cdrom/index.html Tue Dec 20 14:52:47 2011
@@ -1957,7 +1957,7 @@ English and Spanish (Puerto Rico)</td>
     <tr>
     <td><a href="http://www.derrywebb.com/openoffice.html">Derry H. Webb</a></td>
     <td>USA, NM</td>
-    <td>Current &amp; past stable releases on CD-ROM.  Other Languages &amp; Platforms upon request. PayPal accepted.
+    <td>Current &amp; past stable releases on CD-ROM.  Other Languages &amp; Platforms upon request.<!-- PayPal accepted.-->
 </td>
     </tr>
     <tr>

Modified: incubator/ooo/ooo-site/trunk/content/distribution/cdrom/indextest.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/distribution/cdrom/indextest.html?rev=1221295&r1=1221294&r2=1221295&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/distribution/cdrom/indextest.html (original)
+++ incubator/ooo/ooo-site/trunk/content/distribution/cdrom/indextest.html Tue Dec 20 14:52:47 2011
@@ -2379,7 +2379,7 @@ cellspacing="0" width="100%">
       Webb</a></td>
       <td>USA, NM</td>
       <td>Current &amp; past stable releases on CD-ROM. Other Languages &amp;
-        Platforms upon request. PayPal accepted. </td>
+        Platforms upon request.<!-- PayPal accepted.--></td>
     </tr>
     <tr>
       <td><a href="http://www.digitalwan.net">DigitalWAN</a></td>

Modified: incubator/ooo/ooo-site/trunk/content/donate-thanks.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/donate-thanks.html?rev=1221295&r1=1221294&r2=1221295&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/donate-thanks.html (original)
+++ incubator/ooo/ooo-site/trunk/content/donate-thanks.html Tue Dec 20 14:52:47 2011
@@ -7,19 +7,15 @@ this page is used after a PayPal Donatio
 -->
 <h2>Thanks for Your Donation</h2>
 <p>
-Please accept our best thanks for supporting OpenOffice.org.
+Please accept our best thanks for supporting Team OpenOffice.org.
 <br>
-After you have read more
-<a href="http://about.openoffice.org/index.html#project">about the project</a>
-and
-<a href="http://about.openoffice.org/index.html#product">our product</a>
- you may want to
-<a href="http://about.openoffice.org/index.html#joining">join the community</a>.
+PLease consider supporting the Apache Software Foundation via a 
+<a href="http://www.apache.org/foundation/contributing.html">donation</a>.
+While not targeted these donations do suppport the infrastructure of OpenOffice.org and the Apache OpenOffice (incubating) project.
 </p>
 <p
-Thanks again
-<br>
-The OpenOffice.org Team
+Thanks again!
+</p>
 </body>
 </html>
 

Modified: incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070203toptenbeforealpha.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070203toptenbeforealpha.html?rev=1221295&r1=1221294&r2=1221295&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070203toptenbeforealpha.html (original)
+++ incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070203toptenbeforealpha.html Tue Dec 20 14:52:47 2011
@@ -152,8 +152,8 @@ wiki</li>
 
   <li>Send
 us money, to buy hardware, training for our developers and help towards
-our travel and events. (See <a href="http://www.cusoo.org/spip/">Cusoon</a>
-for the PayPal button).</li>
+our travel and events.<!--- (See <a href="http://www.cusoo.org/spip/">Cusoon</a>
+for the PayPal button).--></li>
 
   <li>Build the Aqua version</li>
 

Modified: incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070818top5beforealpha.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070818top5beforealpha.html?rev=1221295&r1=1221294&r2=1221295&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070818top5beforealpha.html (original)
+++ incubator/ooo/ooo-site/trunk/content/porting/mac/news/2007/20070818top5beforealpha.html Tue Dec 20 14:52:47 2011
@@ -133,8 +133,8 @@ wiki</a></li>
 
   <li>Send
 us money, to buy hardware, training for our developers and help towards
-our travel and events. (See <a href="http://www.cusoo.org/spip/">Cusoon</a>
-for the PayPal button).</li>
+our travel and events. <!-- (See <a href="http://www.cusoo.org/spip/">Cusoon</a>
+for the PayPal button).--></li>
 
   <li>Build the Aqua version</li>
 

Modified: incubator/ooo/ooo-site/trunk/lib/path.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/path.pm?rev=1221295&r1=1221294&r2=1221295&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/path.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/path.pm Tue Dec 20 14:52:47 2011
@@ -5,6 +5,7 @@ package path;
 our @patterns = (
 	[qr!\.mdtext$!, single_narrative => { template => "single_narrative.html" }],
 	[qr!\.html$!, html_page => { template => "html_page.html" }],
+	[qr!\.htm$!, html_page => { template => "html_page.html" }],
 ) ;
 
 # for specifying interdependencies between files