You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/11/27 13:54:02 UTC

svn commit: r1414162 - in /openoffice/site/trunk/content/openofficeorg: ./ docs/ docs/governance/ orientation/

Author: hdu
Date: Tue Nov 27 12:53:56 2012
New Revision: 1414162

URL: http://svn.apache.org/viewvc?rev=1414162&view=rev
Log:
many fixes to links to post-graduation addresses

Modified:
    openoffice/site/trunk/content/openofficeorg/bug-tracking.mdtext
    openoffice/site/trunk/content/openofficeorg/developer-faqs.mdtext
    openoffice/site/trunk/content/openofficeorg/docs/edit-cms.mdtext
    openoffice/site/trunk/content/openofficeorg/docs/governance/voting.mdtext
    openoffice/site/trunk/content/openofficeorg/get-involved.mdtext
    openoffice/site/trunk/content/openofficeorg/native-lang.mdtext
    openoffice/site/trunk/content/openofficeorg/orientation/decision-making.mdtext
    openoffice/site/trunk/content/openofficeorg/orientation/index.mdtext
    openoffice/site/trunk/content/openofficeorg/orientation/infrastructure.mdtext
    openoffice/site/trunk/content/openofficeorg/orientation/intro-contributing.mdtext
    openoffice/site/trunk/content/openofficeorg/orientation/intro-marketing.mdtext
    openoffice/site/trunk/content/openofficeorg/orientation/intro-qa.mdtext
    openoffice/site/trunk/content/openofficeorg/pmc-faqs.mdtext
    openoffice/site/trunk/content/openofficeorg/qa.mdtext
    openoffice/site/trunk/content/openofficeorg/source.mdtext
    openoffice/site/trunk/content/openofficeorg/svn-basics.mdtext
    openoffice/site/trunk/content/openofficeorg/terms.mdtext
    openoffice/site/trunk/content/openofficeorg/translate.mdtext
    openoffice/site/trunk/content/openofficeorg/website-local.mdtext

Modified: openoffice/site/trunk/content/openofficeorg/bug-tracking.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/bug-tracking.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/bug-tracking.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/bug-tracking.mdtext Tue Nov 27 12:53:56 2012
@@ -29,6 +29,5 @@ Please read the guide "[How to Open a Bu
 
 [1]: http://www.bugzilla.org
 [2]: http://issues.apache.org/ooo/
-[3]: http://wiki.services.openoffice.org/wiki/QA/HowToFileIssue
-
+[3]: http://wiki.openoffice.org/wiki/QA/HowToFileIssue
 

Modified: openoffice/site/trunk/content/openofficeorg/developer-faqs.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/developer-faqs.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/developer-faqs.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/developer-faqs.mdtext Tue Nov 27 12:53:56 2012
@@ -90,7 +90,7 @@ Instructions can be found on the [Subver
 
 You might want to start by reviewing the legacy information on [OpenOffice.org
 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).
+a look at information posted on the [OpenOffice.org wiki](http://wiki.openoffice.org/wiki/Main_Page).
 
 Of course, you will need the [source code](http://openoffice.apache.org/source.html) to do anything.
 

Modified: openoffice/site/trunk/content/openofficeorg/docs/edit-cms.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/docs/edit-cms.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/docs/edit-cms.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/docs/edit-cms.mdtext Tue Nov 27 12:53:56 2012
@@ -51,7 +51,7 @@ the public web site.
 ## Command line editing workflow
 
 It is assumed that you have already checked out the code from the SVN repository
-(https://svn.apache.org/repos/asf/incubator/ooo).
+(https://svn.apache.org/repos/asf/openoffice).
 
 Edit the file via your favorite editor like vi and finally commit via SVN:
 

Modified: openoffice/site/trunk/content/openofficeorg/docs/governance/voting.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/docs/governance/voting.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/docs/governance/voting.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/docs/governance/voting.mdtext Tue Nov 27 12:53:56 2012
@@ -108,5 +108,5 @@ The notation used in voting is:
 
 
   [1]: http://openoffice.apache.org/docs/governance/consensusBuilding.html
-  [2]: http://incubator.apache.org/rave/docs/governance/voting.html
+  [2]: http://rave.apache.org/docs/governance/voting.html
   [3]: http://community.apache.org/newcommitter.html

Modified: openoffice/site/trunk/content/openofficeorg/get-involved.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/get-involved.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/get-involved.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/get-involved.mdtext Tue Nov 27 12:53:56 2012
@@ -65,11 +65,11 @@ OpenOffice is a large, complex open sour
 many years as an independent project, combined with our experience at Apache.  
 
 If you are familiar with Apache-style open source 
-development then you might just jump in.  Subscribe to a relevant project [mailing list](http://incubator.apache.org/openofficeorg/mailing-lists.html)
+development then you might just jump in.  Subscribe to a relevant project [mailing list](http://openoffice.apache.org/mailing-lists.html)
 and introduce yourself.  We'll help you get started. 
 
 If, however, you are new to Apache, or want a more methodical approach to getting started, then we have a set 
-of graduated [New Volunteer Orientation Modules](http://incubator.apache.org/openofficeorg/orientation/index.html) designed 
+of graduated [New Volunteer Orientation Modules](http://openoffice.apache.org/orientation/index.html) designed 
 for new volunteers that takes you through a number of background topics related to Apache OpenOffice and how 
 we do things.
 

Modified: openoffice/site/trunk/content/openofficeorg/native-lang.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/native-lang.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/native-lang.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/native-lang.mdtext Tue Nov 27 12:53:56 2012
@@ -15,7 +15,7 @@ PMC and typically at least two moderator
 made via the [dev mailing list](mailto:dev@openoffice.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.   
-See the local [Pootle User Guide](http://wiki.services.openoffice.org/wiki/Pootle_User_Guide) for more information.
+See the local [Pootle User Guide](http://wiki.openoffice.org/wiki/Pootle_User_Guide) for more information.
 
 If you are interested is initiating (or re-starting) a native language project, you
 might find the recent [information posted on the Apache OpenOffice Planning wiki](https://cwiki.apache.org/confluence/display/OOOUSERS/Native+Language+Projects) helpful.
@@ -54,4 +54,4 @@ For example: 
 ## Additional Information
 The legacy web site [Native Language page](http://www.openoffice.org/projects/native-lang.html) continues
 to be a valuable resource in learning more about OpenOffice.org's native language
-endeavors.
\ No newline at end of file
+endeavors.

Modified: openoffice/site/trunk/content/openofficeorg/orientation/decision-making.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/orientation/decision-making.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/orientation/decision-making.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/orientation/decision-making.mdtext Tue Nov 27 12:53:56 2012
@@ -51,7 +51,7 @@ how decisions are made in an Apache comm
 
     1. In cases where the proposer wants to act on their proposal, if there are no objections, they should state this in the proposal.  For example, "If there are no objections voiced
     within 72 hours, I'll go ahead and make these changes".  This is called "stating lazy consensus". You can read more about lazy consensus 
-    [here](http://incubator.apache.org/openofficeorg/docs/governance/lazyConsensus.html).
+    [here](http://openoffice.apache.org/docs/governance/lazyConsensus.html).
 
     1. In Apache projects it is common to use a shorthand way of responding to proposals, where +1 indicates approval, 0 indicates indifference and -1 indicates disapproval.
     
@@ -66,7 +66,7 @@ how decisions are made in an Apache comm
     about this topic.
 
   
-1. To apply the above skills, be sure you are subscribed to the project's [main mailing list](http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list). 
+1. To apply the above skills, be sure you are subscribed to the project's [main mailing list](http://openoffice.apache.org/mailing-lists.html#development-mailing-list). 
 Keep your eye out for terms like "proposal", "lazy consensus", "vote" or "veto" and see how they are used in practice.  Compare actual practice to the above descriptions.  No, we're
 not perfect.  But we work best and have the most fun when we follow the above guidelines.  And so will you when you apply then in your own list communications!
 

Modified: openoffice/site/trunk/content/openofficeorg/orientation/index.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/orientation/index.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/orientation/index.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/orientation/index.mdtext Tue Nov 27 12:53:56 2012
@@ -53,7 +53,7 @@ The Orientation Modules for the various 
 
     * Introduction to Development
     * [Introduction to QA](intro-qa.html)
-    * [Introduction to Localization](http://incubator.apache.org/openofficeorg/translate.html) (How to Help Translate OpenOffice)
+    * [Introduction to Localization](http://openoffice.apache.org/translate.html) (How to Help Translate OpenOffice)
     * [Introduction to Marketing](intro-marketing.html)
     * Introduction to Website Content Authoring
 

Modified: openoffice/site/trunk/content/openofficeorg/orientation/infrastructure.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/orientation/infrastructure.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/orientation/infrastructure.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/orientation/infrastructure.mdtext Tue Nov 27 12:53:56 2012
@@ -31,7 +31,7 @@ control ezmlm by sending commands to a l
 then you subscribe to the list with the command dev-**subscribe**@openoffice.apache.org.  Some other popular commands 
 are listed [here](http://www.apache.org/foundation/mailinglists.html).  You can get a full list of commands 
 available to you by sending the *help* command, as in dev-**help**@openoffice.apache.org.  Each list has moderators
-who have additional capabilities.  You can find the moderators for our lists [here](http://incubator.apache.org/openofficeorg/pmc-faqs.html#mailing-lists).
+who have additional capabilities.  You can find the moderators for our lists [here](http://openoffice.apache.org/pmc-faqs.html#mailing-lists).
 
 
     * Our two websites: [www.openoffice.org](http://www.openoffice.org) and [openoffice.apache.org](http://openoffice.apache.org).  Why two?  There is some logic here,

Modified: openoffice/site/trunk/content/openofficeorg/orientation/intro-contributing.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/orientation/intro-contributing.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/orientation/intro-contributing.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/orientation/intro-contributing.mdtext Tue Nov 27 12:53:56 2012
@@ -85,7 +85,7 @@ and [List Conduct Guidelines](http://ope
     1. Our [ConfluenceWiki](https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home) (sometimes called CWiki) where we do project planning.
     1. Our [Bugzilla database]() (sometimes called BZ) where we report and track status on bugs.
     1. Our [Community Forums](http://forum.openoffice.org/) These are available in several languages.  This is the primary way in which we engage with the user community.
-    1. Join our [Social Networks](http://incubator.apache.org/openofficeorg/social.html)
+    1. Join our [Social Networks](http://openoffice.apache.org/social.html)
 
 1. Finally, once you have done the above, go to our our [Directory of Volunteers](https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers) wiki page and add your 
 information.  Congratulations!  Please send a note to [dev@openoffice.apache.org](mailto:dev@openoffice.apache.org?subject=Completed Introduction to Contributing to Apache OpenOffice Module) 

Modified: openoffice/site/trunk/content/openofficeorg/orientation/intro-marketing.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/orientation/intro-marketing.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/orientation/intro-marketing.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/orientation/intro-marketing.mdtext Tue Nov 27 12:53:56 2012
@@ -23,11 +23,11 @@ assist with ongoing marketing activities
 
 To complete this module you should read the following material, along with associated links.  
 
-But first, please subscribe to our [Marketing Mailing List](http://incubator.apache.org/openofficeorg/mailing-lists.html#marketing-mailing-list), 
+But first, please subscribe to our [Marketing Mailing List](http://openoffice.apache.org/mailing-lists.html#marketing-mailing-list), 
 and then [send a note](mailto:marketing@openoffice.apache.org?subject=Starting Intro to Marketing Module) to introduce yourself.
 
 
-Note:  You may also want to review the [Level 1 and Level 2 Orientation Modules](http://incubator.apache.org/openofficeorg/orientation/index.html) which
+Note:  You may also want to review the [Level 1 and Level 2 Orientation Modules](http://openoffice.apache.org/orientation/index.html) which
 give an overview of the project as a whole, and a perspective on working on open source at Apache.
 
 
@@ -94,17 +94,17 @@ The Apache Software Foundation owns the 
 
 ##Tools for Communications
 
-  - Mailing Lists: Our project-wide mailing lists are listed [here](http://incubator.apache.org/openofficeorg/mailing-lists.html). From a marketing
+  - Mailing Lists: Our project-wide mailing lists are listed [here](http://openoffice.apache.org/mailing-lists.html). From a marketing
 perspective, the two most relevant are the dev list, which reaches the "core" team, and the announce list which reaches 9000+ users.
   - Website:  [http://www.openoffice.org](http://www.openoffice.org) and [http://openoffice.apache.org](http://openoffice.apache.org).  The former gets 750K+ visits/day.  We have
 the ability to add news stories to the front page as well as a banner message on all pages.
-  - Events: Our events page is [here](http://incubator.apache.org/openofficeorg/events.html).
+  - Events: Our events page is [here](http://openoffice.apache.org/events.html).
   - Project Blog: The Blog is [here](http://blogs.apache.org/OOo/).  New posts are easily cross-promoted.  With a 
 new post, the blog easily gets 4000+ visits/day.
-  - Social Networking: A list of our accounts is [here](http://incubator.apache.org/openofficeorg/social.html)
+  - Social Networking: A list of our accounts is [here](http://openoffice.apache.org/social.html)
   - Word of Mouth:  Along with other occasional programs we have a ["Get it here!"](http://openoffice.apache.org/get-it-here.html) 
 logo that we encourage users to put on their websites.
-  - The Press: Our press contact page is [here](http://incubator.apache.org/openofficeorg/press.html).  As you can see we seriously
+  - The Press: Our press contact page is [here](http://openoffice.apache.org/press.html).  As you can see we seriously
 need some work there, and any volunteer who can make a more meaningful page here, with most-requested information, would be most welcome.
   - Surveys:  We have the ability to poll users via surveys both informal and formal.
   - Statistics:  We maintain a variety of product and project statistics [here](http://www.openoffice.org/stats/).

Modified: openoffice/site/trunk/content/openofficeorg/orientation/intro-qa.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/orientation/intro-qa.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/orientation/intro-qa.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/orientation/intro-qa.mdtext Tue Nov 27 12:53:56 2012
@@ -32,7 +32,7 @@ We'd love to hear who you are, where you
 items on this page, if you have questions or problems, please feel free to ask for help by sending a note to 
 this same list.
 
-Note:  In parallel with the QA-specific items on this page, you may want to first review the [Level 1 and Level 2 Orientation Modules](http://incubator.apache.org/openofficeorg/orientation/index.html)
+Note:  In parallel with the QA-specific items on this page, you may want to first review the [Level 1 and Level 2 Orientation Modules](http://openoffice.apache.org/orientation/index.html)
 as well.  They have useful background information on The Apache Way, mailing list etiquette, decision making in the
 project, etc.  A quick review is a good idea, especially if you are new to working in Apache-style open source projects.
 

Modified: openoffice/site/trunk/content/openofficeorg/pmc-faqs.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/pmc-faqs.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/pmc-faqs.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/pmc-faqs.mdtext Tue Nov 27 12:53:56 2012
@@ -170,7 +170,7 @@ The following is a brief summary of what
     additional e-mail addresses that you have. (**ToDo**: Add a link to a how-to)
 
  6. The ID and password will allow you to check in changes and new additions on the
-    Apache SVN repository for the OpenOffice.org incubator repository. The ability
+    Apache SVN repository for the Apache OpenOffice repository. The ability
     to check in material on the SVN repository is important for more than code. All
     committers will have an use for it.
 

Modified: openoffice/site/trunk/content/openofficeorg/qa.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/qa.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/qa.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/qa.mdtext Tue Nov 27 12:53:56 2012
@@ -24,9 +24,9 @@ QA doesn't require programming skills, s
 
 ## Talk to Us
 
- - We coordinate our work on the [QA mailing list](http://incubator.apache.org/openofficeorg/mailing-lists.html#qa-mailing-list).
+ - We coordinate our work on the [QA mailing list](http://openoffice.apache.org/mailing-lists.html#qa-mailing-list).
 Subscribe to this list if you want to follow our work.
- - We also have a [QA Wiki](http://wiki.services.openoffice.org/wiki/Quality_Assurance) that we use for planning and documenting our process.
+ - We also have a [QA Wiki](http://wiki.openoffice.org/wiki/Quality_Assurance) that we use for planning and documenting our process.
 
 
 ## How to Help
@@ -34,13 +34,13 @@ Subscribe to this list if you want to fo
 We welcome QA volunteers and have several ways to get started:
 
   - If you are familiar with both QA work and with Apache-style open source projects, then you can probably
-jump right in.  Join the [QA mailing list](http://incubator.apache.org/openofficeorg/mailing-lists.html#qa-mailing-list) and introduce yourself and we can help you get started.
-  - If you are familiar with Apache or similar open source projects, but new to QA, then you can look at our [Orientation Modules](http://incubator.apache.org/openofficeorg/orientation/index.html).
+jump right in.  Join the [QA mailing list](http://openoffice.apache.org/mailing-lists.html#qa-mailing-list) and introduce yourself and we can help you get started.
+  - If you are familiar with Apache or similar open source projects, but new to QA, then you can look at our [Orientation Modules](http://openoffice.apache.org/orientation/index.html).
 You can skim over the first two levels, since much of this may be familiar.  But spent more time on the 
-[Introduction to QA](http://incubator.apache.org/openofficeorg/orientation/intro-qa.html) module.
+[Introduction to QA](http://openoffice.apache.org/orientation/intro-qa.html) module.
   - If you are new to QA and to open source development, then you may also want to start with our
-[Orientation Modules](http://incubator.apache.org/openofficeorg/orientation/index.html), and give attention 
+[Orientation Modules](http://openoffice.apache.org/orientation/index.html), and give attention 
 to the  Level 1 and Level 2 topics, as well as the Level 3 Introduction to QA.
 
-In all cases, please join the [QA mailing list](http://incubator.apache.org/openofficeorg/mailing-lists.html#qa-mailing-list) and introduce yourself.
+In all cases, please join the [QA mailing list](http://openoffice.apache.org/mailing-lists.html#qa-mailing-list) and introduce yourself.
 

Modified: openoffice/site/trunk/content/openofficeorg/source.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/source.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/source.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/source.mdtext Tue Nov 27 12:53:56 2012
@@ -81,7 +81,7 @@ The legacy repository can be found [here
 [2]: http://svn.apache.org/viewvc/openoffice/trunk
 [3]: http://www.apache.org/dev/version-control.html
 [4]: https://fisheye6.atlassian.com/browse/ooo
-[5]: http://wiki.services.openoffice.org/wiki/Documentation/Building_Guide
+[5]: http://wiki.openoffice.org/wiki/Documentation/Building_Guide
 [6]: https://www.ohloh.net/p/openoffice
 [7]: https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds#DevelopmentSnapshotBuilds-buildflags
 [8]: https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds#DevelopmentSnapshotBuilds-fullsets

Modified: openoffice/site/trunk/content/openofficeorg/svn-basics.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/svn-basics.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/svn-basics.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/svn-basics.mdtext Tue Nov 27 12:53:56 2012
@@ -355,7 +355,7 @@ For more information see: 
 [1]: http://subversion.apache.org
 [2]: http://svnbook.red-bean.com
 [3]: http://svn.apache.org/viewvc/openoffice/trunk
-[4]: https://svn.apache.org/repos/asf/incubator/ooo
+[4]: https://svn.apache.org/repos/asf/openoffice
 [5]: http://www.apache.org/dev/version-control.html
 [6]: http://www.apache.org/dev/version-control.html#https-svn-config
 [7]: http://www.apache.org/dev/contributors.html#svnbasics

Modified: openoffice/site/trunk/content/openofficeorg/terms.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/terms.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/terms.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/terms.mdtext Tue Nov 27 12:53:56 2012
@@ -16,7 +16,7 @@ Notice:    Licensed to the Apache Softwa
            specific language governing permissions and limitations
            under the License.
 
-Terms of Use for Apache Incubator project openoffice.org web site
+Terms of Use for Apache OpenOffice web 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.
 
@@ -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://openoffice.apache.org/privacy.html
\ No newline at end of file
+[1]: http://openoffice.apache.org/privacy.html

Modified: openoffice/site/trunk/content/openofficeorg/translate.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/translate.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/translate.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/translate.mdtext Tue Nov 27 12:53:56 2012
@@ -60,7 +60,7 @@ the translation in several ways:
  1. You can send a note to the [L10n list](http://openoffice.apache.org/mailing-lists.html#localization-mailing-list) 
 requesting the PO files for that language.  These files can be
 loaded into a translation management tool (some tools are listed 
-[here](http://wiki.services.openoffice.org/wiki/Pootle_User_Guide#Translating_off-line),
+[here](http://wiki.openoffice.org/wiki/Pootle_User_Guide#Translating_off-line),
 with [POEdit](http://www.poedit.net/) being a popular choice) where you can edit the
 translation.  When done, or when you've made progress that you want to
 verify, you can submit the new PO files as an attachment in Bugzilla.
@@ -124,4 +124,4 @@ please note that PO files do not have a 
 reviewed". Most teams who want to review translated file before submitting them
 agree to mark new and modified translations as "Fuzzy" in Pootle, so that
 reviewers can immediately see what has changed and "unfuzzy" those strings
-after verifying that the translation is correct.
\ No newline at end of file
+after verifying that the translation is correct.

Modified: openoffice/site/trunk/content/openofficeorg/website-local.mdtext
URL: http://svn.apache.org/viewvc/openoffice/site/trunk/content/openofficeorg/website-local.mdtext?rev=1414162&r1=1414161&r2=1414162&view=diff
==============================================================================
--- openoffice/site/trunk/content/openofficeorg/website-local.mdtext (original)
+++ openoffice/site/trunk/content/openofficeorg/website-local.mdtext Tue Nov 27 12:53:56 2012
@@ -105,8 +105,8 @@ and how to publish to the production Apa
 
 ### Setup
 
-#### Create a directory on your computer for the Apache CMS work with both the podling's
-incubator site and the migrating openoffice.org website.
+#### Create a directory on your computer for the Apache CMS work with both the project's
+site and the migrating openoffice.org website.
 
     mkdir aoo-web
     cd aoo-web