svn commit: r1547315 - /openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx

2013-12-03 Thread orw
Author: orw
Date: Tue Dec  3 08:46:43 2013
New Revision: 1547315

URL: http://svn.apache.org/r1547315
Log:
123797: correct typo for *.docx import - remove additional empty paragraph at 
imported footnote resp. endnote


Modified:
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx

Modified: 
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1547315&r1=1547314&r2=1547315&view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Tue 
Dec  3 08:46:43 2013
@@ -1267,7 +1267,7 @@ void DomainMapper_Impl::PushAnnotation()
   ---*/
 void DomainMapper_Impl::PopFootOrEndnote()
 {
-RemoveLastParagraph;
+RemoveLastParagraph();
 m_aTextAppendStack.pop();
 }
 /*-- 22.12.2008 13:45:15---




buildbot failure in ASF Buildbot on aoo-win7

2013-12-03 Thread buildbot
Hi! , The aoo-win7 builder has just completed a run

STATUS: Failure

 Build revision 1547111 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-win7

 Build results at: http://ci.apache.org/builders/aoo-win7/builds/859

 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered 
this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






buildbot failure in ASF Buildbot on openoffice-linux32-nightly

2013-12-03 Thread buildbot
Hi! , The openoffice-linux32-nightly builder has just completed a run

STATUS: Failure

 Build revision 1547277 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-vm2_ubuntu_32bit

 Build results at: 
http://ci.apache.org/builders/openoffice-linux32-nightly/builds/573

 Build reason was: The Nightly scheduler named 'openoffice-linux32-nightly' 
triggered this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






svn commit: r1547392 - in /openoffice/branches/ooxml-osba/main/writerfilter: inc/ooxml/ inc/resourcemodel/ source/doctok/ source/ooxml/

2013-12-03 Thread orw
Author: orw
Date: Tue Dec  3 14:02:51 2013
New Revision: 1547392

URL: http://svn.apache.org/r1547392
Log:
113059: *.docx import: correct handling of comment/annotation, footnote and 
endnote IDs for parsing the corresponding sub streams

Kudos to Pavel  for his analysis and findings


Modified:
openoffice/branches/ooxml-osba/main/writerfilter/inc/ooxml/OOXMLDocument.hxx

openoffice/branches/ooxml-osba/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx

openoffice/branches/ooxml-osba/main/writerfilter/source/doctok/WW8ResourceModelImpl.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/doctok/WW8ResourceModelImpl.hxx
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/Handler.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLParserState.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLParserState.hxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx

openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx
openoffice/branches/ooxml-osba/main/writerfilter/source/ooxml/model.xml

Modified: 
openoffice/branches/ooxml-osba/main/writerfilter/inc/ooxml/OOXMLDocument.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/writerfilter/inc/ooxml/OOXMLDocument.hxx?rev=1547392&r1=1547391&r2=1547392&view=diff
==
--- 
openoffice/branches/ooxml-osba/main/writerfilter/inc/ooxml/OOXMLDocument.hxx 
(original)
+++ 
openoffice/branches/ooxml-osba/main/writerfilter/inc/ooxml/OOXMLDocument.hxx 
Tue Dec  3 14:02:51 2013
@@ -156,11 +156,11 @@ public:
 
@param rStream   stream handler to resolve to
@param rNoteType type of footnote to resolve
-   @param rNoteId   id of the footnote to resolve
+   @param nIDForXNoteStream  id of the footnote to resolve
  */
 virtual void resolveFootnote(Stream & rStream,
  const Id & rNoteType,
- const rtl::OUString & rNoteId) = 0;
+ const sal_Int32 nIDForXNoteStream ) = 0;
 /**
Resolves an endnote to a stream handler.
 
@@ -168,21 +168,21 @@ public:
note id matches.
 
@param rStream   stream handler to resolve to
-   @param rNoteType type of footnote to resolve
-   @param rNoteId   id of the endnote to resolve
+   @param rNoteType type of endnote to resolve
+   @param nIDForXNoteStream  id of the endnote to resolve
  */
 virtual void resolveEndnote(Stream & rStream,
 const Id & rNoteType,
-const rtl::OUString & rNoteId) = 0;
+const sal_Int32 nIDForXNoteStream ) = 0;
 
 /**
Resolves a comment to a stream handler.
 
@param rStream   stream handler to resolve to
-   @param rComment  id of the comment to resolve
+   @param nIDForXNoteStream  id of the comment to resolve
  */
 virtual void resolveComment(Stream & rStream,
-const rtl::OUString & rCommentId) = 0;
+const sal_Int32 nIDForXNoteStream ) = 0;
 
 /**
Resolves a picture to a stream handler.
@@ -239,12 +239,11 @@ public:
 virtual uno::Reference getDrawPage() = 0;
 virtual uno::Reference getInputStream() = 0;
 virtual uno::Reference getStorageStream() = 0;
-virtual uno::Reference getInputStreamForId
-(const ::rtl::OUString & rId) = 0;
-virtual void setXNoteId(const rtl::OUString & rId) = 0;
-virtual const ::rtl::OUString & getXNoteId() const = 0;
-virtual void setXNoteType(const Id & nId) = 0;
-virtual const Id & getXNoteType() const = 0;
+virtual uno::Reference getInputStreamForId( const 
::rtl::OUString & rId ) = 0;
+
+virtual void setIDForXNoteStream( const sal_Int32 nID ) = 0;
+virtual const sal_Int32 getIDForXNoteStream() const = 0;
+
 virtual const ::rtl::OUString & getTarget() const = 0;
 };
 

Modified: 
openoffice/branches/ooxml-osba/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/writerfilter/inc/resourcemodel/WW8ResourceModel.hxx?rev=1547392&r1=1547391&r2=1547392

svn commit: r1547447 - /openoffice/ooo-site/trunk/content/brand.mdtext

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 15:55:59 2013
New Revision: 1547447

URL: http://svn.apache.org/r1547447
Log:
Bug report by: dgold...@asb.org

Modified:
openoffice/ooo-site/trunk/content/brand.mdtext

Modified: openoffice/ooo-site/trunk/content/brand.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/brand.mdtext?rev=1547447&r1=1547446&r2=1547447&view=diff
==
--- openoffice/ooo-site/trunk/content/brand.mdtext (original)
+++ openoffice/ooo-site/trunk/content/brand.mdtext Tue Dec  3 15:55:59 2013
@@ -5,7 +5,7 @@ tagline:The Free and Open Productivity
 logo:  AOO_logos/AOO4_website_logo.png
 domain:www.openoffice.org
 divid: bannera
-announce:  Volunteer Opportunties with the Apache OpenOffice Project
+announce:  Volunteer Opportunities with the Apache OpenOffice Project
 announceurl:   http://openoffice.apache.org/get-involved.html
 announcetip:   Read the announcement
 




svn commit: r888955 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/brand.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 15:57:31 2013
New Revision: 888955

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/brand.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 15:57:31 2013
@@ -1 +1 @@
-1547040
+1547447

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 15:57:31 2013
@@ -1 +1 @@
-1547040
+1547447

Modified: websites/staging/ooo-site/trunk/content/brand.html
==
--- websites/staging/ooo-site/trunk/content/brand.html (original)
+++ websites/staging/ooo-site/trunk/content/brand.html Tue Dec  3 15:57:31 2013
@@ -17,4 +17,4 @@
 
 The Free and Open Productivity Suite
   
-  http://openoffice.apache.org/get-involved.html"; 
title="Read the announcement">Volunteer Opportunties with the Apache OpenOffice 
Project
+  http://openoffice.apache.org/get-involved.html"; 
title="Read the announcement">Volunteer Opportunities with the Apache 
OpenOffice Project




svn commit: r888956 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 15:58:38 2013
New Revision: 888956

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888955, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888955, websites/staging/ooo-site/trunk/content/



svn commit: r1547451 - /openoffice/ooo-site/trunk/content/brand.mdtext

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 16:07:59 2013
New Revision: 1547451

URL: http://svn.apache.org/r1547451
Log:
Try to force a publish

Modified:
openoffice/ooo-site/trunk/content/brand.mdtext

Modified: openoffice/ooo-site/trunk/content/brand.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/brand.mdtext?rev=1547451&r1=1547450&r2=1547451&view=diff
==
--- openoffice/ooo-site/trunk/content/brand.mdtext (original)
+++ openoffice/ooo-site/trunk/content/brand.mdtext Tue Dec  3 16:07:59 2013
@@ -7,5 +7,5 @@ domain: www.openoffice.org
 divid: bannera
 announce:  Volunteer Opportunities with the Apache OpenOffice Project
 announceurl:   http://openoffice.apache.org/get-involved.html
-announcetip:   Read the announcement
+announcetip:   Read the announcement text
 




svn commit: r888958 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/brand.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 16:08:30 2013
New Revision: 888958

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/brand.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 16:08:30 2013
@@ -1 +1 @@
-1547447
+1547451

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 16:08:30 2013
@@ -1 +1 @@
-1547447
+1547451

Modified: websites/staging/ooo-site/trunk/content/brand.html
==
--- websites/staging/ooo-site/trunk/content/brand.html (original)
+++ websites/staging/ooo-site/trunk/content/brand.html Tue Dec  3 16:08:30 2013
@@ -17,4 +17,4 @@
 
 The Free and Open Productivity Suite
   
-  http://openoffice.apache.org/get-involved.html"; 
title="Read the announcement">Volunteer Opportunities with the Apache 
OpenOffice Project
+  http://openoffice.apache.org/get-involved.html"; 
title="Read the announcement text">Volunteer Opportunities with the Apache 
OpenOffice Project




svn commit: r888959 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 16:09:08 2013
New Revision: 888959

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888958, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888958, websites/staging/ooo-site/trunk/content/



svn commit: r1547503 - in /openoffice/ooo-site/trunk/content/contributing: donations.html pp.gif

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:06:14 2013
New Revision: 1547503

URL: http://svn.apache.org/r1547503
Log:
Add donation page

Added:
openoffice/ooo-site/trunk/content/contributing/donations.html
openoffice/ooo-site/trunk/content/contributing/pp.gif   (with props)

Added: openoffice/ooo-site/trunk/content/contributing/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/contributing/donations.html?rev=1547503&view=auto
==
--- openoffice/ooo-site/trunk/content/contributing/donations.html (added)
+++ openoffice/ooo-site/trunk/content/contributing/donations.html Tue Dec  3 
18:06:14 2013
@@ -0,0 +1,108 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+
+
+Donations 
+
+
+
+
+function trackSubmission(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+
+
+
+A Good Cause
+
+
+Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
+http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
+Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+
+
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
+projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
+infrastructure.
+
+We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
+our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
+
+How to Donate
+
+Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
+Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
+to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
+
+Donate via PayPal
+You can contribute via PayPal by clicking on the PayPal icon:
+
+
+https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
+
+
+http://www.apache.org";>
+
+http://www.apache.org";>
+
+
+
+
+
+Donate via Amazon
+If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
+
+
+https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
+
+
+
+
+
+
+
+
+
+
+
+$ 
+http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
+
+
+How we use Donations
+
+The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
+business operating expenses which go with any organization. These include:
+
+
+Bandwidth costs
+
+
+Servers and hardware
+
+
+Legal and Accounting
+
+
+Normal office expenses
+
+
+Marketing and PR
+
+
+Sub-contractors to "fill in the holes" for administrative and secretarial
+duties
+
+
+
+
+

Added: openoffice/ooo-site/trunk/content/contributing/pp.gif
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/contributing/pp.gif?rev=1547503&view=auto
==
Binary file - no diff available.

Propchange: openoffice/ooo-site/trunk/content/contributing/pp.gif
--
svn:mime-type = application/octet-stream




svn commit: r888971 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/contributing/donations.html content/contributing/pp.gif

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 18:07:49 2013
New Revision: 888971

Log:
Staging update by buildbot for ooo-site

Added:
websites/staging/ooo-site/trunk/content/contributing/donations.html
websites/staging/ooo-site/trunk/content/contributing/pp.gif   (with props)
Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 18:07:49 2013
@@ -1 +1 @@
-1547451
+1547504

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 18:07:49 2013
@@ -1 +1 @@
-1547451
+1547504

Added: websites/staging/ooo-site/trunk/content/contributing/donations.html
==
--- websites/staging/ooo-site/trunk/content/contributing/donations.html (added)
+++ websites/staging/ooo-site/trunk/content/contributing/donations.html Tue Dec 
 3 18:07:49 2013
@@ -0,0 +1,125 @@
+
+
+
+
+
+Donations 
+
+
+
+
+function trackSubmission(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+ 
+
+
+
+
+  
+
+home » contributing
+  
+  
+  
+  
+  
+
+
+
+
+A Good Cause
+
+
+Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
+http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
+Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+
+
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
+projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
+infrastructure.
+
+We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
+our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
+
+How to Donate
+
+Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
+Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
+to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
+
+Donate via PayPal
+You can contribute via PayPal by clicking on the PayPal icon:
+
+
+https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
+
+
+http://www.apache.org";>
+
+http://www.apache.org";>
+
+
+
+
+
+Donate via Amazon
+If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
+
+
+https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
+
+
+
+
+
+
+
+
+
+
+
+$ 
+http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
+
+
+How we use Donations
+
+The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
+business operating expenses which go with any organization. These include:
+
+
+Bandwidth costs
+
+
+Servers and hardware
+
+
+Legal and Accounting
+
+
+Normal office expenses
+
+
+Marketing and PR
+
+
+Sub-contractors to "fill in the holes" for administrative and secretarial
+duties
+
+
+
+  
+
+
+

Added: websites/staging/ooo-site/trunk/content/contributing/pp.gif
==
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/contributing/pp.gif
--
svn:mime-typ

svn commit: r888973 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:11:25 2013
New Revision: 888973

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888972, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888972, websites/staging/ooo-site/trunk/content/



svn commit: r1547510 - in /openoffice/ooo-site/trunk/content: contributing/donations.html contributing/pp.gif donations.html images/pp.gif

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:16:55 2013
New Revision: 1547510

URL: http://svn.apache.org/r1547510
Log:
Move donate page to root directory

Added:
openoffice/ooo-site/trunk/content/donations.html
  - copied, changed from r1547503, 
openoffice/ooo-site/trunk/content/contributing/donations.html
openoffice/ooo-site/trunk/content/images/pp.gif
  - copied unchanged from r1547503, 
openoffice/ooo-site/trunk/content/contributing/pp.gif
Removed:
openoffice/ooo-site/trunk/content/contributing/donations.html
openoffice/ooo-site/trunk/content/contributing/pp.gif

Copied: openoffice/ooo-site/trunk/content/donations.html (from r1547503, 
openoffice/ooo-site/trunk/content/contributing/donations.html)
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?p2=openoffice/ooo-site/trunk/content/donations.html&p1=openoffice/ooo-site/trunk/content/contributing/donations.html&r1=1547503&r2=1547510&rev=1547510&view=diff
==
--- openoffice/ooo-site/trunk/content/contributing/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 18:16:55 2013
@@ -52,7 +52,7 @@ to the ASF should be tax-deducti
 
 http://www.apache.org";>
 
-
 




svn commit: r888975 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:21:36 2013
New Revision: 888975

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888974, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888974, websites/staging/ooo-site/trunk/content/



svn commit: r1547512 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:23:54 2013
New Revision: 1547512

URL: http://svn.apache.org/r1547512
Log:
fix broken URL

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547512&r1=1547511&r2=1547512&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 18:23:54 2013
@@ -1,108 +1,108 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-
-
-
-Donations 
-
-
-
-
-function trackSubmission(form, category, name, value) {
-try {
-_gaq.push(['_trackEvent', category, name, value]);
-} catch(err){}
-setTimeout(function() {
-form.submit();
-}, 100);
-}
-
-
-
-
-
-A Good Cause
-
-
-Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
-http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
-Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
-
-
-Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
-projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
-infrastructure.
-
-We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
-
-How to Donate
-
-Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
-Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
-to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
-
-Donate via PayPal
-You can contribute via PayPal by clicking on the PayPal icon:
-
-
-https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
-
-
-http://www.apache.org";>
-
-http://www.apache.org";>
-
-
-
-
-
-Donate via Amazon
-If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
-
-
-https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
-
-
-
-
-
-
-
-
-
-
-
-$ 
-http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
-
-
-How we use Donations
-
-The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
-business operating expenses which go with any organization. These include:
-
-
-Bandwidth costs
-
-
-Servers and hardware
-
-
-Legal and Accounting
-
-
-Normal office expenses
-
-
-Marketing and PR
-
-
-Sub-contractors to "fill in the holes" for administrative and secretarial
-duties
-
-
-
-
-
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+
+
+Donations 
+
+
+
+
+function trackSubmission(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+
+
+
+A Good Cause
+
+
+Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
+http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
+Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+
+
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The 

svn commit: r888978 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/contributing/donations.html content/contributing/pp.gif content/donations.html content/images/pp.gif

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 18:30:42 2013
New Revision: 888978

Log:
Staging update by buildbot for ooo-site

Added:
websites/staging/ooo-site/trunk/content/donations.html
websites/staging/ooo-site/trunk/content/images/pp.gif   (with props)
Removed:
websites/staging/ooo-site/trunk/content/contributing/donations.html
websites/staging/ooo-site/trunk/content/contributing/pp.gif
Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 18:30:42 2013
@@ -1 +1 @@
-1547504
+1547512

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 18:30:42 2013
@@ -1 +1 @@
-1547504
+1547512

Added: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (added)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 18:30:42 
2013
@@ -0,0 +1,125 @@
+
+
+
+
+
+Donations 
+
+
+
+
+function trackSubmission(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+ 
+
+
+
+
+  
+
+home
+  
+  
+  
+  
+  
+
+
+
+
+A Good Cause
+
+
+Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
+http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
+Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+
+
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
+projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
+infrastructure.
+
+We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
+our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
+
+How to Donate
+
+Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
+Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
+to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
+
+Donate via PayPal
+You can contribute via PayPal by clicking on the PayPal icon:
+
+
+https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
+
+
+http://www.apache.org";>
+
+http://www.apache.org";>
+
+
+
+
+
+Donate via Amazon
+If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
+
+
+https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
+
+
+
+
+
+
+
+
+
+
+
+$ 
+http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
+
+
+How we use Donations
+
+The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
+business operating expenses which go with any organization. These include:
+
+
+Bandwidth costs
+
+
+Servers and hardware
+
+
+Legal and Accounting
+
+
+Normal office expenses
+
+
+Marketing and PR
+
+
+Sub-contractors to "fill in the holes" for administrative and secretarial
+duties
+
+
+
+  
+
+
+

Added: websites/staging/ooo-site/trunk/content/images/pp.gif
==
Binary file - no diff available.

Propchange: websites/staging/ooo-site/trunk/content/images/pp.gif
---

svn commit: r888979 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:31:18 2013
New Revision: 888979

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888978, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888978, websites/staging/ooo-site/trunk/content/



svn commit: r888980 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 18:35:21 2013
New Revision: 888980

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 18:35:21 2013
@@ -1 +1 @@
-1547512
+1547515

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 18:35:21 2013
@@ -1 +1 @@
-1547512
+1547515

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 18:35:21 
2013
@@ -8,7 +8,7 @@
 
 
 

svn commit: r1547515 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:34:48 2013
New Revision: 1547515

URL: http://svn.apache.org/r1547515
Log:
correct script name

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547515&r1=1547514&r2=1547515&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 18:34:48 2013
@@ -7,7 +7,7 @@
 
 
 

svn commit: r888981 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 18:36:32 2013
New Revision: 888981

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888980, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888980, websites/staging/ooo-site/trunk/content/



svn commit: r1547544 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:32:09 2013
New Revision: 1547544

URL: http://svn.apache.org/r1547544
Log:
new version with 2-column layout

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547544&r1=1547543&r2=1547544&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 19:32:09 2013
@@ -1,3 +1,119 @@
+<<< .mine
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+
+
+Donations 
+
+
+
+
+
+function trackSubmissions(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+
+
+
+ .left {
+float: left;
+width: 50%;
+padding:25px
+ }
+
+ .right {
+margin-left: 50%;
+padding:25px
+ }
+
+
+
+
+
+
+
+
+A Good Cause
+
+
+Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
+http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
+Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+
+
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
+projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
+infrastructure.
+
+We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
+our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
+
+How we use Donations
+
+The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
+business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR.
+Sub-contractors to "fill in the holes" for administrative and secretarial 
duties
+
+
+
+
+
+How to Donate
+
+Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
+Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
+to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
+
+Donate via PayPal
+You can contribute via PayPal by clicking on the PayPal icon:
+
+
+https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
+
+
+http://www.apache.org";>
+
+http://www.apache.org";>
+
+
+
+
+
+Donate via Amazon
+If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
+
+
+https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
+
+
+
+
+
+
+
+
+
+
+
+$ 
+http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
+
+
+
+
+
+
+
+===
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 
 
@@ -106,3 +222,4 @@ duties
 
 
 
+>>> .r1547541




svn commit: r888990 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 19:33:33 2013
New Revision: 888990

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:33:33 2013
@@ -1 +1 @@
-1547515
+1547544

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:33:33 2013
@@ -1 +1 @@
-1547515
+1547544

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 19:33:33 
2013
@@ -2,21 +2,38 @@
 
 
 
-
-Donations 
-
-
-
-
-function trackSubmissions(form, category, name, value) {
-try {
-_gaq.push(['_trackEvent', category, name, value]);
-} catch(err){}
-setTimeout(function() {
-form.submit();
-}, 100);
-}
-
+
+Donations 
+
+
+
+
+
+function trackSubmissions(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+
+
+
+ .left {
+float: left;
+width: 50%;
+padding:25px
+ }
+
+ .right {
+margin-left: 50%;
+padding:25px
+ }
+
+
 
  
 
@@ -33,91 +50,80 @@
   
 
 
-
-
-A Good Cause
-
-
-Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
-http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
-Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
-
-
-Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
-projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
-infrastructure.
-
-We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
-
-How to Donate
-
-Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
-Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
-to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
-
-Donate via PayPal
-You can contribute via PayPal by clicking on the PayPal icon:
-
-
-https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
-
-
-http://www.apache.org";>
-
-http://www.apache.org";>
-
-
-
-
-
-Donate via Amazon
-If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
-
-
-https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
-
-
-
-
-
-
-
-
-
-
-
-$ 
-http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
-
-
-How we use Donations
-
-The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
-business operating expenses which go with any organization. These include:
-
-
-Bandwidth costs
-
-
-Servers and hardware
-
-
-Legal and Accounting
-
-
-Normal office expenses
-
-
-Marketing and PR
-
-
-Sub-contractors to "fill in the holes" for administrative and secretarial
-duties
-
-
+
+
+
+
+A Good Cause
+
+
+Apache OpenOffice, the leading open s

svn commit: r1547545 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:35:03 2013
New Revision: 1547545

URL: http://svn.apache.org/r1547545
Log:
fix conflict

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547545&r1=1547544&r2=1547545&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 19:35:03 2013
@@ -1,119 +1,3 @@
-<<< .mine
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-
-
-
-Donations 
-
-
-
-
-
-function trackSubmissions(form, category, name, value) {
-try {
-_gaq.push(['_trackEvent', category, name, value]);
-} catch(err){}
-setTimeout(function() {
-form.submit();
-}, 100);
-}
-
-
-
-
-
- .left {
-float: left;
-width: 50%;
-padding:25px
- }
-
- .right {
-margin-left: 50%;
-padding:25px
- }
-
-
-
-
-
-
-
-
-A Good Cause
-
-
-Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
-http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
-Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
-
-
-Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
-projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
-infrastructure.
-
-We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
-
-How we use Donations
-
-The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
-business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR.
-Sub-contractors to "fill in the holes" for administrative and secretarial 
duties
-
-
-
-
-
-How to Donate
-
-Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
-Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
-to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
-
-Donate via PayPal
-You can contribute via PayPal by clicking on the PayPal icon:
-
-
-https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
-
-
-http://www.apache.org";>
-
-http://www.apache.org";>
-
-
-
-
-
-Donate via Amazon
-If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
-
-
-https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
-
-
-
-
-
-
-
-
-
-
-
-$ 
-http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif";
 border="0" style="vertical-align: top">
-
-
-
-
-
-
-
-===
 http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
 
 
@@ -123,6 +7,7 @@ $ 
 
 
+
 function trackSubmissions(form, category, name, value) {
 try {
 _gaq.push(['_trackEvent', category, name, value]);
@@ -131,11 +16,29 @@ $ many op

svn commit: r888991 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 19:35:35 2013
New Revision: 888991

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:35:35 2013
@@ -1 +1 @@
-1547544
+1547545

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:35:35 2013
@@ -1 +1 @@
-1547544
+1547545

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 19:35:35 
2013
@@ -2,38 +2,38 @@
 
 
 
-
-Donations 
-
-
-
-
-
-function trackSubmissions(form, category, name, value) {
-try {
-_gaq.push(['_trackEvent', category, name, value]);
-} catch(err){}
-setTimeout(function() {
-form.submit();
-}, 100);
-}
-
-
-
-
-
- .left {
-float: left;
-width: 50%;
-padding:25px
- }
-
- .right {
-margin-left: 50%;
-padding:25px
- }
-
-
+
+Donations 
+
+
+
+
+
+function trackSubmissions(form, category, name, value) {
+try {
+_gaq.push(['_trackEvent', category, name, value]);
+} catch(err){}
+setTimeout(function() {
+form.submit();
+}, 100);
+}
+
+
+
+
+
+ .left {
+float: left;
+width: 50%;
+padding:25px
+ }
+
+ .right {
+margin-left: 50%;
+padding:25px
+ }
+
+
 
  
 
@@ -50,80 +50,80 @@
   
 
 
-
-
-
-
-A Good Cause
-
-
-Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
-http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
-Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
-
-
-Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
-projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
-infrastructure.
-
-We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
-
-How we use Donations
-
-The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
-business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR.
-Sub-contractors to "fill in the holes" for administrative and secretarial 
duties
-
-
-
-
-
-How to Donate
-
-Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
-Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
-to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
-
-Donate via PayPal
-You can contribute via PayPal by clicking on the PayPal icon:
-
-
-https://www.paypal.com/cgi-bin/webscr"; method="post" 
onsubmit="trackSubmissions(this, 'form', 'donate', 'paypal'); return false;">
-
-
-http://www.apache.org";>
-
-http://www.apache.org";>
-
-
-
-
-
-Donate via Amazon
-If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
-
-
-https://authorize.payments.amazon.com/pba/paypipeline"; 
method="post" onsubmit="trackSubmissions(this, 'form', 'donate', 'amazon'); 
return false;">
-
-
-
-
-
-
-
-
-
-
-
-$ 
-http://g-ecx.images-amazon.com/images/G/01/asp

svn commit: r1547547 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:37:13 2013
New Revision: 1547547

URL: http://svn.apache.org/r1547547
Log:
remove unnecessary headers

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547547&r1=1547546&r2=1547547&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 19:37:13 2013
@@ -47,7 +47,7 @@ Apache OpenOffice, the leading open sour
 Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
 
 
-Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
 projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
 infrastructure.
 
@@ -70,7 +70,6 @@ Donations can easily be made via PayPal 
 Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
 to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
 
-Donate via PayPal
 You can contribute via PayPal by clicking on the PayPal icon:
 
 
@@ -87,7 +86,6 @@ free and secure">
 
 
 
-Donate via Amazon
 If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
 
 




svn commit: r888993 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 19:38:14 2013
New Revision: 888993

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:38:14 2013
@@ -1 +1 @@
-1547545
+1547547

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:38:14 2013
@@ -1 +1 @@
-1547545
+1547547

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 19:38:14 
2013
@@ -62,7 +62,7 @@ Apache OpenOffice, the leading open sour
 Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
 
 
-Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
+Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
 projects, over 400 active members, over 2000 committers and countless 
contributors and users. We are responsible for millions of lines of code and 
the 35+ servers which make up our 
 infrastructure.
 
@@ -85,7 +85,6 @@ Donations can easily be made via PayPal 
 Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
 to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
 
-Donate via PayPal
 You can contribute via PayPal by clicking on the PayPal icon:
 
 
@@ -102,7 +101,6 @@ free and secure">
 
 
 
-Donate via Amazon
 If you have an Amazon account, you can donate using Amazon Payments by 
filling in the donation amount and clicking the Donate button below:
 
 




svn commit: r888994 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:42:29 2013
New Revision: 888994

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888993, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888993, websites/staging/ooo-site/trunk/content/



svn commit: r1547552 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:44:42 2013
New Revision: 1547552

URL: http://svn.apache.org/r1547552
Log:
Replace "sponsorship" with "your contribution"

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547552&r1=1547551&r2=1547552&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 19:44:42 2013
@@ -52,7 +52,7 @@ projects, over 400 active members, over 
 infrastructure.
 
 We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
+our mission and help sustain a vibrant organization. Your contribution also 
shows your support for Open Source and provides you the opportunity to "give 
back" to the community.
 
 How we use Donations
 




svn commit: r888996 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:46:48 2013
New Revision: 888996

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888995, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888995, websites/staging/ooo-site/trunk/content/



svn commit: r888995 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 19:46:08 2013
New Revision: 888995

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:46:08 2013
@@ -1 +1 @@
-1547547
+1547552

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:46:08 2013
@@ -1 +1 @@
-1547547
+1547552

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 19:46:08 
2013
@@ -67,7 +67,7 @@ projects, over 400 active members, over 
 infrastructure.
 
 We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Sponsorship also shows 
your support for Open Source and provides you the opportunity to "give back" to 
the community.
+our mission and help sustain a vibrant organization. Your contribution also 
shows your support for Open Source and provides you the opportunity to "give 
back" to the community.
 
 How we use Donations
 




svn commit: r1547555 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:51:33 2013
New Revision: 1547555

URL: http://svn.apache.org/r1547555
Log:
reduce padding

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547555&r1=1547554&r2=1547555&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 19:51:33 2013
@@ -24,12 +24,12 @@
  .left {
 float: left;
 width: 50%;
-padding:25px
+padding: 5px 25px 5px 5px;
  }
 
  .right {
 margin-left: 50%;
-padding:25px
+padding: 5px 5px 5px 25px;
  }
 
 




svn commit: r888997 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 19:52:04 2013
New Revision: 888997

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:52:04 2013
@@ -1 +1 @@
-1547552
+1547555

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 19:52:04 2013
@@ -1 +1 @@
-1547552
+1547555

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 19:52:04 
2013
@@ -25,12 +25,12 @@
  .left {
 float: left;
 width: 50%;
-padding:25px
+padding: 5px 25px 5px 5px;
  }
 
  .right {
 margin-left: 50%;
-padding:25px
+padding: 5px 5px 5px 25px;
  }
 
 




svn commit: r888998 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 19:54:03 2013
New Revision: 888998

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r888997, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r888997, websites/staging/ooo-site/trunk/content/



svn commit: r1547570 - /openoffice/ooo-site/trunk/content/download/common/instructions.html

2013-12-03 Thread kschenk
Author: kschenk
Date: Tue Dec  3 20:23:57 2013
New Revision: 1547570

URL: http://svn.apache.org/r1547570
Log:
A few changes to the Linux install area

Modified:
openoffice/ooo-site/trunk/content/download/common/instructions.html

Modified: openoffice/ooo-site/trunk/content/download/common/instructions.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/common/instructions.html?rev=1547570&r1=1547569&r2=1547570&view=diff
==
--- openoffice/ooo-site/trunk/content/download/common/instructions.html 
(original)
+++ openoffice/ooo-site/trunk/content/download/common/instructions.html Tue Dec 
 3 20:23:57 2013
@@ -40,7 +40,7 @@ migrate your old profile settings to the
Linux General Installation Notes: RPM or 
DEB
Linux RPM-based
Linux DEB-based
-   Packages for Linux Distributions 
+   Additional Linux Information 
 

   Installation Problems
@@ -340,12 +340,15 @@ exists, on your system.
   Finally, start up Apache OpenOffice 4.0.x to insure it's working.
 
 
-Packages for Linux Distributions (Not compiled by Apache 
OpenOffice developers)
+Additional Linux Information
+
+Apache OpenOffice provided packages

 The Linux downloads provided on the Apache OpenOffice site (mirrors) are 
generic for either the RPM- or DEB-based package
 managers. If you have experience in directly installing these types of 
packages on your system, one of these types of
 installs should work for you. They are not specific to a particular Linux 
distribution.
 
+Apache OpenOffice from Linux distros
 Many Linux distributions now include a version of Apache OpenOffice in 
their own native package manager format (.rpm,
 .deb, etc.) either from their own repositories or community repositories which 
they support. These packages have been built
 and are supported by the distributions' own teams or community members, not by 
Apache OpenOffice. Some distributions have
@@ -358,6 +361,18 @@ Please check carefully before using a th
 you will require. Replacing a 'native' distribution build with the full Apache 
OpenOffice original build can be tricky, but
 can usually be successfully accomplished by completely removing the existing 
'native' install.
 
+Useful sites for Linux installation
+The following links are additional resources for installing Apache 
OpenOffice on Linux by other parties. We hope you
+find them useful.
+
+http://sourceforge.net/projects/apacheoo-deb/files/debian/";>Unofficial 
debian repository
+http://www.if-not-true-then-false.com/2010/install-openoffice-org-on-fedora-centos-red-hat-rhel/";>Installing
 Apache OpenOffice on Fedora
+http://www.liberiangeek.net/2013/08/apache-openoffice-4-0-releasedheres-how-to-install-it-in-ubuntu/";>How
 to Install on Ubuntu
+
+
+
+
+
 

svn commit: r889001 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/common/instructions.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 20:24:43 2013
New Revision: 889001

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/download/common/instructions.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 20:24:43 2013
@@ -1 +1 @@
-1547555
+1547570

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 20:24:43 2013
@@ -1 +1 @@
-1547555
+1547570

Modified: 
websites/staging/ooo-site/trunk/content/download/common/instructions.html
==
--- websites/staging/ooo-site/trunk/content/download/common/instructions.html 
(original)
+++ websites/staging/ooo-site/trunk/content/download/common/instructions.html 
Tue Dec  3 20:24:43 2013
@@ -56,7 +56,7 @@ migrate your old profile settings to the
Linux General Installation Notes: RPM or 
DEB
Linux RPM-based
Linux DEB-based
-   Packages for Linux Distributions 
+   Additional Linux Information 
 

   Installation Problems
@@ -356,12 +356,15 @@ exists, on your system.
   Finally, start up Apache OpenOffice 4.0.x to insure it's working.
 
 
-Packages for Linux Distributions (Not compiled by Apache 
OpenOffice developers)
+Additional Linux Information
+
+Apache OpenOffice provided packages

 The Linux downloads provided on the Apache OpenOffice site (mirrors) are 
generic for either the RPM- or DEB-based package
 managers. If you have experience in directly installing these types of 
packages on your system, one of these types of
 installs should work for you. They are not specific to a particular Linux 
distribution.
 
+Apache OpenOffice from Linux distros
 Many Linux distributions now include a version of Apache OpenOffice in 
their own native package manager format (.rpm,
 .deb, etc.) either from their own repositories or community repositories which 
they support. These packages have been built
 and are supported by the distributions' own teams or community members, not by 
Apache OpenOffice. Some distributions have
@@ -374,6 +377,18 @@ Please check carefully before using a th
 you will require. Replacing a 'native' distribution build with the full Apache 
OpenOffice original build can be tricky, but
 can usually be successfully accomplished by completely removing the existing 
'native' install.
 
+Useful sites for Linux installation
+The following links are additional resources for installing Apache 
OpenOffice on Linux by other parties. We hope you
+find them useful.
+
+http://sourceforge.net/projects/apacheoo-deb/files/debian/";>Unofficial 
debian repository
+http://www.if-not-true-then-false.com/2010/install-openoffice-org-on-fedora-centos-red-hat-rhel/";>Installing
 Apache OpenOffice on Fedora
+http://www.liberiangeek.net/2013/08/apache-openoffice-4-0-releasedheres-how-to-install-it-in-ubuntu/";>How
 to Install on Ubuntu
+
+
+
+
+
 

svn commit: r889002 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread kschenk
Author: kschenk
Date: Tue Dec  3 20:26:38 2013
New Revision: 889002

Log:
OK

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r889001, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r889001, websites/staging/ooo-site/trunk/content/



svn commit: r1547643 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 23:32:08 2013
New Revision: 1547643

URL: http://svn.apache.org/r1547643
Log:
additional fixes

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547643&r1=1547642&r2=1547643&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 23:32:08 2013
@@ -44,7 +44,7 @@
 
 Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
 http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
-Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+Commercial alternatives to OpenOffice sell for 100 USD or more, and come 
without the legal right to make copies and share the software.  
 
 
 Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
@@ -57,7 +57,7 @@ our mission and help sustain a vibrant o
 How we use Donations
 
 The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
-business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR.
+business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR,
 Sub-contractors to "fill in the holes" for administrative and secretarial 
duties
 
 
@@ -66,9 +66,9 @@ Sub-contractors to "fill in the holes" f
 
 How to Donate
 
-Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
-Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
-to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
+Donations can easily be made via PayPal or Amazon.  We have another page that 
describes http://www.apache.org/foundation/contributing.html";>other 
ways to donate. 
+The Apache Software Foundation is a registered non-profit, charitable 
organization under Section 501(c)(3) of the U.S. Internal Revenue Code. This 
means that, 
+for individuals within the U.S., donations to the ASF should be 
tax-deductible. (Check with your tax accountant to confirm 
details for your personal situation.)
 
 You can contribute via PayPal by clicking on the PayPal icon:
 




svn commit: r889020 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 23:33:16 2013
New Revision: 889020

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 23:33:16 2013
@@ -1 +1 @@
-1547570
+1547643

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 23:33:16 2013
@@ -1 +1 @@
-1547570
+1547643

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 23:33:16 
2013
@@ -59,7 +59,7 @@
 
 Apache OpenOffice, the leading open source office productivity software, is 
published by the non-profit Apache Software Foundation (ASF).  Apache 
OpenOffice has been downloaded 
 http://www.openoffice.org/stats/downloads.html";>over 80 million 
times, by users in http://www.openoffice.org/stats/countries.html";>over 200 countries.  
-Commercial alternatives to OpenOffice sell for $100 or more, and come without 
the legal right to make copies and share the software.  
+Commercial alternatives to OpenOffice sell for 100 USD or more, and come 
without the legal right to make copies and share the software.  
 
 
 Apache OpenOffice is only one of http://projects.apache.org/indexes/alpha.html";>many open source 
projects that are part of the Apache Software Foundation.  The ASF 
comprises over 100 open source 
@@ -72,7 +72,7 @@ our mission and help sustain a vibrant o
 How we use Donations
 
 The Apache Software Foundation provides the technical infrastructure for 
the projects — the mailing lists, code repositories, bug tracking 
systems, etc. We have the normal 
-business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR.
+business operating expenses which go with any organization. These include: 
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office 
expenses, Marketing and PR,
 Sub-contractors to "fill in the holes" for administrative and secretarial 
duties
 
 
@@ -81,9 +81,9 @@ Sub-contractors to "fill in the holes" f
 
 How to Donate
 
-Donations can easily be made via PayPal or Amazon.  Other ways of donating are 
described http://www.apache.org/foundation/contributing.html";>here. The Apache 
Software 
-Foundation is a registered non-profit, charitable organization under Section 
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals 
within the U.S., donations 
-to the ASF should be tax-deductible. (Check with your tax 
accountant to confirm for your situation)
+Donations can easily be made via PayPal or Amazon.  We have another page that 
describes http://www.apache.org/foundation/contributing.html";>other 
ways to donate. 
+The Apache Software Foundation is a registered non-profit, charitable 
organization under Section 501(c)(3) of the U.S. Internal Revenue Code. This 
means that, 
+for individuals within the U.S., donations to the ASF should be 
tax-deductible. (Check with your tax accountant to confirm 
details for your personal situation.)
 
 You can contribute via PayPal by clicking on the PayPal icon:
 




svn commit: r1547645 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 23:39:43 2013
New Revision: 1547645

URL: http://svn.apache.org/r1547645
Log:
emphasize key request

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547645&r1=1547644&r2=1547645&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 23:39:43 2013
@@ -51,8 +51,9 @@ Apache OpenOffice is only one of 
 
-We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Your contribution also 
shows your support for Open Source and provides you the opportunity to "give 
back" to the community.
+   We invite you to donate to the Apache Software Foundation, 
to support Apache OpenOffice as well as the many the other projects at 
Apache.  
+   Your contribution shows your support for our mission and help 
sustain a vibrant organization. Your contribution also shows your support for 
Open Source 
+   and provides you the opportunity to "give back" to the 
community.
 
 How we use Donations
 




svn commit: r889021 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 23:40:23 2013
New Revision: 889021

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 23:40:23 2013
@@ -1 +1 @@
-1547643
+1547645

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 23:40:23 2013
@@ -1 +1 @@
-1547643
+1547645

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 23:40:23 
2013
@@ -66,8 +66,9 @@ Apache OpenOffice is only one of 
 
-We invite you to donate to the Apache Software Foundation, to support 
Apache OpenOffice as well as the many the other projects at Apache.  Your 
contribution shows your support for 
-our mission and help sustain a vibrant organization. Your contribution also 
shows your support for Open Source and provides you the opportunity to "give 
back" to the community.
+   We invite you to donate to the Apache Software Foundation, 
to support Apache OpenOffice as well as the many the other projects at 
Apache.  
+   Your contribution shows your support for our mission and help 
sustain a vibrant organization. Your contribution also shows your support for 
Open Source 
+   and provides you the opportunity to "give back" to the 
community.
 
 How we use Donations
 




svn commit: r1547647 - /openoffice/ooo-site/trunk/content/donations.html

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 23:41:31 2013
New Revision: 1547647

URL: http://svn.apache.org/r1547647
Log:
correct typo

Modified:
openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547647&r1=1547646&r2=1547647&view=diff
==
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 23:41:31 2013
@@ -51,7 +51,7 @@ Apache OpenOffice is only one of 
 
-   We invite you to donate to the Apache Software Foundation, 
to support Apache OpenOffice as well as the many the other projects at 
Apache.  
+   We invite you to donate to the Apache Software Foundation, 
to support Apache OpenOffice as well as the many other projects at 
Apache.  
Your contribution shows your support for our mission and help 
sustain a vibrant organization. Your contribution also shows your support for 
Open Source 
and provides you the opportunity to "give back" to the 
community.
 




svn commit: r889022 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/donations.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Tue Dec  3 23:42:06 2013
New Revision: 889022

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/donations.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 23:42:06 2013
@@ -1 +1 @@
-1547645
+1547647

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec  3 23:42:06 2013
@@ -1 +1 @@
-1547645
+1547647

Modified: websites/staging/ooo-site/trunk/content/donations.html
==
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec  3 23:42:06 
2013
@@ -66,7 +66,7 @@ Apache OpenOffice is only one of 
 
-   We invite you to donate to the Apache Software Foundation, 
to support Apache OpenOffice as well as the many the other projects at 
Apache.  
+   We invite you to donate to the Apache Software Foundation, 
to support Apache OpenOffice as well as the many other projects at 
Apache.  
Your contribution shows your support for our mission and help 
sustain a vibrant organization. Your contribution also shows your support for 
Open Source 
and provides you the opportunity to "give back" to the 
community.
 




svn commit: r889023 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Tue Dec  3 23:42:47 2013
New Revision: 889023

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r889022, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r889022, websites/staging/ooo-site/trunk/content/



svn commit: r1547685 - /openoffice/ooo-site/trunk/templates/footer.html

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 02:11:58 2013
New Revision: 1547685

URL: http://svn.apache.org/r1547685
Log:
point to new donations page

Modified:
openoffice/ooo-site/trunk/templates/footer.html

Modified: openoffice/ooo-site/trunk/templates/footer.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/templates/footer.html?rev=1547685&r1=1547684&r2=1547685&view=diff
==
--- openoffice/ooo-site/trunk/templates/footer.html (original)
+++ openoffice/ooo-site/trunk/templates/footer.html Wed Dec  4 02:11:58 2013
@@ -9,7 +9,7 @@
 Copyright & License |
 Privacy |
 Contact Us |
-http://www.apache.org/foundation/contributing.html#Paypal";>Donate |
+   Donate |
 http://www.apache.org/foundation/thanks.html";>Thanks
   
   




svn commit: r889033 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/footer.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Wed Dec  4 02:21:37 2013
New Revision: 889033

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/footer.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 02:21:37 2013
@@ -1 +1 @@
-1547647
+1547685

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 02:21:37 2013
@@ -1 +1 @@
-1547647
+1547685

Modified: websites/staging/ooo-site/trunk/content/footer.html
==
--- websites/staging/ooo-site/trunk/content/footer.html (original)
+++ websites/staging/ooo-site/trunk/content/footer.html Wed Dec  4 02:21:37 2013
@@ -9,7 +9,7 @@
 Copyright & License |
 Privacy |
 Contact Us |
-http://www.apache.org/foundation/contributing.html#Paypal";>Donate |
+   Donate |
 http://www.apache.org/foundation/thanks.html";>Thanks
   
   




svn commit: r889034 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 02:22:27 2013
New Revision: 889034

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r889033, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r889033, websites/staging/ooo-site/trunk/content/



svn commit: r889036 - in /websites/staging/openoffice/trunk/content: ./ docs/ docs/governance/ orientation/ pt-br/

2013-12-03 Thread buildbot
Author: buildbot
Date: Wed Dec  4 03:02:43 2013
New Revision: 889036

Log:
Staging update by buildbot for openoffice

Modified:
websites/staging/openoffice/trunk/content/   (props changed)
websites/staging/openoffice/trunk/content/bug-tracking.html
websites/staging/openoffice/trunk/content/community-faqs.html
websites/staging/openoffice/trunk/content/contact.html
websites/staging/openoffice/trunk/content/contributing-code.html
websites/staging/openoffice/trunk/content/developer-faqs.html
websites/staging/openoffice/trunk/content/docs/download_process.html
websites/staging/openoffice/trunk/content/docs/edit-cms.html

websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html
websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html
websites/staging/openoffice/trunk/content/docs/governance/voting.html
websites/staging/openoffice/trunk/content/downloads.html
websites/staging/openoffice/trunk/content/events.html
websites/staging/openoffice/trunk/content/get-involved.html
websites/staging/openoffice/trunk/content/get-it-here.html
websites/staging/openoffice/trunk/content/index.html
websites/staging/openoffice/trunk/content/license.html
websites/staging/openoffice/trunk/content/list-conduct.html
websites/staging/openoffice/trunk/content/mailing-lists.html
websites/staging/openoffice/trunk/content/mission.html
websites/staging/openoffice/trunk/content/native-lang.html
websites/staging/openoffice/trunk/content/orientation/decision-making.html

websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html
websites/staging/openoffice/trunk/content/orientation/index.html
websites/staging/openoffice/trunk/content/orientation/infrastructure.html

websites/staging/openoffice/trunk/content/orientation/intro-contributing.html
websites/staging/openoffice/trunk/content/orientation/intro-development.html
websites/staging/openoffice/trunk/content/orientation/intro-doc.html
websites/staging/openoffice/trunk/content/orientation/intro-l10n.html
websites/staging/openoffice/trunk/content/orientation/intro-marketing.html
websites/staging/openoffice/trunk/content/orientation/intro-qa.html
websites/staging/openoffice/trunk/content/people.html
websites/staging/openoffice/trunk/content/pmc-faqs.html
websites/staging/openoffice/trunk/content/press.html
websites/staging/openoffice/trunk/content/privacy.html
websites/staging/openoffice/trunk/content/pt-br/index.html
websites/staging/openoffice/trunk/content/pt-br/participe.html
websites/staging/openoffice/trunk/content/qa.html
websites/staging/openoffice/trunk/content/release-process.html
websites/staging/openoffice/trunk/content/security.html
websites/staging/openoffice/trunk/content/social.html
websites/staging/openoffice/trunk/content/source.html
websites/staging/openoffice/trunk/content/students.html
websites/staging/openoffice/trunk/content/style-test.html
websites/staging/openoffice/trunk/content/svn-basics.html
websites/staging/openoffice/trunk/content/terms.html
websites/staging/openoffice/trunk/content/trademarks.html
websites/staging/openoffice/trunk/content/translate.html
websites/staging/openoffice/trunk/content/website-local.html
websites/staging/openoffice/trunk/content/website-native.html

Propchange: websites/staging/openoffice/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 03:02:43 2013
@@ -1 +1 @@
-1542293
+1547697

Modified: websites/staging/openoffice/trunk/content/bug-tracking.html
==
--- websites/staging/openoffice/trunk/content/bug-tracking.html (original)
+++ websites/staging/openoffice/trunk/content/bug-tracking.html Wed Dec  4 
03:02:43 2013
@@ -90,7 +90,7 @@
 The Apache Software Foundation
 
 http://www.apache.org/";>Website
-http://www.apache.org/foundation/contributing.html";>Donations
+http://www.openoffice.org/donations.html";>Donations
 http://www.apache.org/foundation/sponsorship.html";>Sponsorship
 http://www.apache.org/foundation/thanks.html";>Thanks
 

Modified: websites/staging/openoffice/trunk/content/community-faqs.html
==
--- websites/staging/openoffice/trunk/content/community-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/community-faqs.html Wed Dec  4 
03:02:43 2013
@@ -90,7 +90,7 @@
 The Apache Software Foundation
 
 http://www.apache.org/";>Website
-http://www.apache.org/foundation/contributing.html";>Donations
+http://www.openoffice.org/donations.html";>Donations
 http://www.apache.org/foundation/sponsorship.html";>Sponsorship
 http://www.apache.org/foundation/thanks.html";>Thanks
 

Modified: websites/sta

svn commit: r1547697 - /openoffice/site/trunk/templates/sidenav.mdtext

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 03:02:20 2013
New Revision: 1547697

URL: http://svn.apache.org/r1547697
Log:
Update donations link

Modified:
openoffice/site/trunk/templates/sidenav.mdtext

Modified: openoffice/site/trunk/templates/sidenav.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/site/trunk/templates/sidenav.mdtext?rev=1547697&r1=1547696&r2=1547697&view=diff
==
--- openoffice/site/trunk/templates/sidenav.mdtext (original)
+++ openoffice/site/trunk/templates/sidenav.mdtext Wed Dec  4 03:02:20 2013
@@ -39,7 +39,7 @@
 # The Apache Software Foundation
 
   - [Website](http://www.apache.org/)
-  - [Donations](http://www.apache.org/foundation/contributing.html)
+  - [Donations](http://www.openoffice.org/donations.html)
   - [Sponsorship](http://www.apache.org/foundation/sponsorship.html)
   - [Thanks](http://www.apache.org/foundation/thanks.html)
   




svn commit: r1547698 - /openoffice/ooo-site/trunk/content/download/contribute.html

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 03:03:53 2013
New Revision: 1547698

URL: http://svn.apache.org/r1547698
Log:
Update donations link

Modified:
openoffice/ooo-site/trunk/content/download/contribute.html

Modified: openoffice/ooo-site/trunk/content/download/contribute.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/download/contribute.html?rev=1547698&r1=1547697&r2=1547698&view=diff
==
--- openoffice/ooo-site/trunk/content/download/contribute.html (original)
+++ openoffice/ooo-site/trunk/content/download/contribute.html Wed Dec  4 
03:03:53 2013
@@ -40,7 +40,7 @@ contribute their time and support to the
 Joining Mailing Lists,
 http://www.openoffice.org/qa/issue_handling/project_issues.html";>Reporting
 Bugs & Issues,
 Spreading the Word about Apache 
OpenOffice and finally
-http://www.apache.org/foundation/contributing.html";>Donating Funds.
+http://www.openoffice.org/donations.html";>Donating 
Funds.
 
 (Note: Links will open in a new window)
 




svn commit: r1547699 - /openoffice/ooo-site/trunk/content/about/index.html

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 03:05:10 2013
New Revision: 1547699

URL: http://svn.apache.org/r1547699
Log:
Update donations link

Modified:
openoffice/ooo-site/trunk/content/about/index.html

Modified: openoffice/ooo-site/trunk/content/about/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/about/index.html?rev=1547699&r1=1547698&r2=1547699&view=diff
==
--- openoffice/ooo-site/trunk/content/about/index.html (original)
+++ openoffice/ooo-site/trunk/content/about/index.html Wed Dec  4 03:05:10 2013
@@ -103,7 +103,7 @@ Apache Openoffice is released under the 
 
 
 There are a variety of ways you can actively http://contributing.openoffice.org/index.html";>participate in the 
OpenOffice Community.
-These range from something as easy as  http://www.apache.org/foundation/contributing.html";>donating to the 
Apache Software Foundation, or participating 
+These range from something as easy as  http://www.openoffice.org/donations.html";>donating to the Apache 
Software Foundation, or participating 
 in mailing lists, to actually contributing code for the product. Please visit 
the http://www.apache.org/foundation/getinvolved.html";>Apache Software 
Foundation Get Involved
  page for an overview on what it means
 to be an Apache contributor/committer. 




svn commit: r889037 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/download/contribute.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Wed Dec  4 03:06:52 2013
New Revision: 889037

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/download/contribute.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 03:06:52 2013
@@ -1 +1 @@
-1547685
+1547698

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 03:06:52 2013
@@ -1 +1 @@
-1547685
+1547698

Modified: websites/staging/ooo-site/trunk/content/download/contribute.html
==
--- websites/staging/ooo-site/trunk/content/download/contribute.html (original)
+++ websites/staging/ooo-site/trunk/content/download/contribute.html Wed Dec  4 
03:06:52 2013
@@ -56,7 +56,7 @@ contribute their time and support to the
 Joining Mailing Lists,
 http://www.openoffice.org/qa/issue_handling/project_issues.html";>Reporting
 Bugs & Issues,
 Spreading the Word about Apache 
OpenOffice and finally
-http://www.apache.org/foundation/contributing.html";>Donating Funds.
+http://www.openoffice.org/donations.html";>Donating 
Funds.
 
 (Note: Links will open in a new window)
 




svn commit: r889038 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/about/index.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Wed Dec  4 03:10:44 2013
New Revision: 889038

Log:
Staging update by buildbot for ooo-site

Modified:
websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
websites/staging/ooo-site/trunk/content/   (props changed)
websites/staging/ooo-site/trunk/content/about/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 03:10:44 2013
@@ -1 +1 @@
-1547698
+1547699

Propchange: websites/staging/ooo-site/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 03:10:44 2013
@@ -1 +1 @@
-1547698
+1547699

Modified: websites/staging/ooo-site/trunk/content/about/index.html
==
--- websites/staging/ooo-site/trunk/content/about/index.html (original)
+++ websites/staging/ooo-site/trunk/content/about/index.html Wed Dec  4 
03:10:44 2013
@@ -119,7 +119,7 @@ Apache Openoffice is released under the 
 
 
 There are a variety of ways you can actively http://contributing.openoffice.org/index.html";>participate in the 
OpenOffice Community.
-These range from something as easy as  http://www.apache.org/foundation/contributing.html";>donating to the 
Apache Software Foundation, or participating 
+These range from something as easy as  http://www.openoffice.org/donations.html";>donating to the Apache 
Software Foundation, or participating 
 in mailing lists, to actually contributing code for the product. Please visit 
the http://www.apache.org/foundation/getinvolved.html";>Apache Software 
Foundation Get Involved
  page for an overview on what it means
 to be an Apache contributor/committer. 




svn commit: r889040 - in /websites/production/ooo-site: cgi-bin/ content/

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 03:13:39 2013
New Revision: 889040

Log:
Publishing svnmucc operation to ooo-site site by robweir

Added:
websites/production/ooo-site/cgi-bin/
  - copied from r889039, websites/staging/ooo-site/trunk/cgi-bin/
websites/production/ooo-site/content/
  - copied from r889039, websites/staging/ooo-site/trunk/content/



svn commit: r889044 - /websites/production/openoffice/content/

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 03:57:43 2013
New Revision: 889044

Log:
Publishing svnmucc operation to openoffice site by robweir

Added:
websites/production/openoffice/content/
  - copied from r889043, websites/staging/openoffice/trunk/content/



svn commit: r889043 - in /websites/staging/openoffice/trunk/content: ./ get-involved.html

2013-12-03 Thread buildbot
Author: buildbot
Date: Wed Dec  4 03:57:32 2013
New Revision: 889043

Log:
Staging update by buildbot for openoffice

Modified:
websites/staging/openoffice/trunk/content/   (props changed)
websites/staging/openoffice/trunk/content/get-involved.html

Propchange: websites/staging/openoffice/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Wed Dec  4 03:57:32 2013
@@ -1 +1 @@
-1547697
+1547701

Modified: websites/staging/openoffice/trunk/content/get-involved.html
==
--- websites/staging/openoffice/trunk/content/get-involved.html (original)
+++ websites/staging/openoffice/trunk/content/get-involved.html Wed Dec  4 
03:57:32 2013
@@ -99,8 +99,11 @@
   
 Get Involved
 Why get involved 
with the OpenOffice project?
-There are many motivations for why volunteers participate in an open source 
project
-like OpenOffice.  Some of the more common ones include:
+Although many are content to http://www.openoffice.org/donations.html";>make a small donation to 
support Apache OpenOffice and the 
+Apache Software Foundation (we appreciate every contribution), some users want 
to 
+get more involved and volunteer their time and expertise with the project.
+There are many motivations  for why volunteers participate in an open source 
+project like OpenOffice.  Some of the more common ones include:
 
 To help reduce the "digital divide" by ensuring continued access to free 
 high-quality free productivity applications world-wide.




svn commit: r1547701 - /openoffice/site/trunk/content/get-involved.mdtext

2013-12-03 Thread robweir
Author: robweir
Date: Wed Dec  4 03:57:22 2013
New Revision: 1547701

URL: http://svn.apache.org/r1547701
Log:
Add link to donations page

Modified:
openoffice/site/trunk/content/get-involved.mdtext

Modified: openoffice/site/trunk/content/get-involved.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/site/trunk/content/get-involved.mdtext?rev=1547701&r1=1547700&r2=1547701&view=diff
==
--- openoffice/site/trunk/content/get-involved.mdtext (original)
+++ openoffice/site/trunk/content/get-involved.mdtext Wed Dec  4 03:57:22 2013
@@ -18,8 +18,11 @@ Notice:Licensed to the Apache Softwa
 
 ## Why get involved with the OpenOffice project?
 
-There are many motivations for why volunteers participate in an open source 
project
-like OpenOffice.  Some of the more common ones include:
+Although many are content to [make a small 
donation](http://www.openoffice.org/donations.html) to support Apache 
OpenOffice and the 
+Apache Software Foundation (we appreciate every contribution), some users want 
to 
+get more involved and volunteer their time and expertise with the project.  
+There are many motivations  for why volunteers participate in an open source 
+project like OpenOffice.  Some of the more common ones include:
 
   - To help reduce the "digital divide" by ensuring continued access to free 
 high-quality free productivity applications world-wide.




buildbot failure in ASF Buildbot on openoffice-fbsd-nightly

2013-12-03 Thread buildbot
Hi! , The openoffice-fbsd-nightly builder has just completed a run

STATUS: Failure

 Build revision 1547702 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-fbsd2_64bit

 Build results at: 
http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/110

 Build reason was: The Nightly scheduler named 'openoffice-fbsd-nightly' 
triggered this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






buildbot retry in ASF Buildbot on aoo-win7

2013-12-03 Thread buildbot
Hi! , The aoo-win7 builder has just completed a run

STATUS: Retry

 Build revision 1547315 on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-win7

 Build results at: http://ci.apache.org/builders/aoo-win7/builds/860

 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered 
this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot






buildbot failure in ASF Buildbot on aoo-win7

2013-12-03 Thread buildbot
Hi! , The aoo-win7 builder has just completed a run

STATUS: Failure

 Build revision None on branch openoffice/trunk

 Snapshot results at: http://ci.apache.org/projects/openoffice/

 Build using the ASF buildslave: bb-win7

 Build results at: http://ci.apache.org/builders/aoo-win7/builds/861

 Build reason was: The Nightly scheduler named 'aoo-win7-nightly' triggered 
this build


 Yours Sincerely - The ASF Buildbot (http://ci.apache.org/)
--

 Join the bui...@apache.org mailing list for help with Buildbot