incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r794776 [1/3] - in /websites/staging/odftoolkit/trunk/content: ./ odftoolkit/ odftoolkit/docs/ odftoolkit/docs/governance/ odftoolkit/images/
Date Wed, 24 Aug 2011 01:45:45 GMT
Author: buildbot
Date: Wed Aug 24 01:45:44 2011
New Revision: 794776

Log:
Staging update by buildbot

Added:
    websites/staging/odftoolkit/trunk/content/
    websites/staging/odftoolkit/trunk/content/odftoolkit/
    websites/staging/odftoolkit/trunk/content/odftoolkit/community-faqs.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/developer-faqs.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/docs/
    websites/staging/odftoolkit/trunk/content/odftoolkit/docs/edit-cms.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/
    websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/consensusBuilding.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/lazyConsensus.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/voting.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/get-involved.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/images/
    websites/staging/odftoolkit/trunk/content/odftoolkit/images/apache-incubator-logo.png   (with props)
    websites/staging/odftoolkit/trunk/content/odftoolkit/images/feather-small.gif   (with props)
    websites/staging/odftoolkit/trunk/content/odftoolkit/index.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/license.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/people.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/ppmc-faqs.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/release-process.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/source.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/svn-basics.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/website-local.html

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/community-faqs.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/community-faqs.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/community-faqs.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,97 @@
+<!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="/odftoolkit/css/odf.css" rel="stylesheet" type="text/css">
+
+<title>Community FAQs</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">Community FAQs</h1>
+    
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,104 @@
+<!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="/odftoolkit/css/odf.css" rel="stylesheet" type="text/css">
+
+<title>Contact Us</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">Contact Us</h1>
+    <p>For any questions, comments, or concerns about this project or website please contact the project on the developer mailing list:</p>
+<ul>
+<li><a href="mailto:ooo-dev@incubator.apache.org">odf-dev@incubator.apache.org</a>.</li>
+</ul>
+<p>For private or legal matters, please contact the Podling Project Management Committee (PPMC):</p>
+<ul>
+<li><a href="mailto:ooo-private@incubator.apache.org">odf-private@incubator.apache.org</a>.</li>
+</ul>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/developer-faqs.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/developer-faqs.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/developer-faqs.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,126 @@
+<!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="/odftoolkit/css/odf.css" rel="stylesheet" type="text/css">
+
+<title>Developer FAQs</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">Developer FAQs</h1>
+    <h2 id="how_do_i_edit_this_website">How do I edit this website?</h2>
+<p>The pages on this website are written in <a href="http://www.simpleeditions.com/59001/markdown-an-introduction">markdown syntax</a> and stored in SVN at 
+<a href="https://svn.apache.org/repos/asf/incubator/odf/site">https://svn.apache.org/repos/asf/incubator/odf/site</a></p>
+<p>Via integration with the Apache CMS, it is possible to edit, stage and publish 
+website updates from the command line, or by using a web-based interface.</p>
+<p>Detailed information can be found in the <a href="http://incubator.apache.org/odftoolkit/docs/edit-cms.html">How to edit the ODF website</a> page.</p>
+<p>Information on deeper website development is found on the <a href="website-local.html">Website Development</a> page.</p>
+<h2 id="ive_just_been_voted_in_as_a_committer__what_do_i_need_to_do">I've just been voted in as a Committer.  What do I need to do?</h2>
+<p>First, congratulations.  Your contributions to the project have been noted and we 
+hope that as a Committer you will be even more active.</p>
+<p>But before you are officially given Committer permissions, there are a few 
+administrative steps that you will need to complete. </p>
+<ol>
+<li>Submit a signed <a href="http://www.apache.org/licenses/icla.txt">ICLA</a> to Apache.</li>
+<li>Wait for the ICLA to be received and recorded by Apache.  You will know 
+when this has occurred when your name appears in the <a href="http://people.apache.org/committer-index.html#unlistedclas">Unlisted ICLAs</a> section 
+on the Apache Committers page.  This could take a couple of days, longer if you
+submitted the ICLA via post.</li>
+<li>Once the your ICLA has been recorded, you should send a note to the <a href="mailto:odf-private@incubator.apache.org">PPMC</a> 
+and request an Apache account.  You will want to include your full name and email address, 
+as you entered in the ICLA, as well as your preferred userid.  Please <a href="http://people.apache.org/committer-index.html">check first</a> 
+that your preferred userid is not already in use by another Apache Committer.</li>
+<li>Once your Apache account has been created, you will receive an email with
+further instructions for setting up your account.  This may take a couple of days.</li>
+<li>If you were also voted as a PPMC member, you should then <a href="mailto:odf-private-subscribe@incubator.apache.org">subscribe</a> to the 
+PPMC's private mailing list.</li>
+<li>Finally, you should read the <a href="http://www.apache.org/dev/new-committers-guide.html">"Guide for new committers"</a></li>
+</ol>
+<h2 id="how_do_i_use_apache_subversion">How do I use Apache Subversion?</h2>
+<p>Instructions can be found on the <a href="http://incubator.apache.org/odftoolkit/svn-basics.html">Subversion Basics</a> page.</p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/docs/edit-cms.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/docs/edit-cms.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/docs/edit-cms.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,208 @@
+<!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="/odftoolkit/css/odf.css" rel="stylesheet" type="text/css">
+
+<title>How to edit the ODF Toolkit website</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">How to edit the ODF Toolkit website</h1>
+    <p>This documentation shows how to edit the Apache ODF Toolkit
+website. This includes creation of new pages, modification, and deletion - for files
+and sub-directories.</p>
+<h2 id="how_it_works_in_general">How it works in general</h2>
+<p>The website is hosted in a Content Management System (CMS). When you edit a web page
+there are potentially four different versions of it to think about:</p>
+<ol>
+<li>There is the latest version of the page source stored in subversion.</li>
+<li>There is your working copy of that page source, which you are editing.</li>
+<li>There is the generated HTML from that source, in the staging directory.</li>
+<li>There is the production version of the HTML, which is what the public sees.</li>
+</ol>
+<p>The general flow for updating the website is:</p>
+<ol>
+<li>You check out the latest version of the web page's source.</li>
+<li>You edit the page source using <a href="http://daringfireball.net/projects/markdown/syntax">Markdown text syntax</a> (mdtext).</li>
+<li>You commit the source into the repository.  (You will see the SVN commit mail with
+    your log message.)</li>
+<li>The commit automatically triggers a build that converts the markdown files 
+    into HTML files in the staging directory.  (You will see a commit mail with "Staging
+    update by buildbot" as log message.)</li>
+<li>You verify that the staged webpage is correct and then tell the CMS to publish 
+    the changes to the production directory.  (You will see a commit mail with "Publishing
+    merge to odftoolkit site by <your Apache ID>" as log message.)</li>
+</ol>
+<p>The intent of this workflow is to allow committers flexibility in changing 
+webpages and testing changes on a staging website, before moving these changes to
+the public web site.</p>
+<h2 id="command_line_editing_workflow">Command line editing workflow</h2>
+<p>It is assumed that you have already checked out the code from the SVN repository
+(https://svn.apache.org/repos/asf/incubator/odf).</p>
+<p>Edit the file via your favorite editor like vi and finally commit via SVN:</p>
+<div class="codehilite"><pre> <span class="n">vi</span> <span class="n">myfile</span><span class="o">.</span><span class="n">mdtext</span>
+ <span class="n">svn</span> <span class="n">ci</span> <span class="o">-</span><span class="n">m</span><span class="s">&quot;My log message&quot;</span> <span class="n">myfile</span><span class="o">.</span><span class="n">mdtext</span>
+</pre></div>
+
+
+<p>Now wait a few seconds so that the entire website can be rebuilt.
+Verify the staged webpage in a web browser at:</p>
+<div class="codehilite"><pre> <span class="n">http:</span><span class="sr">//o</span><span class="n">dftoolkit</span><span class="o">.</span><span class="n">staging</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/odftoolkit/m</span><span class="n">yfile</span><span class="o">.</span><span class="n">html</span>
+</pre></div>
+
+
+<p>Then publish the site:</p>
+<div class="codehilite"><pre><span class="n">curl</span> <span class="o">-</span><span class="n">sL</span> <span class="n">http:</span><span class="sr">//s</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">cms</span><span class="o">-</span><span class="n">cli</span> <span class="o">|</span> <span class="n">perl</span>
+</pre></div>
+
+
+<p>If this does not work on your local machine just do it on "people.apache.org" by
+executing this:</p>
+<div class="codehilite"><pre><span class="n">ssh</span> <span class="o">-</span><span class="n">t</span> <span class="sr">&lt;user&gt;</span><span class="nv">@people</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span> <span class="n">publish</span><span class="o">.</span><span class="n">pl</span> <span class="n">odftoolkit</span> <span class="o">&lt;</span><span class="n">your</span> <span class="n">Apache</span> <span class="n">ID</span><span class="o">&gt;</span>
+</pre></div>
+
+
+<h2 id="browser-based_editing_workflow">Browser-based editing workflow</h2>
+<h3 id="prerequisites">Prerequisites</h3>
+<h4 id="browser_bookmark">Browser bookmark</h4>
+<p>Normally you see the webpage in your browser. To update this page with an
+inline-editor and little preview you use the <a href="javascript:void(location.href=&apos;https://cms.apache.org/redirect?uri=&apos;+escape(location.href))">Apache CMS</a> JavaScript bookmarklet.  Drag that 
+link to your browser's toolbar.  For more information see <a href="https://cms.apache.org/#bookmark">here</a>.</p>
+<h4 id="apache_id">Apache ID</h4>
+<p>Furthermore, you need an Apache ID to authenticate to the system.</p>
+<h3 id="starting">Starting</h3>
+<p>Browse to the webpage or directory you would like to edit and click on
+the bookmarklet. Now click on the [Edit this directory] link on the top. The following
+is displayed as content from the CMS.</p>
+<h3 id="edit_an_existing_webpage">Edit an existing webpage</h3>
+<p>Click on the actions link [Edit] in the appropriate table cell for editing the
+current file. If the file is not in this directory but in a subdirectory, just click on
+the directory name (e.g., "docs/") to enter this directory.</p>
+<p>Now you should see a new webpage with four fields:</p>
+<ol>
+<li>Upper left is the inline editor for text in markdown syntax.</li>
+<li>Upper right shows the written text as a permanent preview or as HTML source code.</li>
+<li>Below the editor you can enter a log message.</li>
+<li>Enter a general header text, e.g., the license of the entered text.</li>
+</ol>
+<p>When you have finished writing your text, check the "Quick Commit" box, enter a
+commit message and click on [Submit].  This commits your changes to the Subversion 
+repository.</p>
+<h3 id="verifying_the_staged_web_site">Verifying the staged web site</h3>
+<p>As noted above, committing your changes triggers a build of the markdown files
+into HTML in the staging directory.  Wait a few
+seconds and then click the [Staged] link to view your web page as staged.</p>
+<p>At this point you should test your web page.  Does it look right?  Any spelling 
+errors? Do the links work?  If you've made substantial changes, perhaps test in
+more than one browser.</p>
+<p>Once you are satisfied that the page is correct, you are ready to publish it
+to the production site.</p>
+<h3 id="publishing_to_the_production_directory">Publishing to the production directory</h3>
+<p>After you have edited your files and/or directories, you need now to publish your
+modifications into production. For this please click on the link
+[Publish site] on the top of the webpage. Enter a commit message on click 
+on [Submit].  After a few seconds you can check the [Production] link to see the
+live version of your changes.<br />
+</p>
+<h3 id="create_a_new_webpage">Create a new webpage</h3>
+<p>When in the correct directory, at the top enter a name for the new text file (e.g.,
+"my-file.mdtext"). Now you enter your text (see topic above).</p>
+<h3 id="create_new_subdirectory">Create new subdirectory</h3>
+<p>When in the correct directory, at the top enter a name for the new directory (e.g.,
+"my-dir/"). Make sure you entered a trailing "/"!</p>
+<h3 id="delete_a_webpage_or_subdirectory">Delete a webpage or subdirectory</h3>
+<p>When in the correct directory, click on the actions link [Delete] in the appropriate
+table cell and enter a commit message. Finally click on [Submit].  Generally speaking
+it is always a good idea to use the CMS to delete files and directories over using
+the command-line svn interface, as the CMS will ensure everything gets deleted from
+the staging (and eventually production) repository on commit.  If you use the command-
+line interface instead, you will also need to manually delete the corresponding entities
+in the staging repository in order for those changes to propagate to the production site.</p>
+<h2 id="links">Links</h2>
+<p><a href="http://www.apache.org/dev/cmsref.html">CMS Documentation Reference</a></p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/consensusBuilding.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/consensusBuilding.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,133 @@
+<!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="/odftoolkit/css/odf.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">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <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>
+<p>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.</p>
+<h2 id="expressing_support_or_otherwise">Expressing support (or otherwise)</h2>
+<p>The notation used is "+1", "-1" and "0". It's also common to see "+0" and "-0".</p>
+<p>So, what do these notations mean?</p>
+<ul>
+<li>+1 means "I agree with this and will help make it happen"</li>
+<li>+0 means "I agree with this but probably won't make it happen, so my 
+opinion is not that important"</li>
+<li>-0 means "I don't agree with this, but I'm offering no alternative so 
+my opinion is not that important"</li>
+<li>-1 means "I don't agree and I am offering an alternative that I am able 
+to help implement"</li>
+</ul>
+<p>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".</p>
+<p>The important thing is that this is not an exact science. It's just a shorthand 
+way of communicating strength of feeling.</p>
+<h2 id="consensus_building_is_not_voting">Consensus Building is Not Voting</h2>
+<p>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.</p>
+<p>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.</p>
+<p>Once there is a clear consensus members of the community can proceed with 
+the work under the <a href="/odftoolkit/docs/governance/lazyConsensus.html">lazy consensus</a> model.</p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/lazyConsensus.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/lazyConsensus.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,137 @@
+<!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="/odftoolkit/css/odf.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">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <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
+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 community's support unless someone says otherwise.</p>
+<p>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.</p>
+<h2 id="avoiding_unnecessary_discussion">Avoiding Unnecessary Discussion</h2>
+<p>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.</p>
+<p>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.</p>
+<h2 id="stating_lazy_consensus">Stating Lazy Consensus</h2>
+<p>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.</p>
+<p>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.</p>
+<p>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 <a href="/odftoolkit/docs/governance/consensusBuilding.html">express support or objections</a> and corrections to 
+the proposal before work begins. </p>
+<h2 id="silence_is_consent">Silence is consent</h2>
+<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="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/voting.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/voting.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/docs/governance/voting.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,177 @@
+<!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="/odftoolkit/css/odf.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">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <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>
+<h2 id="preparing_for_a_vote">Preparing for a Vote</h2>
+<p>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 <a href="http://incubator.apache.org/odftoolkit/docs/governance/consensusBuilding.html">consensus in the community</a>. The vote 
+itself is, normally, a formality.</p>
+<h2 id="calling_a_vote">Calling a Vote</h2>
+<p>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. The initiator is responsible for the vote. That means also to count the votes
+and present the results. Everyone has 1 vote.</p>
+<h3 id="casting_your_vote">Casting Your Vote</h3>
+<p>The notation used in voting is:</p>
+<p>+1 (means I vote positive)
+   You can say why you vote positive but it's not a must-have.</p>
+<p>0 (means vote abstention and nothing else)</p>
+<p>-1 (means I vote negative because of the following reason)
+   Yes, you must support your objection and provide an alternative course of action
+   that you are willing and able to implement (where appropriate).</p>
+<h4 id="example_for_a_vote_mail">Example for a vote mail:</h4>
+<div class="codehilite"><pre><span class="err">Address:</span> <span class="kd">private</span><span class="err">@</span>
+<span class="err">Subject:</span> <span class="err">[VOTE]</span> <span class="err">John</span> <span class="err">Doe</span> <span class="err">should</span> <span class="err">become</span> <span class="err">a</span> <span class="err">regular</span> <span class="err">committer</span>
+
+<span class="err">Text:</span>
+<span class="err">&quot;I</span> <span class="err">would</span> <span class="err">like</span> <span class="err">to</span> <span class="err">propose</span> <span class="err">to</span> <span class="err">vote</span> <span class="err">in</span> <span class="err">John</span> <span class="err">Doe</span> <span class="err">as</span> <span class="err">committer.</span> <span class="err">John</span> <span class="err">has</span> <span class="err">showed</span> <span class="err">in</span>
+<span class="err">the</span> <span class="err">last</span> <span class="err">months</span> <span class="err">that</span> <span class="err">he</span> <span class="err">has</span> <span class="err">the</span> <span class="err">skills</span> <span class="err">and</span> <span class="err">oversight</span> <span class="err">for</span> <span class="err">improving</span> <span class="err">things</span> <span class="err">(think</span>
+<span class="err">about</span> <span class="err">the</span> <span class="err">last</span> <span class="err">UI</span> <span class="err">change</span> <span class="err">of</span> <span class="err">the</span> <span class="err">&quot;Find&quot;</span> <span class="err">dialog).&quot;</span>
+
+<span class="err">+1</span> <span class="err">(means</span> <span class="err">I</span> <span class="err">vote</span> <span class="err">for</span> <span class="err">John)</span>
+ <span class="err">0</span> <span class="err">(means</span> <span class="err">vote</span> <span class="err">abstention)</span>
+<span class="err">-1</span> <span class="err">(means</span> <span class="err">I</span> <span class="err">vote</span> <span class="err">against</span> <span class="err">John</span> <span class="err">because</span> <span class="err">of</span> <span class="err">the</span> <span class="err">following</span> <span class="err">reason:</span>
+
+<span class="err">Voting</span> <span class="err">time</span> <span class="err">frame</span> <span class="err">is</span> <span class="err">finished</span> <span class="err">72</span> <span class="err">hours</span> <span class="err">from</span> <span class="err">now</span> <span class="err">until</span> <span class="err">June</span> <span class="err">30,</span> <span class="err">12:00</span> <span class="err">PM</span> <span class="err">UTC.</span>
+</pre></div>
+
+
+<h4 id="example_for_a_reply_mail">Example for a reply mail:</h4>
+<div class="codehilite"><pre><span class="n">Text:</span>
+<span class="o">+</span><span class="mi">1</span>
+
+<span class="n">I</span> <span class="n">like</span> <span class="n">his</span> <span class="n">work</span> <span class="ow">and</span> <span class="n">want</span> <span class="n">him</span> <span class="n">to</span> <span class="n">stay</span> <span class="ow">and</span> <span class="n">to</span> <span class="n">go</span> <span class="n">on</span> <span class="n">with</span> <span class="n">his</span> <span class="n">good</span> <span class="n">improvements</span><span class="o">.</span>
+</pre></div>
+
+
+<h4 id="example_for_a_result_mail">Example for a result mail:</h4>
+<div class="codehilite"><pre><span class="n">Subject:</span> <span class="p">[</span><span class="n">VOTE</span><span class="p">][</span><span class="n">RESULTS</span><span class="p">]</span> <span class="n">John</span> <span class="n">Doe</span> <span class="n">should</span> <span class="n">become</span> <span class="n">a</span> <span class="n">regular</span> <span class="n">committer</span>
+
+<span class="n">Text:</span>
+<span class="n">Vote</span> <span class="n">started</span> <span class="n">Thu</span><span class="p">,</span> <span class="n">Jun</span> <span class="mi">27</span><span class="p">,</span> <span class="mi">2011</span> <span class="n">at</span> <span class="mi">12</span><span class="p">:</span><span class="mo">00</span> <span class="n">PM</span> <span class="n">UTC</span><span class="p">,</span> <span class="n">voting</span> <span class="n">is</span> <span class="n">now</span> <span class="n">closed</span><span class="o">.</span>
+
+<span class="n">Voting</span> <span class="n">results:</span>
+
+<span class="o">---</span> <span class="n">Numbers</span> <span class="o">---</span>
+
+<span class="o">+</span><span class="mi">1</span><span class="p">:</span> <span class="mi">12</span>
+ <span class="mi">0</span><span class="p">:</span> <span class="mi">0</span>
+<span class="o">-</span><span class="mi">1</span><span class="p">:</span> <span class="mi">0</span>
+
+<span class="o">---</span> <span class="n">Details</span> <span class="o">---</span>
+
+<span class="o">+</span><span class="mi">1</span> <span class="n">John</span> <span class="n">Low</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Marc</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">David</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Robert</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Steve</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Chris</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Stefan</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Andrew</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Dennis</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Karl</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Simon</span>
+<span class="o">+</span><span class="mi">1</span> <span class="n">Greg</span>
+</pre></div>
+
+
+<p><a href="http://incubator.apache.org/rave/docs/governance/voting.html">See here for more information</a> <br>
+<a href="http://community.apache.org/newcommitter.html">See here for more mail templates</a></p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/get-involved.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/get-involved.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/get-involved.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,147 @@
+<!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="/odftoolkit/css/odf.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">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">Get Involved</h1>
+    <p>You don't need to be a software developer to contribute to 
+Apache ODF Toolkit. To be successful this project 
+requires a range of different skills, levels of involvement and degrees of 
+technical expertise. So, if you want to get involved in Apache ODF Toolkit, there 
+is almost certainly a role for you. </p>
+<p>We are looking for people to:</p>
+<ul>
+<li>provide feedback</li>
+<li>write or update documentation</li>
+<li>help new users</li>
+<li>recommend the project to others</li>
+<li>test the code and report bugs</li>
+<li>fix bugs</li>
+<li>give us feedback on required features</li>
+<li>write and update the software</li>
+<li>create artwork</li>
+<li>anything you can see that needs doing</li>
+</ul>
+<p>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. </p>
+<p>We maintain a list of specific areas where we need volunteers on our [Help Wanted] [15] page of the wiki.</p>
+<h2 id="mailing_lists">Mailing lists</h2>
+<p>Your first engagement with the project should be to subscribe to our
+<a href="/odftoolkit/mailing-lists.html">mailing lists</a>.</p>
+<h2 id="decision_making">Decision Making</h2>
+<p>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.</p>
+<p>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.</p>
+<p>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.</p>
+<h3 id="lazy_consensus">Lazy Consensus</h3>
+<p><a href="/odftoolkit/docs/governance/lazyConsensus.html">Lazy consensus</a> 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.</p>
+<h3 id="consensus_building">Consensus Building</h3>
+<p>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 
+<a href="/odftoolkit/docs/governance/consensusBuilding.html">building consensus</a> amongst the community.</p>
+<p>Once there is a consensus people can proceed with the work under the <a href="/odftoolkit/docs/governance/lazyConsensus.html">lazy 
+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="/odftoolkit/docs/governance/voting.html">voting</a> in new committers or 
+to approve a release. </p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/images/apache-incubator-logo.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/odftoolkit/trunk/content/odftoolkit/images/apache-incubator-logo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/images/feather-small.gif
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/odftoolkit/trunk/content/odftoolkit/images/feather-small.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/index.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/index.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/index.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,101 @@
+<!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="/odftoolkit/css/odf.css" rel="stylesheet" type="text/css">
+
+<title>Apache ODF Toolkit (Incubating)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    <h1 class="title">Apache ODF Toolkit (Incubating)</h1>
+    <p>Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+yet to be fully endorsed by the ASF.</p>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>

Added: websites/staging/odftoolkit/trunk/content/odftoolkit/license.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/license.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/license.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,272 @@
+<!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="/odftoolkit/css/odf.css" rel="stylesheet" type="text/css">
+
+<title></title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+</head>
+
+<body>
+  <div id="banner">
+   <!-- <div id="bannerleft"><a alt="Apache ODF Toolkit (incubating)" href="http://incubator.apache.org/odftoolkit/">
+      <img id="logo" alt="Apache ODF Toolkit (Incubating)" src="/odftoolkit/images/ooo-logo.png"/></a></div> -->
+    <div id="bannerright"><a alt="Apache Incubator" href="http://incubator.apache.org">
+      <img id="asf-logo" alt="Apache Incubator" src="/odftoolkit/images/apache-incubator-logo.png"/></a></div>
+   <div id="bannercenter"><br/>&nbsp;&nbsp;&nbsp;&nbsp;Apache ODF Toolkit (incubating)</div>
+  </div>
+  
+  <div id="sidenav">
+    <h1 id="general">General</h1>
+<ul>
+<li><a href="/odftoolkit/index.html">About</a></li>
+<li><a href="http://incubator.apache.org/projects/odftoolkit.html">Incubator page</a></li>
+<li><a href="/odftoolkit/license.html">License</a></li>
+</ul>
+<h1 id="community">Community</h1>
+<ul>
+<li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
+<li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/odftoolkit/people.html">People</a></li>
+<li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
+</ul>
+<h1 id="development">Development</h1>
+<ul>
+<li><a href="/odftoolkit/source.html">Source Code</a></li>
+<li><a href="/odftoolkit/website-local.html">Website</a></li>
+<li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
+</ul>
+<h1 id="ppmc">PPMC</h1>
+<ul>
+<li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a><br />
+</li>
+</ul>
+<h1 id="asf">ASF</h1>
+<ul>
+<li><a href="http://www.apache.org">Apache Software Foundation</a></li>
+<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>
+</ul>
+  </div>
+  <div id="contenta">
+  
+    
+    <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>
+<p><strong><a name="definitions">1. Definitions</a></strong>.</p>
+<p>"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.</p>
+<p>"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.</p>
+<p>"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.</p>
+<p>"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.</p>
+<p>"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation source,
+and configuration files.</p>
+<p>"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.</p>
+<p>"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).</p>
+<p>"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.</p>
+<p>"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."</p>
+<p>"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.</p>
+<p><strong><a name="copyright">2. Grant of Copyright License</a></strong>. 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.</p>
+<p><strong><a name="patent">3. Grant of Patent License</a></strong>. 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.</p>
+<p><strong><a name="redistribution">4. Redistribution</a></strong>. 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:</p>
+<ol>
+<li>
+<p>You must give any other recipients of the Work or Derivative Works a
+copy of this License; and</p>
+</li>
+<li>
+<p>You must cause any modified files to carry prominent notices stating
+that You changed the files; and</p>
+</li>
+<li>
+<p>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</p>
+</li>
+<li>
+<p>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.</p>
+</li>
+</ol>
+<p><strong><a name="contributions">5. Submission of Contributions</a></strong>. 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.</p>
+<p><strong><a name="trademarks">6. Trademarks</a></strong>. 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.</p>
+<p><strong><a name="no-warranty">7. Disclaimer of Warranty</a></strong>. 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.</p>
+<p><strong><a name="no-liability">8. Limitation of Liability</a></strong>. 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.</p>
+<p><strong><a name="additional">9. Accepting Warranty or Additional Liability</a></strong>.
+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.</p>
+<p>END OF TERMS AND CONDITIONS</p>
+<h1 id="apply">APPENDIX: How to apply the Apache License to your work</h1>
+<p>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.</p>
+<div class="codehilite"><pre>   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+   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 &quot;AS IS&quot; 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.
+</pre></div>
+  </div>
+
+  <div id="footera">
+    <div id="poweredby">
+      <p><img src="/odftoolkit/images/feather-small.gif"/><br/>Powered by the Apache CMS.</p>
+    </div>
+    <div id="copyrighta">
+      <p>
+	Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+	Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
+	decision making process	have stabilized in a manner consistent with other successful ASF projects. While incubation status is
+	not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has
+	yet to be fully endorsed by the ASF.</p>
+      <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>.
+	<a href="/openofficeorg/contact.html">Contact Us</a>
+	<br />Apache and the Apache feather logos are trademarks of The Apache Software Foundation.
+	<br />Other names appearing on the site may be trademarks of their respective owners.
+      </p>
+    </div>
+  </div>
+
+</body>
+</html>



Mime
View raw message