incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r791169 - in /websites/staging/openofficeorg/trunk/content/openofficeorg: ./ css/ docs/governance/
Date Sat, 18 Jun 2011 04:39:04 GMT
Author: buildbot
Date: Sat Jun 18 04:39:03 2011
New Revision: 791169

Log:
Staging update by buildbot

Modified:
    websites/staging/openofficeorg/trunk/content/openofficeorg/css/ooo.css
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
    websites/staging/openofficeorg/trunk/content/openofficeorg/source.html

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/css/ooo.css
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/css/ooo.css (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/css/ooo.css Sat Jun 18 04:39:03 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

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/consensusBuilding.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Consensus Building
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Consensus Building</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Consensus Building
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Consensus Building</h1>
     <p>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.</p>
@@ -96,19 +96,19 @@ that when someone wants to summarise a d
 add up the strength of feeling of the community and decide if there is consensus
 or not.</p>
 <p>Once there is a clear consensus members of the community can proceed with 
-the work under the <a href="/openofficeorg/docs/governance/lazyConsensus.html">lazy consensus</a> model.</p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+the work under the <a href="/openofficeorg/docs/governance/lazyConsensus.html">lazy consensus</a> model.</p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/lazyConsensus.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Lazy Consensus
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Lazy Consensus</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Lazy Consensus
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Lazy Consensus</h1>
     <p>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
@@ -100,19 +100,19 @@ the proposal before work begins. </p>
 <p>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.</p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+can take some time to get used to.</p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/docs/governance/voting.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Voting
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Voting</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Voting
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Voting</h1>
     <p>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. </p>
@@ -82,19 +82,19 @@ but a formal vote.</p>
 <li>-1 I object on the following grounds</li>
 </ul>
 <p>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).</p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+of action that you are willing and able to implement (where appropriate).</p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/get-involved.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Get Involved
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Get Involved</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Get Involved
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Get Involved</h1>
     <p>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 
@@ -110,19 +110,19 @@ consensus</a> model.</p>
 <h3 id="voting">Voting</h3>
 <p>Occasionally a "feel" for consensus is not enough. Sometimes we need to 
 have a measurable consensus. For example, when <a href="/openofficeorg/docs/governance/voting.html">voting</a> in new committers or 
-to approve a release. </p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+to approve a release. </p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/index.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/index.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/index.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Apache OpenOffice.org (Incubating)
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Apache OpenOffice.org (Incubating)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,30 +52,30 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Apache OpenOffice.org (Incubating)
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Apache OpenOffice.org (Incubating)</h1>
     <p>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.</p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+over 110 languages worldwide.</p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/license.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/license.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/license.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title></title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title></title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title"></h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title"></h1>
     <p>Apache License<br></br>Version 2.0, January 2004<br></br>
 <a href="http://www.apache.org/licenses/">http://www.apache.org/licenses/</a> </p>
 <p>TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION</p>
@@ -235,19 +235,19 @@ identification within third-party archiv
    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.
-</pre></div>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+</pre></div>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/mailing-lists.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Mailing Lists
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Mailing Lists</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Mailing Lists
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Mailing Lists</h1>
     <p>We welcome you to join our mailing lists and let us know about your thoughts or ideas about Apache OpenOffice.org</p>
 <h3 id="openofficeorg_developer_mailing_list">OpenOffice.org Developer Mailing List</h3>
 <p>This is where the community hangs out. This list is used to coordinate 
@@ -85,19 +85,19 @@ any changes to the OpenOffice.org code a
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-ooo-commits/">Apache</a></li>
 </ul>
 </li>
-</ul>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+</ul>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/people.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/people.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/people.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Some of our contributors
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Some of our contributors</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,32 +52,32 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Some of our contributors
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Some of our contributors</h1>
     <p>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.</p>
 <ul>
 <li><a href="http://www.robweir.com/blog">Rob Weir</a></li>
-</ul>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+</ul>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/release-process.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Release Process
</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Release Process</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Release Process
</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Release Process</h1>
     <h3 id="incubator_release_steps">Incubator Release Steps</h3>
 <ol>
 <li>Environment setup for releasing artifacts (same for SNAPSHOTs and releases) -</li>
@@ -313,19 +313,19 @@
 
 <p>You'll need to look at the output to ensure it contains only good signatures -</p>
 <p>gpg: Good signature from ...
-gpg: Signature made ...</p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+gpg: Signature made ...</p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/source.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/source.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/source.html Sat Jun 18 04:39:03 2011
@@ -1,35 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<!--
-
-    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.
---> 
-    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
-  <title>Source Control</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-
-<body>
-  <div id="banner">
-    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
-  src="/openofficeorg/images/ooo-logo.png"/> 
-  </div>
-  
-  <div id="navigation">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<!--
+
+    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.
+--> 
+    <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
+  <title>Source Control</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+
+<body>
+  <div id="banner">
+    <img id="logo" alt="Apache OpenOffice.org (Incubating)" 
+  src="/openofficeorg/images/ooo-logo.png"/> 
+  </div>
+  
+  <div id="navigation">
   <h1 id="general">General</h1>
 <ul>
 <li><a href="index.html">About</a></li>
@@ -52,14 +52,14 @@
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a></li>
 <li><a href="http://www.apache.org/security/">Security</a></li>
-</ul>
-    <a alt="Apache Incubator" href="http://incubator.apache.org">
-      <img id="asf-logo" alt="Apache Incubator" 
-    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
-  </div>
-
-  <div id="content">
-    <h1 class="title">Source Control</h1>
+</ul>
+    <a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" 
+    src="/openofficeorg/images/apache-incubator-logo.png"/> </a>
+  </div>
+
+  <div id="content">
+    <h1 class="title">Source Control</h1>
     <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. You can <a href="http://svn.apache.org/viewvc/incubator/ooo/trunk">browse our 
 repository</a> in your web browser.</p>
 <h2 id="getting_the_source_code">Getting the source code</h2>
@@ -70,19 +70,19 @@ repository</a> in your web browser.</p>
 <h2 id="building_and_running">Building and Running</h2>
 <p>Coming soon</p>
 <h3 id="requirements">Requirements:</h3>
-<p>Coming soon</p>
-  </div>
-
-  <div id="footer">
-    <div class="copyright">
-      <p>
-        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
-        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
-        <br />
-        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
-      </p>
-    </div>
-  </div>
-
-</body>
-</html>
+<p>Coming soon</p>
+  </div>
+
+  <div id="footer">
+    <div class="copyright">
+      <p>
+        Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+        the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+        <br />
+        Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>



Mime
View raw message