incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject svn commit: r1137122 [1/2] - in /incubator/ooo/site: ./ trunk/ trunk/cgi-bin/ trunk/content/ trunk/content/openofficeorg/ trunk/content/openofficeorg/css/ trunk/content/openofficeorg/docs/ trunk/content/openofficeorg/docs/governance/ trunk/content/open...
Date Sat, 18 Jun 2011 04:38:54 GMT
Author: gstein
Date: Sat Jun 18 04:38:53 2011
New Revision: 1137122

URL: http://svn.apache.org/viewvc?rev=1137122&view=rev
Log:
- Add svn:eol-style=native to many files.
- Remove bugtraq-number:true on some directories.
- Fix mime type on the png files

Modified:
    incubator/ooo/site/   (props changed)
    incubator/ooo/site/trunk/   (props changed)
    incubator/ooo/site/trunk/cgi-bin/   (props changed)
    incubator/ooo/site/trunk/content/   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/css/   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/docs/   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/docs/governance/   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/docs/governance/consensusBuilding.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/docs/governance/lazyConsensus.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/get-involved.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/images/   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/images/apache-incubator-logo.png   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/images/ooo-logo.png   (props changed)
    incubator/ooo/site/trunk/content/openofficeorg/index.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/license.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/people.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/release-process.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/content/openofficeorg/source.mdtext   (props changed)
    incubator/ooo/site/trunk/lib/   (props changed)
    incubator/ooo/site/trunk/lib/path.pm   (props changed)
    incubator/ooo/site/trunk/lib/view.pm   (contents, props changed)
    incubator/ooo/site/trunk/templates/   (props changed)
    incubator/ooo/site/trunk/templates/sidenav.mdtext   (contents, props changed)
    incubator/ooo/site/trunk/templates/single_narrative.html   (contents, props changed)
    incubator/ooo/site/trunk/templates/skeleton.html   (contents, props changed)

Propchange: incubator/ooo/site/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/cgi-bin/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/content/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/content/openofficeorg/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/content/openofficeorg/css/
            ('bugtraq:number' removed)

Modified: incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css Sat Jun 18 04:38:53 2011
@@ -1,157 +1,157 @@
-/*
-* 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 regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-body {
-  color: white;
-  font-family: Arial,Helvetica,sans-serif;
-  font-size: 12pt;
-  background: url(../images/rave_bg.jpg) no-repeat top right;
-  margin: 0;
-}
-
-#banner {
-  padding: 0 0 10px 10px;
-}
-
-a {
-  color: #107EC0;
-}
-
-a:visited {
- color: #107EC0;
-}
-
-a:hover {
- color: #107EC0;
- background-color: #e6ebed;
-}
-
-a img { border: none; }
-
-h1,h2,h3,h4,h5,h6 {
-  color: #193240;
-  text-transform:uppercase;
-}
-
-#content {
-  margin: 20px 150px 20px 250px;
-  padding: 0 8px 40px;
-  color: #333;
-}
-
-#content h1,h2,h3,h4,h5,h6 {
-  font-weight: normal;
-  margin: 10px 0 15px;
-  padding: 5px 0;
-}
-
-#content h1 {
-  font-size: 1.4em;
-  padding: 15px;
-}
-
-#content h2 {
-  font-size: 1.2em;
-  margin-top: 2em;
-  border-bottom: 1px solid #a3afb6;
-}
-
-#content h3,h4,h5,h6 {
-  border-bottom: none;
-  font-size: 1em;
-  margin-bottom: 0;
-}
-
-.codehilite {
-  background-color: #F00;
-  padding: 0.01em 1em;
-  border-radius: 10px;
-  background: url(../images/rave_codehilite_bg.gif);
-}
-
-#navigation {
-  border: 1px solid #e6ebed;
-  border-left: none;
-  -moz-border-radius: 0 10px 10px 0;
-  border-radius: 0 10px 10px 0;
-  font-size: 0.9em;
-  color: #003;
-  float: left;
-  padding: 15px 15px 5px 25px;
-  width: 180px;
-  background: none repeat scroll 0 0 #f5f8fa;
-  margin: 20px 0 20px 0;
-}
-
-#navigation img {
-  padding-bottom: 15px;
-  margin-left: auto;
-  margin-right: auto;
-  display: block;
-}
-
-#navigation h1 {
-  color: #000;
-  font-size: 1em;
-  padding: 0;
-  margin-top: 0.8em;
-  margin-bottom: 0;
-  border-bottom: 1px solid #a3afb6;
-}
-
-#navigation ul {
-  margin: 0 0;
-  padding: 0;
-  list-style: none;
-}
-
-#navigation li {
-  border-bottom: 1px solid #e6ebed; 
-  margin: 0.2em 0;
-  padding: 0;
-}
-
-#navigation li a {
-  margin: 0;
-  text-decoration:none;
-}
-
-#navigation li a:hover {
-  color: #193240;
-  background: none;
-}
-
-#footer {
-  margin: 20px 150px 20px 250px;
-  border-top: 1px solid #ccc;
-  color:#666;
-  font-size: 0.8em;
-  padding: 0 8px;
-  text-align: center;
-}
-
-#asf-logo {
-  width: 180px;
-  padding-top: 20px;
-}
-
-/* definition lists */
-dd {}
-dl {}
-dt {
-  display: inline;
-  float: left;
+/*
+* 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 regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License.  You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+body {
+  color: white;
+  font-family: Arial,Helvetica,sans-serif;
+  font-size: 12pt;
+  background: url(../images/rave_bg.jpg) no-repeat top right;
+  margin: 0;
+}
+
+#banner {
+  padding: 0 0 10px 10px;
+}
+
+a {
+  color: #107EC0;
+}
+
+a:visited {
+ color: #107EC0;
+}
+
+a:hover {
+ color: #107EC0;
+ background-color: #e6ebed;
+}
+
+a img { border: none; }
+
+h1,h2,h3,h4,h5,h6 {
+  color: #193240;
+  text-transform:uppercase;
+}
+
+#content {
+  margin: 20px 150px 20px 250px;
+  padding: 0 8px 40px;
+  color: #333;
+}
+
+#content h1,h2,h3,h4,h5,h6 {
+  font-weight: normal;
+  margin: 10px 0 15px;
+  padding: 5px 0;
+}
+
+#content h1 {
+  font-size: 1.4em;
+  padding: 15px;
+}
+
+#content h2 {
+  font-size: 1.2em;
+  margin-top: 2em;
+  border-bottom: 1px solid #a3afb6;
+}
+
+#content h3,h4,h5,h6 {
+  border-bottom: none;
+  font-size: 1em;
+  margin-bottom: 0;
+}
+
+.codehilite {
+  background-color: #F00;
+  padding: 0.01em 1em;
+  border-radius: 10px;
+  background: url(../images/rave_codehilite_bg.gif);
+}
+
+#navigation {
+  border: 1px solid #e6ebed;
+  border-left: none;
+  -moz-border-radius: 0 10px 10px 0;
+  border-radius: 0 10px 10px 0;
+  font-size: 0.9em;
+  color: #003;
+  float: left;
+  padding: 15px 15px 5px 25px;
+  width: 180px;
+  background: none repeat scroll 0 0 #f5f8fa;
+  margin: 20px 0 20px 0;
+}
+
+#navigation img {
+  padding-bottom: 15px;
+  margin-left: auto;
+  margin-right: auto;
+  display: block;
+}
+
+#navigation h1 {
+  color: #000;
+  font-size: 1em;
+  padding: 0;
+  margin-top: 0.8em;
+  margin-bottom: 0;
+  border-bottom: 1px solid #a3afb6;
+}
+
+#navigation ul {
+  margin: 0 0;
+  padding: 0;
+  list-style: none;
+}
+
+#navigation li {
+  border-bottom: 1px solid #e6ebed; 
+  margin: 0.2em 0;
+  padding: 0;
+}
+
+#navigation li a {
+  margin: 0;
+  text-decoration:none;
+}
+
+#navigation li a:hover {
+  color: #193240;
+  background: none;
+}
+
+#footer {
+  margin: 20px 150px 20px 250px;
+  border-top: 1px solid #ccc;
+  color:#666;
+  font-size: 0.8em;
+  padding: 0 8px;
+  text-align: center;
+}
+
+#asf-logo {
+  width: 180px;
+  padding-top: 20px;
+}
+
+/* definition lists */
+dd {}
+dl {}
+dt {
+  display: inline;
+  float: left;
 }
\ No newline at end of file

Propchange: incubator/ooo/site/trunk/content/openofficeorg/css/ooo.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ooo/site/trunk/content/openofficeorg/docs/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/
            ('bugtraq:number' removed)

Modified: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/consensusBuilding.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/docs/governance/consensusBuilding.mdtext?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/docs/governance/consensusBuilding.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/docs/governance/consensusBuilding.mdtext Sat Jun 18 04:38:53 2011
@@ -1,66 +1,66 @@
-Title:     Consensus Building
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-In some cases there is no obvious path to take, or you might be a new community, 
-or a new member of an existing community. In these cases people will often 
-need to build consensus by making proposals and eliciting responses.
-
-We want to avoid unnecessary discussion and the creation of significant
-amounts of unnecessary mail that everyone in the community needs to read. 
-That is not to say that we want to avoid constructive discussion. This is 
-the lifeblood of a successful project. However, many ASF projects adopt a 
-shorthand notation for showing support, or otherwise, for a proposal.
-
-## Expressing support (or otherwise)
-
-The notation used is "+1", "-1" and "0". It's also common to see "+0" and "-0".
-
-So, what do these notations mean?
-
-  - +1 means "I agree with this and will help make it happen"
-  - +0 means "I agree with this but probably won't make it happen, so my 
-opinion is not that important"
-  - -0 means "I don't agree with this, but I'm offering no alternative so 
-my opinion is not that important"
-  - -1 means "I don't agree and I am offering an alternative that I am able 
-to help implement"
-
-Many people will use fractions to indicate the strength of their feelings,
- e.g. "+0.5". Some will even indicate this is a "no brainer" with something 
-like "+1000".
-
-The important thing is that this is not an exact science. It's just a shorthand 
-way of communicating strength of feeling.
-
-## Consensus Building is Not Voting
-
-The confusing thing about this notation is that it is the same notation
-used in a formal vote. Knowing when something is a vote and when it is a 
-preference is important. It's easy to tell though, if the subject does not have 
-"[Vote]" at the start then it's just an opinion. We try not to call votes,
-consensus building is much more inclusive.
-
-The reasons for this notation being common is 
-that when someone wants to summarise a discussion thread they can mentally 
-add up the strength of feeling of the community and decide if there is consensus
-or not.
-
-Once there is a clear consensus members of the community can proceed with 
-the work under the [lazy consensus][1] model.
-
+Title:     Consensus Building
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+In some cases there is no obvious path to take, or you might be a new community, 
+or a new member of an existing community. In these cases people will often 
+need to build consensus by making proposals and eliciting responses.
+
+We want to avoid unnecessary discussion and the creation of significant
+amounts of unnecessary mail that everyone in the community needs to read. 
+That is not to say that we want to avoid constructive discussion. This is 
+the lifeblood of a successful project. However, many ASF projects adopt a 
+shorthand notation for showing support, or otherwise, for a proposal.
+
+## Expressing support (or otherwise)
+
+The notation used is "+1", "-1" and "0". It's also common to see "+0" and "-0".
+
+So, what do these notations mean?
+
+  - +1 means "I agree with this and will help make it happen"
+  - +0 means "I agree with this but probably won't make it happen, so my 
+opinion is not that important"
+  - -0 means "I don't agree with this, but I'm offering no alternative so 
+my opinion is not that important"
+  - -1 means "I don't agree and I am offering an alternative that I am able 
+to help implement"
+
+Many people will use fractions to indicate the strength of their feelings,
+ e.g. "+0.5". Some will even indicate this is a "no brainer" with something 
+like "+1000".
+
+The important thing is that this is not an exact science. It's just a shorthand 
+way of communicating strength of feeling.
+
+## Consensus Building is Not Voting
+
+The confusing thing about this notation is that it is the same notation
+used in a formal vote. Knowing when something is a vote and when it is a 
+preference is important. It's easy to tell though, if the subject does not have 
+"[Vote]" at the start then it's just an opinion. We try not to call votes,
+consensus building is much more inclusive.
+
+The reasons for this notation being common is 
+that when someone wants to summarise a discussion thread they can mentally 
+add up the strength of feeling of the community and decide if there is consensus
+or not.
+
+Once there is a clear consensus members of the community can proceed with 
+the work under the [lazy consensus][1] model.
+
   [1]: /openofficeorg/docs/governance/lazyConsensus.html
\ No newline at end of file

Propchange: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/consensusBuilding.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/lazyConsensus.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/docs/governance/lazyConsensus.mdtext?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/docs/governance/lazyConsensus.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/docs/governance/lazyConsensus.mdtext Sat Jun 18 04:38:53 2011
@@ -1,71 +1,71 @@
-Title:     Lazy Consensus
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-The concept of "Lazy Consensus" is very important in our project. Lazy
-Consensus means that when you are convinced that you know what the community
-would like to see happen you can simply assume that you already have consensus
-and get on with the work. You don't have to insist people discuss and/or
-approve your plan, and you certainly don't need to call a vote to get approval.
-You just assume you have the communities support unless someone says otherwise.
-
-We have a time machine (Subversion), this means that as long as you commit 
-(or submit patches) early and often the community has plenty of opportunity 
-to indicate disapproval. If you believe the community will support your action
-you can operate on lazy consensus as long as you are prepared to roll back 
-any work should a valid objection is raised.
-
-## Avoiding Unnecessary Discussion
-
-The key thing about lazy consensus is that it's easier for people to agree,
-by doing nothing, than it is to object, which requires an
-alternative to be proposed. This has two effects, firstly people are less 
-likely to object for the sake of it and secondly it cuts down on the amount 
-of unnecessary mail traffic and discussion.
-
-Lazy consensus means we can avoid waiting for a community based decision 
-before proceeding. However, it does require everyone who cares for the health
-of the project to watch what is happening, as it is happening. Objecting too 
-far down the road will cause upset, but objecting (or asking for clarification 
-of intent) early is likely to be greeted with relief that someone is watching
-and cares.
-
-## Stating Lazy Consensus
-
-Sometimes a member of the community will believe a specific action is the correct 
-one for the community but are not sure enough to proceed with the work under the 
-lazy consensus model. In these circumstances they can state Lazy Consensus is in 
-operation.
-
-What this means is that they make a proposal and state that they will start 
-implementing it in 72 hours unless someone objects. 72 hours is chosen because
-it accounts for different timezones and non-apache commitments.
-
-In this approach the original proposal is not insisting that there is a discussion
-around their proposal, nor are they requesting that the community explicitly 
-supports their actions. However, this differs from assuming lazy consensus 
-since it allows space and time to [express support or objections][1] and corrections to 
-the proposal before work begins. 
-
-## Silence is consent
-
-People may choose to indicate their support for the actions taken with a +1 
-mail - quick and easy to read and reassuring for the implementer. However, 
-remember, in a lazy consensus world silence is the equivalent to support. This
-can take some time to get used to.
-
+Title:     Lazy Consensus
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+The concept of "Lazy Consensus" is very important in our project. Lazy
+Consensus means that when you are convinced that you know what the community
+would like to see happen you can simply assume that you already have consensus
+and get on with the work. You don't have to insist people discuss and/or
+approve your plan, and you certainly don't need to call a vote to get approval.
+You just assume you have the communities support unless someone says otherwise.
+
+We have a time machine (Subversion), this means that as long as you commit 
+(or submit patches) early and often the community has plenty of opportunity 
+to indicate disapproval. If you believe the community will support your action
+you can operate on lazy consensus as long as you are prepared to roll back 
+any work should a valid objection is raised.
+
+## Avoiding Unnecessary Discussion
+
+The key thing about lazy consensus is that it's easier for people to agree,
+by doing nothing, than it is to object, which requires an
+alternative to be proposed. This has two effects, firstly people are less 
+likely to object for the sake of it and secondly it cuts down on the amount 
+of unnecessary mail traffic and discussion.
+
+Lazy consensus means we can avoid waiting for a community based decision 
+before proceeding. However, it does require everyone who cares for the health
+of the project to watch what is happening, as it is happening. Objecting too 
+far down the road will cause upset, but objecting (or asking for clarification 
+of intent) early is likely to be greeted with relief that someone is watching
+and cares.
+
+## Stating Lazy Consensus
+
+Sometimes a member of the community will believe a specific action is the correct 
+one for the community but are not sure enough to proceed with the work under the 
+lazy consensus model. In these circumstances they can state Lazy Consensus is in 
+operation.
+
+What this means is that they make a proposal and state that they will start 
+implementing it in 72 hours unless someone objects. 72 hours is chosen because
+it accounts for different timezones and non-apache commitments.
+
+In this approach the original proposal is not insisting that there is a discussion
+around their proposal, nor are they requesting that the community explicitly 
+supports their actions. However, this differs from assuming lazy consensus 
+since it allows space and time to [express support or objections][1] and corrections to 
+the proposal before work begins. 
+
+## Silence is consent
+
+People may choose to indicate their support for the actions taken with a +1 
+mail - quick and easy to read and reassuring for the implementer. However, 
+remember, in a lazy consensus world silence is the equivalent to support. This
+can take some time to get used to.
+
   [1]: /openofficeorg/docs/governance/consensusBuilding.html
\ No newline at end of file

Propchange: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/lazyConsensus.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

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=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext Sat Jun 18 04:38:53 2011
@@ -1,47 +1,47 @@
-Title:     Voting
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-Occasionally a "feel" for consensus is not enough. Sometimes we need to 
-have a measurable consensus. For example, when voting in new committers or 
-to approve a release. 
-
-## Preparing for a Vote
-
-Before calling a vote it is important to ensure that the community is given time to
-discuss the upcoming vote. This will be done by posting an email to the list
-indicating the intention to call a vote and the options available. By the time
-a vote is called there should already be [consensus in the community][4]. The vote 
-itself is, normally, a formality.
-
-## Calling a Vote
-
-Once it is time to call the vote a mail is posted with a subject starting 
-with "{VOTE]". This enables the community members to ensure they do not miss
-an important vote thread. It also indicates that this is not consensus building
-but a formal vote.
-
-### Casting Your Vote
-
-The notation used in voting is:
-
-  - +1 Yes I agree 
-  -  0 I have no strong opinion 
-  - -1 I object on the following grounds
-
-If you object you must support your objection and provide an alternative course 
-of action that you are willing and able to implement (where appropriate).
+Title:     Voting
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Occasionally a "feel" for consensus is not enough. Sometimes we need to 
+have a measurable consensus. For example, when voting in new committers or 
+to approve a release. 
+
+## Preparing for a Vote
+
+Before calling a vote it is important to ensure that the community is given time to
+discuss the upcoming vote. This will be done by posting an email to the list
+indicating the intention to call a vote and the options available. By the time
+a vote is called there should already be [consensus in the community][4]. The vote 
+itself is, normally, a formality.
+
+## Calling a Vote
+
+Once it is time to call the vote a mail is posted with a subject starting 
+with "{VOTE]". This enables the community members to ensure they do not miss
+an important vote thread. It also indicates that this is not consensus building
+but a formal vote.
+
+### Casting Your Vote
+
+The notation used in voting is:
+
+  - +1 Yes I agree 
+  -  0 I have no strong opinion 
+  - -1 I object on the following grounds
+
+If you object you must support your objection and provide an alternative course 
+of action that you are willing and able to implement (where appropriate).

Propchange: incubator/ooo/site/trunk/content/openofficeorg/docs/governance/voting.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/content/openofficeorg/get-involved.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/get-involved.mdtext?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/get-involved.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/get-involved.mdtext Sat Jun 18 04:38:53 2011
@@ -1,100 +1,100 @@
-Title: Get Involved
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-You don't need to be a software developer to contribute to 
-Apache OpenOffice.org. To be successful this project 
-requires a huge range of different skills, levels of involvement and degrees of 
-technical expertise. So, if you want to get involved in Apache OpenOffice.org, there 
-is almost certainly a role for you. 
-
-We are looking for people to:
-
-  - provide feedback
-  - write or update documentation
-  - help new users
-  - recommend the project to others
-  - test the code and report bugs
-  - fix bugs
-  - give us feedback on required features
-  - write and update the software
-  - create artwork
-  - translate to different languages
-  - anything you can see that needs doing
-
-All of these contributions help to keep a project active and strengthen 
-the community. The project team and the broader community will 
-therefore welcome and encourage participation, and attempt to make it 
-as easy as possible for people to get involved. 
-
-## Mailing lists
-
-Your first engagement with the project should be to subscribe to our
-[mailing lists][14].
-
-## Decision Making
-
-The most important thing about engaging with any Apache project is that everyone
-is equal. All people with an opinion are entitled to express that opinion and, where 
-appropriate, have it considered by the community.
-
-To some the idea of having to establish consensus in a large and distributed team 
-sounds inefficient and frustrating. Don't despair though, The Apache Way has a
-set of simple processes to ensure things proceed at a good pace.
-
-In ASF projects we don't like to vote. We reserve that for the few things that need 
-official approval for legal or process reasons (e.g. a release or a new committer). 
-Most of the time we work with the consensus building techniques documented below.
-
-
-### Lazy Consensus
-
-[Lazy consensus][10] is the first, and possibly the most important, consensus building 
-tool we have. Essentially lazy consensus means that you don't need to get explicit
-approval to proceed, but you need to be prepared to listen if someone objects.
-
-### Consensus Building
-
-Sometimes lazy consensus is not appropriate. In such cases it is necessary to
-make a proposal to the mailing list and discuss options. There are mechanisms
-for quickly showing your support or otherwise for a proposal and 
-[building consensus][11] amongst the community.
-
-Once there is a consensus people can proceed with the work under the [lazy 
-consensus][12] model.
-
-### Voting
-
-Occasionally a "feel" for consensus is not enough. Sometimes we need to 
-have a measurable consensus. For example, when [voting][13] in new committers or 
-to approve a release. 
-
-
-  [1]: mailto://ooo-dev-subscribe@incubator.apache.org
-  [2]: mailto://ooo-dev@incubator.apache.org
-  [3]: mailto:ooo-dev-unsubscribe@incubator.apache.org
-  [4]: http://markmail.org/search/+list:org.apache.incubator.ooo-dev
-  [5]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/
-  [6]: mailto:ooo-commits-subscribe@incubator.apache.org
-  [7]: mailto:ooo-commmits-unsubscribe@incubator.apache.org
-  [8]: http://markmail.org/search/+list:org.apache.incubator.ooo-commits
-  [9]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-commits/
-  [10]: /openofficeorg/docs/governance/lazyConsensus.html
-  [11]: /openofficeorg/docs/governance/consensusBuilding.html
-  [12]: /openofficeorg/docs/governance/lazyConsensus.html
-  [13]: /openofficeorg/docs/governance/voting.html
+Title: Get Involved
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+You don't need to be a software developer to contribute to 
+Apache OpenOffice.org. To be successful this project 
+requires a huge range of different skills, levels of involvement and degrees of 
+technical expertise. So, if you want to get involved in Apache OpenOffice.org, there 
+is almost certainly a role for you. 
+
+We are looking for people to:
+
+  - provide feedback
+  - write or update documentation
+  - help new users
+  - recommend the project to others
+  - test the code and report bugs
+  - fix bugs
+  - give us feedback on required features
+  - write and update the software
+  - create artwork
+  - translate to different languages
+  - anything you can see that needs doing
+
+All of these contributions help to keep a project active and strengthen 
+the community. The project team and the broader community will 
+therefore welcome and encourage participation, and attempt to make it 
+as easy as possible for people to get involved. 
+
+## Mailing lists
+
+Your first engagement with the project should be to subscribe to our
+[mailing lists][14].
+
+## Decision Making
+
+The most important thing about engaging with any Apache project is that everyone
+is equal. All people with an opinion are entitled to express that opinion and, where 
+appropriate, have it considered by the community.
+
+To some the idea of having to establish consensus in a large and distributed team 
+sounds inefficient and frustrating. Don't despair though, The Apache Way has a
+set of simple processes to ensure things proceed at a good pace.
+
+In ASF projects we don't like to vote. We reserve that for the few things that need 
+official approval for legal or process reasons (e.g. a release or a new committer). 
+Most of the time we work with the consensus building techniques documented below.
+
+
+### Lazy Consensus
+
+[Lazy consensus][10] is the first, and possibly the most important, consensus building 
+tool we have. Essentially lazy consensus means that you don't need to get explicit
+approval to proceed, but you need to be prepared to listen if someone objects.
+
+### Consensus Building
+
+Sometimes lazy consensus is not appropriate. In such cases it is necessary to
+make a proposal to the mailing list and discuss options. There are mechanisms
+for quickly showing your support or otherwise for a proposal and 
+[building consensus][11] amongst the community.
+
+Once there is a consensus people can proceed with the work under the [lazy 
+consensus][12] model.
+
+### Voting
+
+Occasionally a "feel" for consensus is not enough. Sometimes we need to 
+have a measurable consensus. For example, when [voting][13] in new committers or 
+to approve a release. 
+
+
+  [1]: mailto://ooo-dev-subscribe@incubator.apache.org
+  [2]: mailto://ooo-dev@incubator.apache.org
+  [3]: mailto:ooo-dev-unsubscribe@incubator.apache.org
+  [4]: http://markmail.org/search/+list:org.apache.incubator.ooo-dev
+  [5]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/
+  [6]: mailto:ooo-commits-subscribe@incubator.apache.org
+  [7]: mailto:ooo-commmits-unsubscribe@incubator.apache.org
+  [8]: http://markmail.org/search/+list:org.apache.incubator.ooo-commits
+  [9]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-commits/
+  [10]: /openofficeorg/docs/governance/lazyConsensus.html
+  [11]: /openofficeorg/docs/governance/consensusBuilding.html
+  [12]: /openofficeorg/docs/governance/lazyConsensus.html
+  [13]: /openofficeorg/docs/governance/voting.html
   [14]:/openofficeorg/mailing-lists.html
\ No newline at end of file

Propchange: incubator/ooo/site/trunk/content/openofficeorg/get-involved.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/ooo/site/trunk/content/openofficeorg/images/
            ('bugtraq:number' removed)

Propchange: incubator/ooo/site/trunk/content/openofficeorg/images/apache-incubator-logo.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sat Jun 18 04:38:53 2011
@@ -1 +1 @@
-application/octet-stream
+image/png

Propchange: incubator/ooo/site/trunk/content/openofficeorg/images/ooo-logo.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sat Jun 18 04:38:53 2011
@@ -1 +1 @@
-application/octet-stream
+image/png

Modified: incubator/ooo/site/trunk/content/openofficeorg/index.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/index.mdtext?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/index.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/index.mdtext Sat Jun 18 04:38:53 2011
@@ -1,7 +1,7 @@
-Title: Apache OpenOffice.org (Incubating)
-
-Apache OpenOffice.org is comprised of six personal productivity applications: a word processor (and its web-authoring component), 
-spreadsheet, presentation graphics, drawing, equation editor, and database. OpenOffice.org is released on Windows, Solaris, Linux and 
-Macintosh operation systems, with more communities joining, including a mature FreeBSD port. OpenOffice.org is localized, supporting 
-over 110 languages worldwide.
-
+Title: Apache OpenOffice.org (Incubating)
+
+Apache OpenOffice.org is comprised of six personal productivity applications: a word processor (and its web-authoring component), 
+spreadsheet, presentation graphics, drawing, equation editor, and database. OpenOffice.org is released on Windows, Solaris, Linux and 
+Macintosh operation systems, with more communities joining, including a mature FreeBSD port. OpenOffice.org is localized, supporting 
+over 110 languages worldwide.
+

Propchange: incubator/ooo/site/trunk/content/openofficeorg/index.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/content/openofficeorg/license.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/license.mdtext?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/license.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/license.mdtext Sat Jun 18 04:38:53 2011
@@ -1,213 +1,213 @@
-Title:
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-Apache License<br></br>Version 2.0, January 2004<br></br>
-[http://www.apache.org/licenses/](http://www.apache.org/licenses/) 
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-**<a name="definitions">1. Definitions</a>**.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other
-entities that control, are controlled by, or are under common control with
-that entity. For the purposes of this definition, "control" means (i) the
-power, direct or indirect, to cause the direction or management of such
-entity, whether by contract or otherwise, or (ii) ownership of fifty
-percent (50%) or more of the outstanding shares, or (iii) beneficial
-ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation source,
-and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled
-object code, generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
-made available under the License, as indicated by a copyright notice that
-is included in or attached to the work (an example is provided in the
-Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial
-revisions, annotations, elaborations, or other modifications represent, as
-a whole, an original work of authorship. For the purposes of this License,
-Derivative Works shall not include works that remain separable from, or
-merely link (or bind by name) to the interfaces of, the Work and Derivative
-Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
-version of the Work and any modifications or additions to that Work or
-Derivative Works thereof, that is intentionally submitted to Licensor for
-inclusion in the Work by the copyright owner or by an individual or Legal
-Entity authorized to submit on behalf of the copyright owner. For the
-purposes of this definition, "submitted" means any form of electronic,
-verbal, or written communication sent to the Licensor or its
-representatives, including but not limited to communication on electronic
-mailing lists, source code control systems, and issue tracking systems that
-are managed by, or on behalf of, the Licensor for the purpose of discussing
-and improving the Work, but excluding communication that is conspicuously
-marked or otherwise designated in writing by the copyright owner as "Not a
-Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on
-behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
-
-**<a name="copyright">2. Grant of Copyright License</a>**. Subject to the
-terms and conditions of this License, each Contributor hereby grants to You
-a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of, publicly
-display, publicly perform, sublicense, and distribute the Work and such
-Derivative Works in Source or Object form.
-
-**<a name="patent">3. Grant of Patent License</a>**. Subject to the terms
-and conditions of this License, each Contributor hereby grants to You a
-perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made, use,
-offer to sell, sell, import, and otherwise transfer the Work, where such
-license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by
-combination of their Contribution(s) with the Work to which such
-Contribution(s) was submitted. If You institute patent litigation against
-any entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that the Work or a Contribution incorporated within the Work constitutes
-direct or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate as of the
-date such litigation is filed.
-
-**<a name="redistribution">4. Redistribution</a>**. You may reproduce and
-distribute copies of the Work or Derivative Works thereof in any medium,
-with or without modifications, and in Source or Object form, provided that
-You meet the following conditions:
-
-1. You must give any other recipients of the Work or Derivative Works a
-copy of this License; and
-
-1. You must cause any modified files to carry prominent notices stating
-that You changed the files; and
-
-1. You must retain, in the Source form of any Derivative Works that You
-distribute, all copyright, patent, trademark, and attribution notices from
-the Source form of the Work, excluding those notices that do not pertain to
-any part of the Derivative Works; and
-
-1. If the Work includes a "NOTICE" text file as part of its distribution,
-then any Derivative Works that You distribute must include a readable copy
-of the attribution notices contained within such NOTICE file, excluding
-those notices that do not pertain to any part of the Derivative Works, in
-at least one of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or documentation,
-if provided along with the Derivative Works; or, within a display generated
-by the Derivative Works, if and wherever such third-party notices normally
-appear. The contents of the NOTICE file are for informational purposes only
-and do not modify the License. You may add Your own attribution notices
-within Derivative Works that You distribute, alongside or as an addendum to
-the NOTICE text from the Work, provided that such additional attribution
-notices cannot be construed as modifying the License.
-You may add Your own copyright statement to Your modifications and may
-provide additional or different license terms and conditions for use,
-reproduction, or distribution of Your modifications, or for any such
-Derivative Works as a whole, provided Your use, reproduction, and
-distribution of the Work otherwise complies with the conditions stated in
-this License.
-
-**<a name="contributions">5. Submission of Contributions</a>**. Unless You
-explicitly state otherwise, any Contribution intentionally submitted for
-inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the
-terms of any separate license agreement you may have executed with Licensor
-regarding such Contributions.
-
-**<a name="trademarks">6. Trademarks</a>**. This License does not grant
-permission to use the trade names, trademarks, service marks, or product
-names of the Licensor, except as required for reasonable and customary use
-in describing the origin of the Work and reproducing the content of the
-NOTICE file.
-
-**<a name="no-warranty">7. Disclaimer of Warranty</a>**. Unless required by
-applicable law or agreed to in writing, Licensor provides the Work (and
-each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
-without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
-are solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise
-of permissions under this License.
-
-**<a name="no-liability">8. Limitation of Liability</a>**. In no event and
-under no legal theory, whether in tort (including negligence), contract, or
-otherwise, unless required by applicable law (such as deliberate and
-grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising as a result
-of this License or out of the use or inability to use the Work (including
-but not limited to damages for loss of goodwill, work stoppage, computer
-failure or malfunction, or any and all other commercial damages or losses),
-even if such Contributor has been advised of the possibility of such
-damages.
-
-**<a name="additional">9. Accepting Warranty or Additional Liability</a>**.
-While redistributing the Work or Derivative Works thereof, You may choose
-to offer, and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with this License.
-However, in accepting such obligations, You may act only on Your own behalf
-and on Your sole responsibility, not on behalf of any other Contributor,
-and only if You agree to indemnify, defend, and hold each Contributor
-harmless for any liability incurred by, or claims asserted against, such
-Contributor by reason of your accepting any such warranty or additional
-liability.
-
-END OF TERMS AND CONDITIONS
-
-# APPENDIX: How to apply the Apache License to your work # {#apply}
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included
-on the same "printed page" as the copyright notice for easier
-identification within third-party archives.
-
-       :::text
-       Copyright [yyyy] [name of copyright owner]
-
-       Licensed under the Apache License, Version 2.0 (the "License");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-
-           http://www.apache.org/licenses/LICENSE-2.0
-
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an "AS IS" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
+Title:
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Apache License<br></br>Version 2.0, January 2004<br></br>
+[http://www.apache.org/licenses/](http://www.apache.org/licenses/) 
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+**<a name="definitions">1. Definitions</a>**.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control with
+that entity. For the purposes of this definition, "control" means (i) the
+power, direct or indirect, to cause the direction or management of such
+entity, whether by contract or otherwise, or (ii) ownership of fifty
+percent (50%) or more of the outstanding shares, or (iii) beneficial
+ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation
+or translation of a Source form, including but not limited to compiled
+object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form,
+made available under the License, as indicated by a copyright notice that
+is included in or attached to the work (an example is provided in the
+Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form,
+that is based on (or derived from) the Work and for which the editorial
+revisions, annotations, elaborations, or other modifications represent, as
+a whole, an original work of authorship. For the purposes of this License,
+Derivative Works shall not include works that remain separable from, or
+merely link (or bind by name) to the interfaces of, the Work and Derivative
+Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original
+version of the Work and any modifications or additions to that Work or
+Derivative Works thereof, that is intentionally submitted to Licensor for
+inclusion in the Work by the copyright owner or by an individual or Legal
+Entity authorized to submit on behalf of the copyright owner. For the
+purposes of this definition, "submitted" means any form of electronic,
+verbal, or written communication sent to the Licensor or its
+representatives, including but not limited to communication on electronic
+mailing lists, source code control systems, and issue tracking systems that
+are managed by, or on behalf of, the Licensor for the purpose of discussing
+and improving the Work, but excluding communication that is conspicuously
+marked or otherwise designated in writing by the copyright owner as "Not a
+Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on
+behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+**<a name="copyright">2. Grant of Copyright License</a>**. Subject to the
+terms and conditions of this License, each Contributor hereby grants to You
+a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+**<a name="patent">3. Grant of Patent License</a>**. Subject to the terms
+and conditions of this License, each Contributor hereby grants to You a
+perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+(except as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where such
+license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by
+combination of their Contribution(s) with the Work to which such
+Contribution(s) was submitted. If You institute patent litigation against
+any entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that the Work or a Contribution incorporated within the Work constitutes
+direct or contributory patent infringement, then any patent licenses
+granted to You under this License for that Work shall terminate as of the
+date such litigation is filed.
+
+**<a name="redistribution">4. Redistribution</a>**. You may reproduce and
+distribute copies of the Work or Derivative Works thereof in any medium,
+with or without modifications, and in Source or Object form, provided that
+You meet the following conditions:
+
+1. You must give any other recipients of the Work or Derivative Works a
+copy of this License; and
+
+1. You must cause any modified files to carry prominent notices stating
+that You changed the files; and
+
+1. You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices from
+the Source form of the Work, excluding those notices that do not pertain to
+any part of the Derivative Works; and
+
+1. If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable copy
+of the attribution notices contained within such NOTICE file, excluding
+those notices that do not pertain to any part of the Derivative Works, in
+at least one of the following places: within a NOTICE text file distributed
+as part of the Derivative Works; within the Source form or documentation,
+if provided along with the Derivative Works; or, within a display generated
+by the Derivative Works, if and wherever such third-party notices normally
+appear. The contents of the NOTICE file are for informational purposes only
+and do not modify the License. You may add Your own attribution notices
+within Derivative Works that You distribute, alongside or as an addendum to
+the NOTICE text from the Work, provided that such additional attribution
+notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may
+provide additional or different license terms and conditions for use,
+reproduction, or distribution of Your modifications, or for any such
+Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated in
+this License.
+
+**<a name="contributions">5. Submission of Contributions</a>**. Unless You
+explicitly state otherwise, any Contribution intentionally submitted for
+inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the
+terms of any separate license agreement you may have executed with Licensor
+regarding such Contributions.
+
+**<a name="trademarks">6. Trademarks</a>**. This License does not grant
+permission to use the trade names, trademarks, service marks, or product
+names of the Licensor, except as required for reasonable and customary use
+in describing the origin of the Work and reproducing the content of the
+NOTICE file.
+
+**<a name="no-warranty">7. Disclaimer of Warranty</a>**. Unless required by
+applicable law or agreed to in writing, Licensor provides the Work (and
+each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
+without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You
+are solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise
+of permissions under this License.
+
+**<a name="no-liability">8. Limitation of Liability</a>**. In no event and
+under no legal theory, whether in tort (including negligence), contract, or
+otherwise, unless required by applicable law (such as deliberate and
+grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special,
+incidental, or consequential damages of any character arising as a result
+of this License or out of the use or inability to use the Work (including
+but not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or losses),
+even if such Contributor has been advised of the possibility of such
+damages.
+
+**<a name="additional">9. Accepting Warranty or Additional Liability</a>**.
+While redistributing the Work or Derivative Works thereof, You may choose
+to offer, and charge a fee for, acceptance of support, warranty, indemnity,
+or other liability obligations and/or rights consistent with this License.
+However, in accepting such obligations, You may act only on Your own behalf
+and on Your sole responsibility, not on behalf of any other Contributor,
+and only if You agree to indemnify, defend, and hold each Contributor
+harmless for any liability incurred by, or claims asserted against, such
+Contributor by reason of your accepting any such warranty or additional
+liability.
+
+END OF TERMS AND CONDITIONS
+
+# APPENDIX: How to apply the Apache License to your work # {#apply}
+
+To apply the Apache License to your work, attach the following boilerplate
+notice, with the fields enclosed by brackets "[]" replaced with your own
+identifying information. (Don't include the brackets!) The text should be
+enclosed in the appropriate comment syntax for the file format. We also
+recommend that a file or class name and description of purpose be included
+on the same "printed page" as the copyright notice for easier
+identification within third-party archives.
+
+       :::text
+       Copyright [yyyy] [name of copyright owner]
+
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the specific language governing permissions and
+       limitations under the License.
+

Propchange: incubator/ooo/site/trunk/content/openofficeorg/license.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

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=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext Sat Jun 18 04:38:53 2011
@@ -1,52 +1,52 @@
-Title: Mailing Lists
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-We welcome you to join our mailing lists and let us know about your thoughts or ideas about Apache OpenOffice.org
-
-### OpenOffice.org Developer Mailing List
-
-This is where the community hangs out. This list is used to coordinate 
-activities and ensure we are all pulling in the same direction.
-
-  - Subscribe: [ooo-dev-subscribe@incubator.apache.org][1]
-  - Post (after subscription): [ooo-dev@incubator.apache.org][2]
-  - Unsubscribe: [ooo-dev-unsubscribe@incubator.apache.org][3]
-  - Archives
-    - [Markmail][4]
-    - [Apache][5]
-
-### Commits Mailing List
-
-This is where the community receives automated notifications of 
-any changes to the OpenOffice.org code and documentation.
-
-  - Subscribe: [ooo-commits-subscribe@incubator.apache.org][6]
-  - Unsubscribe: [ooo-commmits-unsubscribe@incubator.apache.org][7]
-  - Archives
-    - [Markmail][8]
-    - [Apache][9]
-
-  [1]: mailto://ooo-dev-subscribe@incubator.apache.org
-  [2]: mailto://ooo-dev@incubator.apache.org
-  [3]: mailto:ooo-dev-unsubscribe@incubator.apache.org
-  [4]: http://markmail.org/search/+list:org.apache.incubator.ooo-dev
-  [5]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/
-  [6]: mailto:ooo-commits-subscribe@incubator.apache.org
-  [7]: mailto:ooo-commmits-unsubscribe@incubator.apache.org
-  [8]: http://markmail.org/search/+list:org.apache.incubator.ooo-commits
-  [9]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-commits/
+Title: Mailing Lists
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+We welcome you to join our mailing lists and let us know about your thoughts or ideas about Apache OpenOffice.org
+
+### OpenOffice.org Developer Mailing List
+
+This is where the community hangs out. This list is used to coordinate 
+activities and ensure we are all pulling in the same direction.
+
+  - Subscribe: [ooo-dev-subscribe@incubator.apache.org][1]
+  - Post (after subscription): [ooo-dev@incubator.apache.org][2]
+  - Unsubscribe: [ooo-dev-unsubscribe@incubator.apache.org][3]
+  - Archives
+    - [Markmail][4]
+    - [Apache][5]
+
+### Commits Mailing List
+
+This is where the community receives automated notifications of 
+any changes to the OpenOffice.org code and documentation.
+
+  - Subscribe: [ooo-commits-subscribe@incubator.apache.org][6]
+  - Unsubscribe: [ooo-commmits-unsubscribe@incubator.apache.org][7]
+  - Archives
+    - [Markmail][8]
+    - [Apache][9]
+
+  [1]: mailto://ooo-dev-subscribe@incubator.apache.org
+  [2]: mailto://ooo-dev@incubator.apache.org
+  [3]: mailto:ooo-dev-unsubscribe@incubator.apache.org
+  [4]: http://markmail.org/search/+list:org.apache.incubator.ooo-dev
+  [5]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-dev/
+  [6]: mailto:ooo-commits-subscribe@incubator.apache.org
+  [7]: mailto:ooo-commmits-unsubscribe@incubator.apache.org
+  [8]: http://markmail.org/search/+list:org.apache.incubator.ooo-commits
+  [9]: http://mail-archives.apache.org/mod_mbox/incubator-ooo-commits/

Propchange: incubator/ooo/site/trunk/content/openofficeorg/mailing-lists.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/ooo/site/trunk/content/openofficeorg/people.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/people.mdtext?rev=1137122&r1=1137121&r2=1137122&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/people.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/people.mdtext Sat Jun 18 04:38:53 2011
@@ -1,25 +1,25 @@
-Title:     Some of our contributors
-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
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-Apache OpenOffice.org (Incubating) 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.
-  
-  - [Rob Weir][1]
-
-  [1]: http://www.robweir.com/blog
+Title:     Some of our contributors
+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
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+Apache OpenOffice.org (Incubating) 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.
+  
+  - [Rob Weir][1]
+
+  [1]: http://www.robweir.com/blog

Propchange: incubator/ooo/site/trunk/content/openofficeorg/people.mdtext
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message