incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1400725 - in /incubator/ooo/site/trunk: content/openofficeorg/ content/openofficeorg/docs/governance/ content/openofficeorg/orientation/ templates/
Date Sun, 21 Oct 2012 21:08:51 GMT
Author: robweir
Date: Sun Oct 21 21:08:50 2012
New Revision: 1400725

URL: http://svn.apache.org/viewvc?rev=1400725&view=rev
Log:
Post-graduation updates

Added:
    incubator/ooo/site/trunk/content/openofficeorg/pmc-faqs.mdtext
      - copied, changed from r1400721, incubator/ooo/site/trunk/content/openofficeorg/ppmc-faqs.mdtext
Removed:
    incubator/ooo/site/trunk/content/openofficeorg/ppmc-faqs.mdtext
Modified:
    incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/developer-faqs.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/downloads.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/get-it-here.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/index.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/native-lang.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/people.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/source.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/translate.mdtext
    incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext
    incubator/ooo/site/trunk/templates/sidenav.mdtext
    incubator/ooo/site/trunk/templates/skeleton.html

Modified: incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/contact.mdtext Sun Oct 21 21:08:50 2012
@@ -28,7 +28,7 @@ For any questions, comments, or concerns
 
   - [ooo-dev@incubator.apache.org][1].
 
-For private or legal matters, please contact the Podling Project Management Committee (PPMC):
+For private or legal matters, please contact the Project Management Committee (PMC):
 
   - [ooo-private@incubator.apache.org][2].
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/developer-faqs.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/developer-faqs.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/developer-faqs.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/developer-faqs.mdtext Sun Oct 21 21:08:50
2012
@@ -53,14 +53,14 @@ administrative steps that you will need 
 when this has occurred when your name appears in the [Unlisted ICLAs] [5] section 
 on the Apache Committers page.  This could take a couple of days, longer if you
 submitted the ICLA via post.
- 1. Once the your ICLA has been recorded, you should send a note to the [PPMC] [6] 
+ 1. Once the your ICLA has been recorded, you should send a note to the [PMC] [6] 
 and request an Apache account.  You will want to include your full name and email address,

 as you entered in the ICLA, as well as your preferred userid.  Please [check first] [7] 
 that your preferred userid is not already in use by another Apache Committer.
  1. Once your Apache account has been created, you will receive an email with
 further instructions for setting up your account.  This may take a couple of days.
- 1. If you were also voted as a PPMC member, you should then [subscribe] [8] to the 
-PPMC's private mailing list.
+ 1. If you were also voted as a PMC member, you should then [subscribe] [8] to the 
+PMC's private mailing list.
 
  1. Finally, you should read the ["Guide for new committers"] [9]
 
@@ -92,7 +92,7 @@ You might want to start by reviewing the
 development](http://www.openoffice.org/development/). Or, take
 a look at information posted on the [OpenOffice.org wiki](http://wiki.services.openoffice.org/wiki/Main_Page).
 
-Of course, you will need the [source code](http://incubator.apache.org/openofficeorg/source.html)
to do anything.
+Of course, you will need the [source code](http://openoffice.apache.org/source.html) to do
anything.
 
 You don't have to be an actual committer to submit code. You can submit patches through
 the Apache OpenOffice Bugzilla issue reporting system. You simply need to file an issue
@@ -125,7 +125,7 @@ additional information on current and fu
 
   [1]: http://www.simpleeditions.com/59001/markdown-an-introduction
   [2]: https://svn.apache.org/repos/asf/incubator/ooo/site
-  [3]: http://incubator.apache.org/openofficeorg/docs/edit-cms.html
+  [3]: http://openoffice.apache.org/docs/edit-cms.html
   [4]: http://www.apache.org/licenses/icla.txt
   [5]: http://people.apache.org/committer-index.html#unlistedclas
   [6]: mailto:ooo-private@incubator.apache.org
@@ -133,7 +133,7 @@ additional information on current and fu
   [8]: mailto:ooo-private-subscribe@incubator.apache.org
   [9]: http://www.apache.org/dev/new-committers-guide.html
   [10]: website-local.html
-  [11]: http://incubator.apache.org/openofficeorg/svn-basics.html
+  [11]: http://openoffice.apache.org/svn-basics.html
   [12]: https://svn.apache.org/repos/asf/incubator/ooo/ooo-site
   [13]: http://ci.apache.org/builders/
   [14]: http://www.raphaelbircher.ch/devsnap.php

Modified: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext Sun Oct 21
21:08:50 2012
@@ -107,6 +107,6 @@ The notation used in voting is:
 [See here for more mail templates][3]
 
 
-  [1]: http://incubator.apache.org/openofficeorg/docs/governance/consensusBuilding.html
+  [1]: http://openoffice.apache.org/docs/governance/consensusBuilding.html
   [2]: http://incubator.apache.org/rave/docs/governance/voting.html
   [3]: http://community.apache.org/newcommitter.html

Modified: incubator/ooo/site/trunk/content/openofficeorg/downloads.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/downloads.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/downloads.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/downloads.mdtext Sun Oct 21 21:08:50 2012
@@ -18,7 +18,7 @@ Notice:    Licensed to the Apache Softwa
 
 The Apache OpenOffice project is pleased to announce the release of 3.4.1 on August 22, 2012.

 
-Our comprehensive [RELEASE Notes](http://www.openoffice.org/development/releases/3.4.1.html)
will inform about the changes in this release. People interested in AOO should also follow
the [mailing lists](http://incubator.apache.org/openofficeorg/mailing-lists.html) to track
progress.
+Our comprehensive [RELEASE Notes](http://www.openoffice.org/development/releases/3.4.1.html)
will inform about the changes in this release. People interested in AOO should also follow
the [mailing lists](http://openoffice.apache.org/mailing-lists.html) to track progress.
 
 The Apache OpenOffice source release files are listed below. The pre-built versions of Apache
OpenOffice 3.4.1 are available via the central [download](http://www.openoffice.org/download/index.html)
page.
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/get-it-here.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/get-it-here.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/get-it-here.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/get-it-here.mdtext Sun Oct 21 21:08:50
2012
@@ -24,7 +24,7 @@ following logo subject to the following 
 <p> 
 <a href="http://download.openoffice.org/">
 <img width="300" height="100" alt="Download Apache OpenOffice here" 
-src="http://incubator.apache.org/openofficeorg/images/get-it-here/en.png"/>
+src="http://openoffice.apache.org/images/get-it-here/en.png"/>
 </a>
 </p>
 
@@ -62,7 +62,7 @@ HTML page:
 
     <a href="http://download.openoffice.org/">
     <img width="300" height="100" alt="Download Apache OpenOffice here" 
-    src="http://incubator.apache.org/openofficeorg/images/get-it-here/en.png"/>
+    src="http://openoffice.apache.org/images/get-it-here/en.png"/>
     </a>
 
 ##Feedback
@@ -73,10 +73,10 @@ website.  You can send your links to us 
 Also, if you run into problems, we want to hear about that as well.
 
 
-[1]: http://incubator.apache.org/openofficeorg/images/get-it-here/en.png
-[2]: http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list
+[1]: http://openoffice.apache.org/images/get-it-here/en.png
+[2]: http://openoffice.apache.org/mailing-lists.html#development-mailing-list
 [3]: http://www.openoffice.org
 [4]: http://download.openoffice.org
 [5]: http://www.openoffice.org/download/other.html
-[6]: http://incubator.apache.org/openofficeorg/trademarks.html
+[6]: http://openoffice.apache.org/trademarks.html
 [7]: mailto:ooo-marketing@incubator.apache.org
\ No newline at end of file

Modified: incubator/ooo/site/trunk/content/openofficeorg/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/index.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/index.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/index.mdtext Sun Oct 21 21:08:50 2012
@@ -9,7 +9,7 @@ Title: Apache OpenOffice
 *2012-08-23 -- Apache OpenOffice 3.4.1 (incubating) is released!*
 
   - [Release announcement](https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_3_41)
-  - [Download Source and SDK](http://incubator.apache.org/openofficeorg/downloads.html)
+  - [Download Source and SDK](http://openoffice.apache.org/downloads.html)
   - [Download Binaries](http://download.openoffice.org)
 
 ##What is OpenOffice?

Modified: incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext Sun Oct 21 21:08:50
2012
@@ -214,7 +214,7 @@ mailing list for the OpenOffice project:
 For any topic not covered by the above, send your post to
 ooo-dev@incubator.apache.org
 
-  [1]:  http://incubator.apache.org/openofficeorg/list-conduct.html
+  [1]:  http://openoffice.apache.org/list-conduct.html
 
   [2]:  mailto:ooo-users-subscribe@incubator.apache.org
   [3]:  mailto:ooo-users@incubator.apache.org
@@ -256,7 +256,7 @@ ooo-dev@incubator.apache.org
   [33]: http://markmail.org/search/+list:org.apache.incubator.ooo-issues
   [34]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-issues/
 
-  [35]: http://incubator.apache.org/openofficeorg/native-lang.html
+  [35]: http://openoffice.apache.org/native-lang.html
 
   [36]: http://openoffice.markmail.org/
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/native-lang.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/native-lang.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/native-lang.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/native-lang.mdtext Sun Oct 21 21:08:50
2012
@@ -11,7 +11,7 @@ Currently, the scope of Native Language 
 * Hosting of native language websites on [www.openoffice.org](http://www.openoffice.org/projects/native-lang.html).
 Established native language "friendly" links have also established &mdash; for example,
[fr.openoffice.org](http://www.openoffice.org/fr/)
 * Native language mailing lists (as requested and needed). The establishment of any native
language mailing list requires the approval of Apache OpenOffice
-PPMC and typically at least two moderators. Requests for additional native language mailing
lists can be
+PMC and typically at least two moderators. Requests for additional native language mailing
lists can be
 made via the [ooo-dev mailing list](mailto:ooo-dev@incubator.apache.org).
 * [Native Language User Support Forums](http://user.services.openoffice.org/) (for some languages).
 * A [Pootle server](https://translate.apache.org/) to aid with translation.   
@@ -26,7 +26,7 @@ for establishing a native language area.
 
 Legacy OpenOffice.org were not automatically migrated to Apache OpenOffice. New native 
 language mailing lists for the project are made at the request of an Apache OpenOffice
-PPMC (Podling Project Management Committee) member, and after discussion and consensus on
the
+PMC (Project Management Committee) member, and after discussion and consensus on the
 ooo-dev mailing list.  Additionally new mailing lists typically require at least two 
 moderators to be established. Initiate setup requests through: [ooo-dev@incubator.openoffice.org](mailto:dev-ooo@openoffice.org)
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/orientation/level-1.mdtext Sun Oct 21 21:08:50
2012
@@ -46,19 +46,19 @@ all meet together in the same room or ev
 everyone's busy and varying schedule, we use mailing lists to coordinate our work, make proposals,
gather 
 consensus and resolve community issues.  There are three mailing lists that every Volunteer
should be on:
 
-    1. [ooo-dev](http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list)
 This is the 
+    1. [ooo-dev](http://openoffice.apache.org/mailing-lists.html#development-mailing-list)
 This is the 
 main mailing list for the project, and gets a lot of traffic.  But this is where project-wide
discussions occur.
-    1. [ooo-announce](http://incubator.apache.org/openofficeorg/mailing-lists.html#announce-mailing-list)
This 
+    1. [ooo-announce](http://openoffice.apache.org/mailing-lists.html#announce-mailing-list)
This 
 is the official announcement list for the project.  It is used for announcing things like
new releases, 
 security patches, conferences, etc.
-    1. [ooo-users](http://incubator.apache.org/openofficeorg/mailing-lists.html#users-mailing-list)
This is our users
+    1. [ooo-users](http://openoffice.apache.org/mailing-lists.html#users-mailing-list) This
is our users
 list and is one way in which we provide support to end users.  Although you may not be interested
specifically
 in user support, it is still recommended that you follow this list, even if just to get a
feel for
 user concerns, problems, feature ideas, etc.
 
 1. You can also review other mailing lists we host and which may be of interest, including
ones focused on 
-specific [project functions](http://incubator.apache.org/openofficeorg/mailing-lists.html)
and 
-[native languages](http://incubator.apache.org/openofficeorg/native-lang.html).
+specific [project functions](http://openoffice.apache.org/mailing-lists.html) and 
+[native languages](http://openoffice.apache.org/native-lang.html).
 
 1. One of the first practical tests each Volunteer faces is dealing with the volume of emails
that comes from 
 participation in an open source project like this.  A good email client for this kind of
work will support 
@@ -69,8 +69,8 @@ or a web search first, and if that fails
 
 1. Because our mailing lists can be busy, and we're not all native English speakers, and
because email text is 
 a crude medium which makes it hard to express nuanced emotions, we need to be careful and
tolerant in how we 
-use it.  Please read over our [Participation Guidelines](http://incubator.apache.org/openofficeorg/mailing-lists.html#participation-guidelines)

-and [List Conduct Guidelines](http://incubator.apache.org/openofficeorg/list-conduct.html)
for more information.
+use it.  Please read over our [Participation Guidelines](http://openoffice.apache.org/mailing-lists.html#participation-guidelines)

+and [List Conduct Guidelines](http://openoffice.apache.org/list-conduct.html) for more information.
 
 1. Aside from the mailing lists there are several online services that every volunteer should
be signed up for:
 

Modified: incubator/ooo/site/trunk/content/openofficeorg/people.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/people.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/people.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/people.mdtext Sun Oct 21 21:08:50 2012
@@ -19,7 +19,7 @@ Notice:    Licensed to the Apache Softwa
 Apache OpenOffice.org is a community developed project. The list below
 is a partial list of contributors to the project, for a complete list you'd have
 to look at all contributors to our issue tracker, mailing list and version control.
-For the complete list of Committers, PPMC, and Members to the project see 
+For the complete list of Committers, PMC, and Members to the project see 
 [the committers by project list](http://people.apache.org/committers-by-project.html#ooo).
 
 | Apache ID | Name                                      # {.w160}| Home            # {.w180}|
Skills/Interests |

Copied: incubator/ooo/site/trunk/content/openofficeorg/pmc-faqs.mdtext (from r1400721, incubator/ooo/site/trunk/content/openofficeorg/ppmc-faqs.mdtext)
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/pmc-faqs.mdtext?p2=incubator/ooo/site/trunk/content/openofficeorg/pmc-faqs.mdtext&p1=incubator/ooo/site/trunk/content/openofficeorg/ppmc-faqs.mdtext&r1=1400721&r2=1400725&rev=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/ppmc-faqs.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/pmc-faqs.mdtext Sun Oct 21 21:08:50 2012
@@ -1,4 +1,4 @@
-Title:     PPMC FAQs
+Title:     PMC FAQs
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information
@@ -22,10 +22,9 @@ Here are a number of FAQ's about how the
 
 [TOC]
 
-# What is the PPMC? # {#ppmc}
+# What is the PMC? # {#pmc}
 
-The Podling Project Management Committee (PPMC) is the government of the project. It
-consists of ASF mentors and initial committers. The committee is responsible for the
+The Project Management Committee (PMC) is the government of the project. The committee is
responsible for the
 project and decides what to do and which direction to go.
 <br> ([see here for more information][1])
 
@@ -47,7 +46,7 @@ Each mailing list has one or more modera
   - ooo-marketing moderators are Rob Weir,
   - ooo-private (restricted access) moderators are Rob Weir,
   - ooo-security (restricted access)with Rob Weir, Dennis Hamilton, Wolf Halton 
-and Juergen Schmidt as members.  New members can be added by consensus of the PPMC
+and Juergen Schmidt as members.  New members can be added by consensus of the PMC
 
 Responsibilities of mailing list moderators include:
 
@@ -86,7 +85,7 @@ Blog admins: Admins authorize new author
 
 ## Bugzilla
 
-There are two admins on the PPMC:  Rob Weir and T.J. Frazier.
+There are two admins on the PMC:  Rob Weir and T.J. Frazier.
 
 ## SVN
 
@@ -96,7 +95,7 @@ rights, such as importing a dump file, [
 ## Confluence Wiki
 
   - OOOUSERS. This wiki is open to anyone with a CWiki account.
-  - OOODEV. This wiki may only be edited by project committers, PPMC, and iCLA signers.
+  - OOODEV. This wiki may only be edited by project committers, PMC, and iCLA signers.
 
 Dave Fisher has Confluence Admin rights and can authorize new editors in the OOODEV Wiki.
 
@@ -193,51 +192,9 @@ to come to a decision by discussions. Th
 that means also to count the votes and present the result. Every member has 1 vote.
 <br> ([see here for more information][11])
 
-# How to I update the Podling Status File?  # {#status}
-
-It is important to keep our [Status File] [14] up to date as our podling evolves toward graduation.
-Examples of things that should be updated include:
-
-1. When a new mailing list is created
-1. When a new committer is announced
-1. When the podling has made a release
-1. When the podling has submitted a new report
-1. Other newsworthy accomplishments 
-
-Updating the status report is not very difficult, though it is not as easy as updating a
wiki or a web
-page via the CMS.  But is certainly straightforward if you have a Linux desktop.
-
-First, check out the website source:
-
-    svn co https://svn.apache.org/repos/asf/incubator/public/trunk incubator
-
-Then edit the incubator/content/projects/openofficeorg.xml file in a text editor to add your
new content. 
-The XML should be self-explanatory.  Just follow the example of what you see there.
-
-Then go back up to the incubator dir and run ant to rebuild the site:
-
-    ant
-
-Take a look at the generated output in incubator/site-publish/projects/openofficeorg.html
to make sure you like 
-the results.  Repeat the editing and running ant until you have what you want.
-
-When you are ready to commit your changes you do:
-
-    svn commit
-
-Note that you will be checking in two files:  the source XML in incubator/site-author/projects
as well as 
-the generated html in incubator/site-publish/projects
-
-One that is done you need to check out the changed html into the production website:
-
-    ssh <apache-id>@people.apache.org
-    cd /www/incubator.apache.org
-    svn update
-
-Due to caching your changes may not be evident immediately on the public website.
 
   [1]: https://cwiki.apache.org/INFRA/resource-request-faqs.html
-  [2]: http://incubator.apache.org/openofficeorg/mailing-lists.html
+  [2]: http://openoffice.apache.org/mailing-lists.html
   [3]: https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home
   [4]: http://incubator.apache.org/guides/participation.html
   [5]: http://www.apache.org/licenses/icla.txt
@@ -246,7 +203,7 @@ Due to caching your changes may not be e
   [8]: https://svn.apache.org/repos/private/committers
   [9]: http://www.apache.org/dev/new-committers-guide.html
   [10]: http://www.apache.org/dev/committers.html
-  [11]: http://incubator.apache.org/openofficeorg/docs/governance/voting.html
+  [11]: http://openoffice.apache.org/docs/governance/voting.html
   [12]: https://issues.apache.org/jira/browse/INFRA
   [13]: https://cwiki.apache.org/confluence/display/OOOUSERS/Help+Wanted
-  [14]: http://incubator.apache.org/projects/openofficeorg.html
+

Modified: incubator/ooo/site/trunk/content/openofficeorg/source.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/source.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/source.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/source.mdtext Sun Oct 21 21:08:50 2012
@@ -19,7 +19,7 @@ Notice:    Licensed to the Apache Softwa
 We use [Apache Subversion][1] for version control. You can [browse our 
 repository][2] in your web browser. 
 
-See our [Subversion Basics](http://incubator.apache.org/openofficeorg/svn-basics.html)
+See our [Subversion Basics](http://openoffice.apache.org/svn-basics.html)
 for more information on using subversion (svn) for the Apache OpenOffice project.
 
 For further information see the [Apache Source Code Repository][3] page.

Modified: incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/terms.mdtext Sun Oct 21 21:08:50 2012
@@ -18,11 +18,11 @@ Notice:    Licensed to the Apache Softwa
 
 Terms of Use for Apache Incubator project openoffice.org web site
 
-1. INTRODUCTION. This Site and its contents are made available by Apache Software Foundation,
incubator project OpenOffice.org podling project management committee (AOO-PPMC). These Terms
of Use apply to everyone who Uses this Site (as defined below), or who participates in any
projects hosted on this Site. PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR
PARTICIPATING IN ANY PROJECTS, YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM.
IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY
PROJECTS HOSTED ON THIS SITE.
+1. INTRODUCTION. This Site and its contents are made available by Apache Software Foundation,
OpenOffice Project Management Committee (AOO-PMC). These Terms of Use apply to everyone who
Uses this Site (as defined below), or who participates in any projects hosted on this Site.
PLEASE READ THESE TERMS CAREFULLY FIRST. BY USING THE SITE OR PARTICIPATING IN ANY PROJECTS,
YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU DO NOT WISH TO BE BOUND
BY THE TERMS, THEN DO NOT USE THE SITE OR PARTICIPATE IN ANY PROJECTS HOSTED ON THIS SITE.
 
 2. DEFINITIONS. As used here:  
 
-    a. "Host" means AOO-PPMC.  
+    a. "Host" means AOO-PMC.  
 
     b. "Materials" means source code, code samples, object code, technical materials, documentation
, discussion thread postings, weblogs, wikis, data, and any other content, information or
technology available on the Site.  
  
@@ -67,7 +67,7 @@ Terms of Use for Apache Incubator projec
 
     e. Other Licenses/Terms. Some Projects are governed by their own terms regarding Submissions
and may require You to sign agreements (such as an Apache Software Foundation Individual Contributor
License Agreement) licensing Your rights in Your Submissions. In all such cases, and to the
extent there is a conflict, the terms of those Projects and agreements take precedence over
these Terms.
 
-    f. Privacy. You consent to the collection, processing and storage by the Host of any
personal information provided by You in accordance with the terms of AOO-PPMC Privacy Policy,
which is available at [http://incubator.apache.org/openofficeorg/privacy.html][1]. You agree
to comply with all applicable laws and regulations, and the terms of Apache OpenOffice.org
Privacy Policy, with respect to any use by You of any personal information in connection with
this Site.
+    f. Privacy. You consent to the collection, processing and storage by the Host of any
personal information provided by You in accordance with the terms of AOO-PMC Privacy Policy,
which is available at [http://openoffice.apache.org/privacy.html][1]. You agree to comply
with all applicable laws and regulations, and the terms of Apache OpenOffice.org Privacy Policy,
with respect to any use by You of any personal information in connection with this Site.
 
 5. MISCELLANEOUS.
 
@@ -85,4 +85,4 @@ Terms of Use for Apache Incubator projec
 
     g. General. You agree that these Terms of Use are the complete agreement for the Site,
Materials and Submissions, and these Terms of Use supersedes all prior or contemporaneous
agreements or representations. If any term of these Terms of Use is found to be invalid or
unenforceable, the remaining provisions will remain effective
 
-[1]: http://incubator.apache.org/openofficeorg/privacy.html
\ No newline at end of file
+[1]: http://openoffice.apache.org/privacy.html
\ No newline at end of file

Modified: incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/trademarks.mdtext Sun Oct 21 21:08:50 2012
@@ -49,10 +49,10 @@ context of the overall design.
 
     1. Any other information you think would be useful, e.g., any impeding deadlines
 
-1. On receipt of the proposal, the Apache OpenOffice PPMC will review
+1. On receipt of the proposal, the Apache OpenOffice PMC will review
 and decide whether or not to recommend approval.
 
-1. If the PPMC recommends approval, then they will forward their
+1. If the PMC recommends approval, then they will forward their
 recommendation, along with your proposal and any follow up
 communications, to the Apache V.P. of Brand Management for final
 approval.
@@ -68,4 +68,4 @@ logo may be used according to the requir
 
 [1]: http://www.apache.org/foundation/marks/
 [2]: mailto:ooo-private@incubator.apache.org?subject=Trademark
-[3]: http://incubator.apache.org/openofficeorg/get-it-here.html
+[3]: http://openoffice.apache.org/get-it-here.html

Modified: incubator/ooo/site/trunk/content/openofficeorg/translate.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/translate.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/translate.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/translate.mdtext Sun Oct 21 21:08:50 2012
@@ -56,7 +56,7 @@ If a build is not yet ready for your lan
 means that the translation is not yet complete.  You can help finish
 the translation in several ways:
 
- 1. You can send a note to the [ooo-L10n list](http://incubator.apache.org/openofficeorg/mailing-lists.html#localization-mailing-list)

+ 1. You can send a note to the [ooo-L10n list](http://openoffice.apache.org/mailing-lists.html#localization-mailing-list)

 requesting the PO file for that language.  This file can be
 loaded into a translation management tool (some popular ones are listed 
 [here](http://wiki.services.openoffice.org/wiki/Pootle_User_Guide#Translating_off-line) where
you can edit the
@@ -74,7 +74,7 @@ contributions via their efforts are regu
 
  1. Whichever method you use, when you have completed the initial
 translation, send a note to the 
-[ooo-L10n list](http://incubator.apache.org/openofficeorg/mailing-lists.html#localization-mailing-list).
  At that point we can make a special test build of Apache
+[ooo-L10n list](http://openoffice.apache.org/mailing-lists.html#localization-mailing-list).
  At that point we can make a special test build of Apache
 OpenOffice for you to review.  If more changes are required in the
 translation, we can iterate on these steps, making changes, making new
 test builds, etc.
@@ -85,4 +85,4 @@ additional users, even if they cannot he
 they can help review the test build and point out errors in
 translation, as well as other localization errors.  Others on the
 OpenOffice project might be able to help you find other interested
-users, so let us know, via a note to the [ooo-L10n list](http://incubator.apache.org/openofficeorg/mailing-lists.html#localization-mailing-list)
if you want that help.
\ No newline at end of file
+users, so let us know, via a note to the [ooo-L10n list](http://openoffice.apache.org/mailing-lists.html#localization-mailing-list)
if you want that help.
\ No newline at end of file

Modified: incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext Sun Oct 21 21:08:50
2012
@@ -26,7 +26,7 @@ pages are updated by the project communi
 
 The Apache OpenOffice project maintains two websites:
 
-* The [project website](http://incubator.apache.org/openofficeorg/), primarily for development
and technical information (which you're viewing now)
+* The [project website](http://openoffice.apache.org/), primarily for development and technical
information (which you're viewing now)
 * The user portal, [www.openoffice.org](http://www.openoffice.org), primarily for end user
information and support
 
 Both of these sites use the [Apache Content Management System](http://www.apache.org/dev/cms.html)
(CMS) to manage editing, submitting changes, and updating the live websites.
@@ -88,7 +88,7 @@ section, you will likely be running **pu
 ### For Contributors -- non-committers
 If you are not a committer, you will need
 to follow the procedures for "contributors" in the
-[Developer FAQ](http://incubator.apache.org/openofficeorg/developer-faqs.html#im_not_a_committer)
+[Developer FAQ](http://openoffice.apache.org/developer-faqs.html#im_not_a_committer)
 for getting your changes published by a committer of the project, after you submit a patch.
 
 ## How To Do Website Development Locally (for technical users)

Modified: incubator/ooo/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/sidenav.mdtext?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/templates/sidenav.mdtext (original)
+++ incubator/ooo/site/trunk/templates/sidenav.mdtext Sun Oct 21 21:08:50 2012
@@ -26,11 +26,10 @@
   - [Security Reports](/openofficeorg/security.html)
   - [Developer FAQs](/openofficeorg/developer-faqs.html)
   
-# Project Management PPMC
+# Project Management PMC
 
   - [Project Blog](http://blogs.apache.org/OOo/)
-  - [Incubation Status](http://incubator.apache.org/projects/openofficeorg.html)
-  - [PPMC FAQs](/openofficeorg/ppmc-faqs.html)  
+  - [PMC FAQs](/openofficeorg/pmc-faqs.html)  
 
 # The Apache Software Foundation
 

Modified: incubator/ooo/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/skeleton.html?rev=1400725&r1=1400724&r2=1400725&view=diff
==============================================================================
--- incubator/ooo/site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/site/trunk/templates/skeleton.html Sun Oct 21 21:08:50 2012
@@ -42,7 +42,7 @@
 
 <body>
   <div id="banner">
-    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://incubator.apache.org/openofficeorg/">
+    <div id="bannerleft"><a alt="Apache OpenOffice" href="http://openoffice.apache.org/">
       <img id="logo" alt="Apache OpenOffice" src="http://www.openoffice.org/images/AOO_logos/OOo_Website_v2_copy.png"/></a></div>
     
    <div id="bannercenter"><br/>|&nbsp;The Free and Open Productivity Suite</div>



Mime
View raw message