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 [2/3] - in /websites/staging/odftoolkit/trunk/content: ./ odftoolkit/ odftoolkit/docs/ odftoolkit/docs/governance/ odftoolkit/images/
Date Wed, 24 Aug 2011 01:45:45 GMT
Added: websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,145 @@
+<!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>Mailing Lists</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">Mailing Lists</h1>
+    <h2 id="odf_toolkit_mailing_lists">ODF Toolkit Mailing Lists</h2>
+<p>We welcome you to join our mailing lists and let us know about your thoughts or
+ideas about Apache ODF Toolkit</p>
+<h2 id="participation_guidelines">Participation Guidelines</h2>
+<p>We ask all mailing list participants to observe <a href="http://www.apache.org/dev/contrib-email-tips.html">these guidelines</a>. </p>
+<p>Specifically note the request "Use sensible and concise email subject headings".</p>
+<p>Some subject tags to consider include:</p>
+<ul>
+<li>[www] for posts related to the website</li>
+<li>[Repo] for posts related to the source code repository</li>
+</ul>
+<p>Other useful topic tags can be found by observing traffic on the list or by looking at the list archives.</p>
+<p>In addition to the topic subject tags, there are also tags used to indicate a request:</p>
+<ul>
+<li>[DISCUSS] indicates a rough idea is being floated, and input is welcome</li>
+<li>[PROPOSAL] indicates a specific proposal is being made, and often that Lazy Consensus is being sought.</li>
+<li>[VOTE] indicates that a formal vote is being called.  This is rare.</li>
+</ul>
+<p>Note: it is common for a topic tag and an action tag to be combined, e.g.:</p>
+<ul>
+<li>[PROPOSAL][Repo] Migration of legacy repository to SVN</li>
+<li>[DISCUSS][download] What are our options of mirroring legacy releases?</li>
+</ul>
+<h2 id="development_mailing_list">Development Mailing List</h2>
+<p>This is where the community hangs out. This list is used to coordinate
+activities and ensure we are all pulling in the same direction.  This is a high traffic list, with an average of 57 posts/day.</p>
+<ul>
+<li>Subscribe: <a href="mailto:odf-dev-subscribe@incubator.apache.org">odf-dev-subscribe@incubator.apache.org</a></li>
+<li>Post (after subscription): <a href="mailto:odf-dev@incubator.apache.org">odf-dev@incubator.apache.org</a></li>
+<li>Unsubscribe: <a href="mailto:odf-dev-unsubscribe@incubator.apache.org">odf-dev-unsubscribe@incubator.apache.org</a></li>
+<li>Archives<ul>
+<li><a href="http://markmail.org/search/+list:org.apache.incubator.odf-dev">Markmail</a></li>
+<li><a href="http://dir.gmane.org/gmane.comp.apache.incubator.ooo.devel/">Gmane</a></li>
+<li><a href="http://mail-archives.apache.org/mod_mbox/incubator-odf-dev/">Apache</a></li>
+</ul>
+</li>
+</ul>
+<h2 id="commits_mailing_list">Commits Mailing List</h2>
+<p>This is where the community receives automated notifications of any changes to the
+ODF Toolkit code and documentation.  This is a moderate traffic list, with an average of 10 posts/day.</p>
+<ul>
+<li>Subscribe: <a href="mailto:odf-commits-subscribe@incubator.apache.org">odf-commits-subscribe@incubator.apache.org</a></li>
+<li>Unsubscribe: <a href="mailto:odf-commmits-unsubscribe@incubator.apache.org">odf-commmits-unsubscribe@incubator.apache.org</a></li>
+<li>Archives<ul>
+<li><a href="http://markmail.org/search/+list:org.apache.incubator.odf-commits">Markmail</a></li>
+<li><a href="http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/">Apache</a></li>
+</ul>
+</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/people.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/people.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/people.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,135 @@
+<!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>Some of our contributors</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">Some of our contributors</h1>
+    <p>Apache ODF Toolkit (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>
+<table>
+<thead>
+<tr>
+<th>Apache ID</th>
+<th class="w160">Name</th>
+<th class="w180">Home</th>
+<th>Skills/Interests</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>dpharbison</td>
+<td>Don Harbison</td>
+<td>Chelmsford, MA USA</td>
+<td>Trademark, Branding, Communications, Community Development</td>
+</tr>
+<tr>
+<td>orcmid</td>
+<td><a href="http://nfoworks.org/diary/">Dennis E. Hamilton</a></td>
+<td>Seattle, WA</td>
+<td>C/C++, Java, Interoperability, ODF, security, architecture, web</td>
+</tr>
+<tr>
+<td>robweir</td>
+<td><a href="http://www.robweir.com/blog">Rob Weir</a></td>
+<td>Westford, MA, USA</td>
+<td>C/C++, Java, Python, XML, ODF, Performance tuning</td>
+</tr>
+<tr>
+<td>wave</td>
+<td>David Fisher</td>
+<td>San Francisco, CA, USA</td>
+<td>Document Generation and Workflow, Java, Postscript, PDF, Apache POI, Web Services</td>
+</tr>
+</tbody>
+</table>
+  </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/ppmc-faqs.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/ppmc-faqs.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/ppmc-faqs.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,186 @@
+<!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>PPMC 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">PPMC FAQs</h1>
+    <h3 id="what_is_the_ppmc">What is the PPMC?</h3>
+<p>The Podling Project Management Committee (PPMC) is the government of the project. It
+consists of ASF mentors and initial committers. The committee is responsible for the
+project and decides what to do and which direction to go.
+<br> (<a href="http://incubator.apache.org/guides/ppmc.html">see here for more information</a>)</p>
+<h3 id="how_to_participate">How to participate?</h3>
+<p>First of all you have to think how you want to participate as we have different kind
+of roles like user, developer, committer. The easiest way is to use what we build as
+user. If you want to improve parts of the software, or documentation, write to our
+<a href="http://incubator.apache.org/odftoolkit/mailing-lists.html">mailing lists</a> what should be modified and how it should be done.</p>
+<p>The following are conditions to become a committer:</p>
+<ol>
+<li>You have sent in patches that were well-respected to improve the software.</li>
+<li>You have added documentation to the Wiki or website that were well-respected to
+    improve the non-code part of the project.</li>
+<li>You have shown that you can discuss in the mailing lists and that this has
+    brought us forward.</li>
+<li>You are well known to the established members, who you are and what you have
+    done in the past. Regarding this project, a former-one or another project.</li>
+</ol>
+<p>If 1 of the 4 statements above are true, then you can be voted in as committer.</p>
+<p>When the vote result is positive, you will be asked for some information to setup
+your committer status.
+<br> (<a href="http://incubator.apache.org/guides/participation.html">see here for more information</a>)</p>
+<h3 id="i_was_invitedvoted_as_committer_so_whats_next">I was invited/voted as committer, so whats next?</h3>
+<p>The following is a brief summary of what to expect as committer:</p>
+<ol>
+<li>
+<p>After your (individual Contributor License Agreement (<a href="http://www.apache.org/licenses/icla.txt">iCLA</a>) has been
+    received and registered, you will be invited to specify one or more preferred
+    Apache user names.</p>
+<p><strong>Important</strong>: <br>
+The e-mail address you provide in your iCLA will be used for the following
+communications with you.</p>
+<p>Please note that there is also a <a href="http://www.apache.org/licenses/cla-corporate.txt">Corporate Contributor License Agreement
+(CCLA)</a> if you want/have to commit in the name of a company or organization.</p>
+</li>
+<li>
+<p>Choose one or more user name(s) that would be acceptable to you. These are short
+    names or abbreviation that will be used for a Unix account login.</p>
+<p><strong>Example:</strong> <br>
+Your name is "John Doe", so an ID could be "johnd" or "jdoe". <a href="http://people.apache.org/committer-index.html">Here you can see
+if the ID is still free</a> or already given to another committer.</p>
+<p>Supply all other information that is requested. Return the ID requests as
+instructed.</p>
+</li>
+<li>
+<p>When your choices are returned, the first request that does not conflict with
+    an already-issued ID will be used to generate an Apache ID. Write them in
+    the order you would like to have, so the first one is the most wanted.</p>
+</li>
+<li>
+<p>You will receive an e-mail, from "root@apache.org", that confirms the Apache
+    user name for you and also provides you with an initial password. There are also
+    instructions for changing your password. Please be patient as this mail can take
+    some days.</p>
+</li>
+<li>
+<p>The ID will also be your Apache e-mail address. Note that the account will be
+    set up to forward all received mails to the e-mail address you supplied on your
+    iCLA. It is not a normal mail account but just for forwarding. After you have
+    the account there is also a way to associate your Apache e-mail address with
+    additional e-mail addresses that you have. (<strong>ToDo</strong>: Add a link to a how-to)</p>
+</li>
+<li>
+<p>The ID and password will allow you to check in changes and new additions on the
+    Apache SVN repository for the ODF Toolkit incubator repository. The ability
+    to check in material on the SVN repository is important for more than code. All
+    committers will have an use for it.</p>
+</li>
+<li>
+<p>The ID and password will allow you to login to a personal Unix account on the
+    Apache server "people.apache.org". You can produce a personal website at this
+    account as well as use it as a regular Unix (specifically, FreeBSD) account. You
+    do not need to be able to use this account. You may find it useful as you become
+    more accomplished as a committer.<br />
+</p>
+</li>
+<li>
+<p>Being a committer also grants access to some non-public resources and mailing
+    lists. There are details in the <a href="https://svn.apache.org/repos/private/committers">private committers SVN tree</a>.</p>
+</li>
+</ol>
+<p>See the <a href="http://www.apache.org/dev/new-committers-guide.html">Guide for new committers</a> and the <a href="http://www.apache.org/dev/committers.html">Committers' FAQ</a> for more information.</p>
+<h3 id="how_and_when_to_vote">How and when to vote?</h3>
+<p>Voting is done when a formal decision has to be made or due to legal reasons, e.g.,
+to vote in new members as committers. In any case avoid voting as the normal way is
+to come to a decision by discussions. The initiator is responsible for the vote,
+that means also to count the votes and present the result. Every member has 1 vote.
+<br> (<a href="http://incubator.apache.org/odftoolkit/docs/governance/voting.html">see here for more information</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/release-process.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/release-process.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/release-process.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,350 @@
+<!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>Release Process</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">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>
+<li>
+<p>Increase the default Java heap available to Maven (required for Java SE 6)<br />
+</p>
+<div class="codehilite"><pre><span class="n">export</span> <span class="n">MAVEN_OPTS</span><span class="o">=</span><span class="s">&quot;-Xmx1024m -XX:MaxPermSize=256m&quot;</span>
+</pre></div>
+
+
+<ol>
+<li>Use the latest Sun 1.6.0 JDK</li>
+<li>Use Maven 3.0.3 or later</li>
+<li>Make sure the <a href="release-setup.html">Release Setup</a> steps have been performed.</li>
+</ol>
+</li>
+<li>
+<p>Prepare the source for release:   <br />
+</p>
+<ol>
+<li>Cleanup JIRA so the Fix Version in issues resolved since the last release includes this release version correctly. Also, transition any Resolved issues to the Closed state.</li>
+<li>Update the text files in a working copy of the project root -<ol>
+<li>Update the CHANGELOG based on the Text release reports from JIRA.</li>
+<li>Review and update README.txt if needed.</li>
+<li>Commit any changes back to svn </li>
+</ol>
+</li>
+<li>Stage any Roadmap or Release landing pages on the site.</li>
+</ol>
+</li>
+<li>
+<p>Checkout a clean copy of the trunk to release using command line svn. <br />
+</p>
+</li>
+</ol>
+<p><em>Do not use Eclipse to do the checkout. The extra dot (.) files created by Eclipse throws off the rat:check processing.</em></p>
+<ol>
+<li>
+<p>Use <code>mvn -P pedantic verify</code> to verify the source has the required headers before trying to release.</p>
+</li>
+<li>
+<p>Do a dry run of the release:prepare step:<br />
+</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">mvn</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="n">release:prepare</span> <span class="o">-</span><span class="n">DdryRun</span><span class="o">=</span><span class="n">true</span>
+</pre></div>
+
+
+</li>
+</ol>
+<p>The dry run will not commit any changes back to SVN and gives you the opportunity to verify that the release process will complete as expected. You will be prompted for the following information :
+      * Release version - take the default 
+      * SCM release tag - <em>DO NOT TAKE THE DEFAULT</em>  -: : 0.1-incubating
+      * New development version - take the default
+      * GPG Passprhase<br />
+</p>
+<p><em>If you cancel a release:prepare before it updates the pom.xml versions, then use the release:clean goal to just remove the extra files that were created.</em></p>
+<ol>
+<li>Verify that the release process completed as expected<ol>
+<li>The release plugin will create pom.xml.tag files which contain the changes that would have been committed to SVN. The only differences between pom.xml.tag and it's corresponding pom.xml file should be the version number.</li>
+<li>
+<p>If other formatting changes have been made you should review the changes and then commit them - <br />
+</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s">&quot;fixing formatting for release&quot;</span>
+<span class="mi">3</span><span class="o">.</span> <span class="n">Check</span> <span class="n">release</span><span class="o">.</span><span class="n">properties</span> <span class="ow">and</span> <span class="n">make</span> <span class="n">sure</span> <span class="n">that</span> <span class="n">the</span> <span class="n">scm</span> <span class="n">properties</span> <span class="n">have</span> <span class="n">the</span> <span class="n">right</span> <span class="n">version</span><span class="o">.</span> <span class="n">Sometimes</span> <span class="n">the</span> <span class="n">scm</span> <span class="n">location</span> <span class="n">can</span> <span class="n">be</span> <span class="n">the</span> <span class="n">previous</span> <span class="n">version</span> <span class="ow">not</span> <span class="n">the</span> <span class="k">next</span> <span class="n">version</span><span class="o">.</span>
+<span class="mi">4</span><span class="o">.</span> <span class="n">Verify</span> <span class="n">signatures</span> <span class="p">([</span><span class="n">Verifying</span> <span class="n">release</span> <span class="n">signatures</span><span class="p">](</span><span class="n">http:</span><span class="sr">//i</span><span class="n">ncubator</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/rave/</span><span class="n">release</span><span class="o">-</span><span class="n">process</span><span class="o">.</span><span class="n">html</span><span class="c1">#verify_signatures))</span>
+</pre></div>
+
+
+</li>
+</ol>
+</li>
+<li>
+<p>Once any failures or required updates have been committed to svn, rollback the release prepare files:<br />
+</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">mvn</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="n">release:rollback</span>
+</pre></div>
+
+
+</li>
+<li>
+<p>Prepare the release</p>
+</li>
+<li>
+<p>Run the "release:prepare" step for real this time. You'll be prompted for the same version information.</p>
+<div class="codehilite"><pre>  <span class="nv">$</span> <span class="nv">mvn</span> <span class="n">release:prepare</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="o">-</span><span class="n">DpreparationGoals</span><span class="o">=</span><span class="s">&quot;clean install cargo:package&quot;</span>
+</pre></div>
+
+
+</li>
+<li>
+<p>Backup (zip or tar) your local release candidate directory in case you need to rollback the release after the next step is performed.</p>
+</li>
+<li>
+<p>Perform the release</p>
+</li>
+</ol>
+<p>This step will create a maven staging repository and site for use in testing and voting. </p>
+<div class="codehilite"><pre>    <span class="nv">$</span> <span class="nv">mvn</span> <span class="n">release:perform</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="o">-</span><span class="n">Duser</span><span class="o">.</span><span class="n">name</span><span class="o">=</span><span class="sr">&lt;your_apache_uid&gt;</span>
+
+<span class="o">*</span><span class="n">If</span> <span class="n">your</span> <span class="nb">local</span> <span class="n">OS</span> <span class="n">userid</span> <span class="n">doesn</span><span class="s">&#39;t match your Apache userid, then you&#39;</span><span class="n">ll</span> <span class="n">have</span> <span class="n">to</span> <span class="n">also</span> <span class="n">override</span> <span class="n">the</span> <span class="n">value</span> <span class="n">provided</span> <span class="n">by</span> <span class="n">the</span> <span class="n">OS</span> <span class="n">to</span> <span class="n">Maven</span> <span class="k">for</span> <span class="n">the</span> <span class="n">site</span><span class="o">-</span><span class="n">deploy</span> <span class="n">step</span> <span class="n">to</span> <span class="n">work</span><span class="o">.</span> <span class="n">This</span> <span class="n">is</span> <span class="n">known</span> <span class="n">to</span> <span class="n">
 work</span> <span class="k">for</span> <span class="n">Linux</span><span class="p">,</span> <span class="n">but</span> <span class="ow">not</span> <span class="k">for</span> <span class="n">Mac</span> <span class="ow">and</span> <span class="n">unknown</span> <span class="k">for</span> <span class="n">Windows</span><span class="o">.*</span>
+<span class="o">*</span><span class="n">The</span> <span class="n">maven</span><span class="o">-</span><span class="n">release</span><span class="o">-</span><span class="n">plugin</span> <span class="n">is</span> <span class="n">configured</span> <span class="n">with</span> <span class="n">goals</span> <span class="s">&quot;deploy site site:deploy&quot;</span> <span class="ow">and</span> <span class="n">will</span> <span class="n">deploy</span> <span class="n">the</span> <span class="n">site</span> <span class="n">files</span> <span class="n">to</span> <span class="n">a</span> <span class="n">staging</span><span class="o">-</span><span class="n">site</span> <span class="n">directory</span> <span class="n">on</span> <span class="n">people</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="o">.*</span>
+</pre></div>
+
+
+<ol>
+<li>Verify the release artifacts</li>
+<li>Verify the HTML links in site are correct</li>
+<li>Verify the staged artifacts in the nexus repo        <br />
+           1. https://repository.apache.org/index.html
+           2. Enterprise --&gt; Staging
+           3. Staging tab --&gt; Name column --&gt; org.apache.rave
+           4. Navigate through the artifact tree and make sure that all javadoc, sources, tests, jars, ... have .asc (GPG signature) and .md5 files. See http://people.apache.org/~henkp/repo/faq.html and http://www.apache.org/dev/release-signing.html#openpgp-ascii-detach-sig</li>
+<li>Close the nexus staging repo<ol>
+<li>https://repository.apache.org/index.html</li>
+<li>Enterprise --&gt; Staging</li>
+<li>Staging tab --&gt; Name column --&gt; org.apache.rave</li>
+<li>Right click on the open staging repo (org.apache.rave-XXX) and select Close.</li>
+</ol>
+</li>
+<li>
+<ol>
+<li>Create a VOTE email thread on rave-dev@ to record votes as replies, like <a href="release-vote.txt">this</a></li>
+<li>Create a DISCUSS email thread on rave-dev@ for any vote questions, <a href="release-discuss.txt">this</a></li>
+<li>Perform a review of the release and cast your vote. See the following for more details on Apache releases </li>
+</ol>
+<p>Put the release candidate up for a vote</p>
+<p><a href="http://www.apache.org/dev/release.html">http://www.apache.org/dev/release.html</a><br />
+<a href="http://incubator.apache.org/guides/releasemanagement.html">http://incubator.apache.org/guides/releasemanagement.html</a></p>
+<ol>
+<li>A -1 vote does not necessarily mean that the vote must be redone, however it is usually a good idea to rollback the release if a -1 vote is received. See - Recovering from a vetoed release</li>
+<li>
+<ol>
+<li>reply to the initial email and prepend to the original subject -</li>
+</ol>
+<p>After the vote has been open for at least 72 hours, has at least three +1 PMC votes and no -1 votes, then post the results to the vote thread by -</p>
+<p>[RESULTS]</p>
+<ol>
+<li>Include a list of everyone who voted +1, 0 or -1.</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<p>Put the release candidate up for an Incubator PMC vote</p>
+<ol>
+<li>
+<p>Create a VOTE email thread on general@incubator to record votes as replies, like <a href="vote-ipmc.txt">this</a></p>
+</li>
+<li>
+<p>After the vote has been open for at least 72 hours, has at least three +1 Incubator PMC votes and no -1 votes, then post the results to the vote thread by -</p>
+<ol>
+<li>replying to the initial email and prepend to the original subject -</li>
+</ol>
+<p>[RESULTS]</p>
+<ol>
+<li>Include a list of everyone who voted +1, 0 or -1.</li>
+</ol>
+</li>
+</ol>
+</li>
+<li>
+<p>Finalizing a release</p>
+</li>
+<li>
+<ol>
+<li>https://repository.apache.org/index.html</li>
+<li>Enterprise --&gt; Staging</li>
+<li>Staging tab --&gt; Name column --&gt; org.apache.rave</li>
+<li>Right click on the closed staging repo (org.apache.rave-XXX) and select Promote.</li>
+</ol>
+<p>Promote the staged nexus artifacts -</p>
+<ol>
+<li>
+<p>Copy the distribution artifacts over to the distribution area</p>
+<p>$ ssh ${user.name}@people.apache.org<br />
+  $ mkdir /www/www.apache.org/dist/incubator/rave/${project.version} <br />
+  $ cd /www/www.apache.org/dist/incubator/rave/${project.version} <br />
+  $ wget https://repository.apache.org/content/repositories/releases/org/apache/rave/rave-parent/${project.version}/rave-parent-${project.version}-source-release.zip  <br />
+  $ wget https://repository.apache.org/content/repositories/releases/org/apache/rave/rave-parent/${project.version}/rave-parent-${project.version}-source-release.zip.asc <br />
+  $ wget https://repository.apache.org/content/repositories/releases/org/apache/rave/rave-parent/${project.version}/rave-parent-${project.version}-source-release.zip.md5 <br />
+  $ wget https://repository.apache.org/content/repositories/releases/org/apache/rave/rave-parent/${project.version}/rave-parent-${project.version}-source-release.zip.sha1  <br />
+</p>
+</li>
+</ol>
+<p><strong>Make sure all the copied files have g+rw set and only o+r set</strong></p>
+<div class="codehilite"><pre>  $ find . -user <span class="cp">${</span><span class="n">user</span><span class="o">.</span><span class="n">name</span><span class="cp">}</span> -type f | xargs chmod 664
+  $ find . -user <span class="cp">${</span><span class="n">user</span><span class="o">.</span><span class="n">name</span><span class="cp">}</span> -type d | xargs chmod 775
+</pre></div>
+
+
+<p><em>Note: All of the artifacts are in the maven repos, but we may create an assembly to publish in future releases</em></p>
+<ol>
+<li>Publish the staged website </li>
+</ol>
+</li>
+<li>
+<p>Update the JIRA versions page to mark the version as "released", and set the date to the date that the release was approved. You may also need to make a new release entry for the next release.</p>
+</li>
+<li>Announcing the release</li>
+<li>After the mirrors have had time to update (24 hours to be on the safe side) update the wiki with pointers to the new release</li>
+<li>Make a news announcement on the Rave homepage.</li>
+<li>Make an announcement about the release on the rave-users@incubator.apache.org, rave-dev@incubator.apache.org, general@incubator.apache.org, and announce@apache.org list as per the Apache Announcement Mailing Lists page)</li>
+</ol>
+<h4 id="recovering_from_a_vetoed_release">Recovering from a vetoed release</h4>
+<ol>
+<li>
+<p>Reply to the initial vote email and prepend to the original subject -</p>
+<p>[CANCELED]</p>
+</li>
+<li>
+<p>Rollback the version upgrades in trunk by either -</p>
+<ol>
+<li>
+<p>Restore the 0.1-rc1.tar.gz and run</p>
+<p>$ mvn -Papache-release release:rollback</p>
+</li>
+<li>
+<p>Manually revert the versions in trunk to the prior version and commit</p>
+</li>
+</ol>
+</li>
+<li>
+<p>Delete the svn tag created by the release:perform step -</p>
+<p>$ svn del https://svn.apache.org/repos/asf/incubator/rave/tags/0.1-incubating -m "deleting tag from rolled back release"</p>
+</li>
+<li>
+<p>Drop the nexus staging repo</p>
+<ol>
+<li>https://repository.apache.org/index.html</li>
+<li>Enterprise --&gt; Staging</li>
+<li>Staging tab --&gt; Name column --&gt; org.apache.rave</li>
+<li>Right click on the closed staging repo (org.apache.rave-XXX) and select Drop.</li>
+</ol>
+</li>
+<li>
+<p>Remote the staged site</p>
+</li>
+<li>
+<p>Make the required updates that caused the vote to be canceled</p>
+</li>
+<li>Spin another release candidate!</li>
+</ol>
+<h4 id="verifying_release_signatures">Verifying release signatures</h4>
+<p>On unix platforms the following command can be executed -</p>
+<div class="codehilite"><pre>  for file in `find . -type f -iname &#39;*.asc&#39;`
+  do
+      gpg --verify <span class="cp">${</span><span class="nb">file</span><span class="cp">}</span> 
+  done
+</pre></div>
+
+
+<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="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/source.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/source.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/source.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,108 @@
+<!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>Source Control</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">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/odf/trunk">browse our 
+repository</a> in your web browser.</p>
+<h2 id="getting_the_source_code">Getting the source code</h2>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/incubator/o</span><span class="n">df</span><span class="o">/</span><span class="n">trunk</span> <span class="n">odf</span>
+</pre></div>
+
+
+<h2 id="building_and_running">Building and Running</h2>
+<p>Coming soon</p>
+<h3 id="requirements">Requirements:</h3>
+<p>Coming soon</p>
+<p>For further information see the <a href="http://www.apache.org/dev/version-control.html">Apache Source Code Repository</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/svn-basics.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/svn-basics.html (added)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/svn-basics.html Wed Aug 24 01:45:44 2011
@@ -0,0 +1,324 @@
+<!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>Subversion Basics</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">Subversion Basics</h1>
+    <p>We use <a href="http://subversion.apache.org">Apache Subversion</a> for version control. For a complete reference on Subversion see the <a href="http://svnbook.red-bean.com">Subversion Book</a>. You can <a href="http://svn.apache.org/viewvc/incubator/odf/trunk">browse our repository</a> in your web browser.</p>
+<p>This page gives instructions on performing basic development tasks using the Subversion Command-Line Client. This instruction assumes you have Apache Subversion installed.</p>
+<ul>
+<li><a href="#overview">Overview</a> </li>
+<li><a href="#sub-commands_and_abbreviations">Sub-commands and Abbreviations</a> </li>
+<li><a href="#client_configuration">Client Configuration</a></li>
+<li><a href="#repository_layout">Repository Layout</a></li>
+<li><a href="#getting_the_source_code">Getting the source code</a></li>
+<li><a href="#basic_work_cycle">Basic Work Cycle</a></li>
+<li><a href="#committing_changes_by_others">Committing Changes By Others</a></li>
+<li><a href="#creating_and_submitting_patches">Creating and Submitting Patches</a></li>
+<li><a href="#further_information">Further Information</a></li>
+</ul>
+<h2 id="overview">Overview</h2>
+<p>You begin using Subversion by copying a directory from a remote repository to a local directory on your file system. This is known as a checkout of a working copy.</p>
+<p>Subversion uses a copy-modify-merge model meaning that you can add and edit files and directories in your working copy like any other files on your system, but you should use subversion commands for everything else such as <code>svn copy</code> and <code>svn move</code> instead of the operating system commands.</p>
+<h2 id="sub-commands_and_abbreviations">Sub-commands and Abbreviations</h2>
+<p>Subversion commands can be run from a command shell such as Bash on Linux. The subversion client command is <code>svn</code> followed by optional sub-commands, options, and arguments.</p>
+<p>Show the program version and modules</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="o">--</span><span class="n">version</span>
+</pre></div>
+
+
+<p>Run a sub-command</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="sr">&lt;subcommand&gt;</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="p">[</span><span class="n">args</span><span class="p">]</span>
+</pre></div>
+
+
+<p>Most sub-commands take file and/or directory arguments, recursing on the directories. If no arguments are supplied to such a command, it recurses on the current directory (inclusive) by default. (from <code>svn help</code>)</p>
+<p>The following is only a partial list of sub-commands relating to this instruction. For a complete list, see the <a href="http://svnbook.red-bean.com">Subversion Book</a>, or use <code>svn help</code>.</p>
+<ul>
+<li><code>add</code> - Schedule a new file or directory (including contained files) for inclusion in the repository</li>
+<li><code>checkout</code>, <code>co</code> - Create a local working copy of a remote repository</li>
+<li><code>commit</code>, <code>ci</code> - Commit (check in) local changes to the repository</li>
+<li><code>copy</code>, <code>cp</code> - Copy one or more files in a working copy or in the repository</li>
+<li><code>delete</code>, <code>del</code>, <code>remove</code>, <code>rm</code> - Items specified are scheduled for deletion upon the next commit. Working copy files not yet committed are deleted immediately.</li>
+<li><code>diff</code>, <code>di</code> - Displays differences in files from the directory</li>
+<li><code>help</code>, <code>?</code>, <code>h</code> - Subversion help and help on sub-commands</li>
+<li><code>move</code>, <code>mv</code>, <code>rename</code>, <code>ren</code> - Moves files or directories in your working copy or repository</li>
+<li><code>resolve</code> - Resolve conflicts on working copy files or directories</li>
+<li><code>revert</code> - Undo all local edits or optionally a file or directory</li>
+<li><code>status</code> - Print the status of working copy files and directories</li>
+<li><code>update</code> - Bring changes from the repository into your working copy</li>
+</ul>
+<h2 id="client_configuration">Client Configuration</h2>
+<p>Committers need to <a href="http://www.apache.org/dev/version-control.html#https-svn-config">configure their Subversion client</a> to handle the differences in line endings of text files on different operating systems.</p>
+<p>There are instances where Subversion may need to open an editor. You need to have the environment variable EDITOR set to the editor you would like to use. To set it for the current terminal session in Bash (your path may differ):</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">export</span> <span class="n">EDITOR</span><span class="o">=</span><span class="sr">/usr/</span><span class="n">bin</span><span class="o">/</span><span class="n">vim</span>
+</pre></div>
+
+
+<h2 id="repository_layout">Repository Layout</h2>
+<p>The Odf repository layout uses the following top-level directories <code>branches</code>, <code>site</code>, <code>tags</code>, and <code>trunk</code>.</p>
+<ul>
+<li><code>branches</code> - Contains branches used for continued development of a specific version, experimental versions, or for  developing features to be merged into the trunk or a branch later. (needs examples)</li>
+<li><code>site</code> - Contains the web site source code. Also contains it's own trunk directory.</li>
+<li><code>tags</code> - Contains specific versions of the project. These tags are not to be revised. (needs examples)</li>
+<li><code>trunk</code> - Contains the current source code.
+For more information see the <a href="http://www.apache.org/dev/contributors.html#svnbasics">Contributors Tech Guide</a>.</li>
+</ul>
+<h2 id="getting_the_source_code">Getting the source code</h2>
+<p>From the parent directory of where you want the working copy. In this example the <code>odf-trunk</code> directory will be created if it does not exist.</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/incubator/o</span><span class="n">df</span><span class="o">/</span><span class="n">trunk</span> <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="o">/</span><span class="n">tools</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">fetch</span><span class="o">-</span><span class="n">all</span><span class="o">-</span><span class="n">cws</span><span class="o">.</span><span class="n">sh</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">cws</span><span class="o">-</span><span class="n">list</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">fetch</span><span class="o">-</span><span class="n">all</span><span class="o">-</span><span class="n">web</span><span class="o">.</span><span class="n">sh</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">web</span><span class="o">-</span><span class="n">list</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">A</span>    <span class="n">odf</span><span class="o">-</span><span class="n">trunk</span><span class="sr">/tools/</span><span class="n">dev</span><span class="o">/</span><span class="n">single</span><span class="o">-</span><span class="n">hg</span><span class="o">.</span><span class="n">sh</span>
+<span class="n">Checked</span> <span class="n">out</span> <span class="n">revision</span> <span class="mi">1145818</span><span class="o">.</span>
+</pre></div>
+
+
+<p>"A" indicates file or directory is "Added" to working copy</p>
+<h2 id="basic_work_cycle">Basic Work Cycle</h2>
+<ul>
+<li>Update your working copy - For this you use the <code>svn update</code> command</li>
+<li>Make changes - For this you may edit files in an editor, or use the <code>svn add</code>, <code>svn delete</code>, <code>svn copy</code>, <code>svn-move</code> commands</li>
+<li>Review Changes - For this you use the <code>svn status</code> and <code>svn diff</code></li>
+<li>Fix Mistakes - Make additional edits to files or you can use the <code>svn revert</code> to restore files or directories to an unmodified state</li>
+<li>Resolve Conflicts - There is a chance others have committed changes while you have been changing your working copy. You should run the <code>svn update</code> command to bring your copy up to date. This may create a local conflict where someone may have added a file with a name that you also want to add, or may have made changes to the same line of a file as you. For this use the <code>svn resolve</code> command.</li>
+<li>Publish Changes - For this you use the <code>svn commit</code> command</li>
+</ul>
+<h3 id="adding_a_file">Adding a File</h3>
+<p>After creating the file "test-file.txt" in the working copy.</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">status</span>
+<span class="p">?</span>       <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+
+
+<p>? indicates test-file.txt is not under version control</p>
+<h3 id="scheduling_a_file_for_addition_to_repository">Scheduling a file for addition to repository</h3>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">add</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">A</span>         <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+
+<span class="nv">$</span> <span class="nv">svn</span> <span class="n">status</span>
+<span class="n">A</span>       <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+
+
+<p>"A" indicates file is scheduled for addition</p>
+<h3 id="running_a_diff">Running a diff</h3>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">diff</span>
+<span class="n">Index:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="o">===================================================================</span>
+<span class="o">---</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>   <span class="p">(</span><span class="n">revision</span> <span class="mi">0</span><span class="p">)</span>
+<span class="o">+++</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>   <span class="p">(</span><span class="n">revision</span> <span class="mi">0</span><span class="p">)</span>
+<span class="nv">@@</span> <span class="err">-</span><span class="nv">0</span><span class="p">,</span><span class="mi">0</span> <span class="o">+</span><span class="mi">1</span> <span class="nv">@@</span>
+<span class="err">+</span><span class="nv">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">test</span> <span class="n">file</span> <span class="k">for</span> <span class="n">svn</span><span class="o">-</span><span class="n">basics</span><span class="o">.</span>
+
+<span class="n">Property</span> <span class="n">changes</span> <span class="n">on:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">___________________________________________________________________</span>
+<span class="n">Added:</span> <span class="n">svn:eol</span><span class="o">-</span><span class="n">style</span>
+   <span class="o">+</span> <span class="n">native</span>
+</pre></div>
+
+
+<h3 id="committing_a_file">Committing a file</h3>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> <span class="o">-</span><span class="n">m</span> <span class="s">&quot;added test-file.txt&quot;</span>
+<span class="n">Adding</span>         <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="o">.</span>
+<span class="n">Committed</span> <span class="n">revision</span> <span class="mi">2</span><span class="o">.</span>
+</pre></div>
+
+
+<h3 id="update_the_working_copy">Update the working copy</h3>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">update</span>
+<span class="n">U</span>    <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">Updated</span> <span class="n">to</span> <span class="n">revision</span> <span class="mi">3</span><span class="o">.</span>
+</pre></div>
+
+
+<p>"U" indicates an "Update" to a file or directory</p>
+<p>Modify the file (this example uses the vim editor)</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">vim</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+
+
+<h3 id="check_the_status">Check the Status</h3>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">status</span>
+<span class="n">M</span>       <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+</pre></div>
+
+
+<p>"M" indicates the file has been "Modified"</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">diff</span>
+<span class="n">Index:</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="o">===================================================================</span>
+<span class="o">---</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>   <span class="p">(</span><span class="n">revision</span> <span class="mi">3</span><span class="p">)</span>
+<span class="o">+++</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>   <span class="p">(</span><span class="n">working</span> <span class="n">copy</span><span class="p">)</span>
+<span class="nv">@@</span> <span class="err">-</span><span class="nv">1</span><span class="p">,</span><span class="mi">2</span> <span class="o">+</span><span class="mi">1</span><span class="p">,</span><span class="mi">3</span> <span class="nv">@@</span>
+ <span class="nv">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">test</span> <span class="n">file</span> <span class="k">for</span> <span class="n">svn</span><span class="o">-</span><span class="n">basics</span><span class="o">.</span>
+ <span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="k">new</span> <span class="n">line</span> <span class="n">added</span> <span class="n">by</span> <span class="n">someone</span> <span class="k">else</span><span class="o">.</span>
+<span class="o">+</span><span class="n">This</span> <span class="n">line</span> <span class="n">added</span> <span class="n">by</span> <span class="n">me</span><span class="o">.</span>
+</pre></div>
+
+
+<h3 id="resolving_conflicts">Resolving Conflicts</h3>
+<p>Suppose someone edits the same line as you before you commit</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">update</span>
+<span class="n">Conflict</span> <span class="n">discovered</span> <span class="n">in</span> <span class="s">&#39;test-file.txt&#39;</span><span class="o">.</span>
+<span class="n">Select:</span> <span class="p">(</span><span class="n">p</span><span class="p">)</span> <span class="n">postpone</span><span class="p">,</span> <span class="p">(</span><span class="n">df</span><span class="p">)</span> <span class="n">diff</span><span class="o">-</span><span class="n">full</span><span class="p">,</span> <span class="p">(</span><span class="n">e</span><span class="p">)</span> <span class="n">edit</span><span class="p">,</span>
+        <span class="p">(</span><span class="n">mc</span><span class="p">)</span> <span class="n">mine</span><span class="o">-</span><span class="n">conflict</span><span class="p">,</span> <span class="p">(</span><span class="n">tc</span><span class="p">)</span> <span class="n">theirs</span><span class="o">-</span><span class="n">conflict</span><span class="p">,</span>
+        <span class="p">(</span><span class="n">s</span><span class="p">)</span> <span class="n">show</span> <span class="n">all</span> <span class="n">options:</span>
+</pre></div>
+
+
+<p>This is just like if you had ran the <code>svn resolve</code> command</p>
+<p>Selecting <code>df</code> displays this:</p>
+<div class="codehilite"><pre><span class="gd">--- .svn/text-base/test-file.txt.svn-base   Sun Jul 17 17:38:52 2011</span>
+<span class="gi">+++ .svn/tmp/test-file.txt.tmp  Sun Jul 17 21:35:09 2011</span>
+<span class="gu">@@ -1,2 +1,7 @@</span>
+ This is a test file for svn-basics.
+ This is a new line added by someone else.
+<span class="gi">+&lt;&lt;&lt;&lt;&lt;&lt;&lt; .mine</span>
+<span class="gi">+This line added by me.</span>
+<span class="gi">+=======</span>
+<span class="gi">+This line is added by someone else also.</span>
+<span class="gi">+&gt;&gt;&gt;&gt;&gt;&gt;&gt; .r4</span>
+Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options:
+</pre></div>
+
+
+<p>If you choose <code>e</code>, Subversion will launch an editor with both sets of changes included for you to edit. You can save your changes in the editor and then select <code>r</code> (for resolved).</p>
+<div class="codehilite"><pre><span class="n">G</span>    <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">Updated</span> <span class="n">to</span> <span class="n">revision</span> <span class="mi">4</span><span class="o">.</span>
+</pre></div>
+
+
+<p>"G" indicates "merGed"</p>
+<h3 id="committing_the_changes">Committing the Changes</h3>
+<p>Only Committers can commit directly to the repository. The following example shows using your Apache ID and password.</p>
+<div class="codehilite"><pre><span class="nv">$</span> <span class="nv">svn</span> <span class="n">commit</span> <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span> <span class="o">--</span><span class="n">username</span> <span class="n">your</span><span class="o">-</span><span class="n">name</span> <span class="o">--</span><span class="n">password</span> <span class="n">your</span><span class="o">-</span><span class="n">password</span> <span class="o">\</span>
+  <span class="o">-</span><span class="n">m</span> <span class="s">&quot;added new line&quot;</span>
+<span class="n">Sending</span>        <span class="n">test</span><span class="o">-</span><span class="n">file</span><span class="o">.</span><span class="n">txt</span>
+<span class="n">Transmitting</span> <span class="n">file</span> <span class="n">data</span> <span class="o">.</span>
+<span class="n">Committed</span> <span class="n">revision</span> <span class="mi">5</span><span class="o">.</span>
+</pre></div>
+
+
+<p>For further information see the <a href="http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html">Basic Work Cycle</a> page from <a href="http://svnbook.red-bean.com">Subversion Book</a>.</p>
+<h2 id="committing_changes_by_others">Committing Changes By Others</h2>
+<p>See the <a href="http://www.apache.org/dev/committers.html#applying-patches">Applying Patches</a> section of the Committer FAQ page.</p>
+<p>Example similar to one on Committer FAQ:</p>
+<div class="codehilite"><pre><span class="n">Issue</span> <span class="c1">#43835:</span>
+<span class="n">Added</span> <span class="n">some</span> <span class="n">cool</span> <span class="k">new</span> <span class="n">feature</span><span class="o">.</span>
+<span class="n">Submitted</span> <span class="n">by:</span> <span class="n">John</span> <span class="n">Doe</span> <span class="sr">&lt;john.doe.at.null.org&gt;</span>
+</pre></div>
+
+
+<p>Using the <code>-m (--message)</code> option only allows a single line log message. To commit a multi-line message use the <code>-F (--file)</code> option (with a previously created file) or use neither -m or -F and an editor will be started.</p>
+<h2 id="creating_and_submitting_patches">Creating and Submitting Patches</h2>
+<p>See the <a href="http://www.apache.org/dev/contributors.html#patches">Sending in Patches</a> section on the Contributors Tech Guide page.</p>
+<p>Create the patch file from <code>svn diff</code> where <code>your-patch-name.patch</code> is the full path to the patch file to create.</p>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">diff</span> <span class="o">&gt;</span> <span class="n">your</span><span class="o">-</span><span class="n">patch</span><span class="o">-</span><span class="n">name</span><span class="o">.</span><span class="n">patch</span>
+</pre></div>
+
+
+<h2 id="further_information">Further Information</h2>
+<p>For more information see: </p>
+<ul>
+<li><a href="http://subversion.apache.org">Apache Subversion Project</a></li>
+<li><a href="http://svnbook.red-bean.com">Subversion Book</a></li>
+<li><a href="http://www.apache.org/dev/">Apache Developer Information</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>



Mime
View raw message