You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2013/07/22 23:53:04 UTC

svn commit: r870650 [1/2] - in /websites/staging/openoffice/trunk/content: ./ docs/ docs/governance/ orientation/ pt-br/

Author: buildbot
Date: Mon Jul 22 21:53:03 2013
New Revision: 870650

Log:
Staging update by buildbot for openoffice

Removed:
    websites/staging/openoffice/trunk/content/downloads4test.html
Modified:
    websites/staging/openoffice/trunk/content/   (props changed)
    websites/staging/openoffice/trunk/content/bug-tracking.html
    websites/staging/openoffice/trunk/content/community-faqs.html
    websites/staging/openoffice/trunk/content/contact.html
    websites/staging/openoffice/trunk/content/contributing-code.html
    websites/staging/openoffice/trunk/content/developer-faqs.html
    websites/staging/openoffice/trunk/content/docs/download_process.html
    websites/staging/openoffice/trunk/content/docs/edit-cms.html
    websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html
    websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html
    websites/staging/openoffice/trunk/content/docs/governance/voting.html
    websites/staging/openoffice/trunk/content/events.html
    websites/staging/openoffice/trunk/content/get-it-here.html
    websites/staging/openoffice/trunk/content/index.html
    websites/staging/openoffice/trunk/content/license.html
    websites/staging/openoffice/trunk/content/list-conduct.html
    websites/staging/openoffice/trunk/content/mailing-lists.html
    websites/staging/openoffice/trunk/content/mission.html
    websites/staging/openoffice/trunk/content/native-lang.html
    websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html
    websites/staging/openoffice/trunk/content/orientation/infrastructure.html
    websites/staging/openoffice/trunk/content/orientation/intro-contributing.html
    websites/staging/openoffice/trunk/content/orientation/intro-development.html
    websites/staging/openoffice/trunk/content/orientation/intro-doc.html
    websites/staging/openoffice/trunk/content/orientation/intro-l10n.html
    websites/staging/openoffice/trunk/content/orientation/intro-marketing.html
    websites/staging/openoffice/trunk/content/people.html
    websites/staging/openoffice/trunk/content/pmc-faqs.html
    websites/staging/openoffice/trunk/content/privacy.html
    websites/staging/openoffice/trunk/content/pt-br/index.html
    websites/staging/openoffice/trunk/content/pt-br/participe.html
    websites/staging/openoffice/trunk/content/qa.html
    websites/staging/openoffice/trunk/content/release-process.html
    websites/staging/openoffice/trunk/content/security.html
    websites/staging/openoffice/trunk/content/social.html
    websites/staging/openoffice/trunk/content/students.html
    websites/staging/openoffice/trunk/content/style-test.html
    websites/staging/openoffice/trunk/content/svn-basics.html
    websites/staging/openoffice/trunk/content/terms.html
    websites/staging/openoffice/trunk/content/trademarks.html
    websites/staging/openoffice/trunk/content/website-local.html

Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 22 21:53:03 2013
@@ -1 +1 @@
-1505829
+1505830

Modified: websites/staging/openoffice/trunk/content/bug-tracking.html
==============================================================================
--- websites/staging/openoffice/trunk/content/bug-tracking.html (original)
+++ websites/staging/openoffice/trunk/content/bug-tracking.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/community-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/community-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/community-faqs.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/contact.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contact.html (original)
+++ websites/staging/openoffice/trunk/content/contact.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/contributing-code.html
==============================================================================
--- websites/staging/openoffice/trunk/content/contributing-code.html (original)
+++ websites/staging/openoffice/trunk/content/contributing-code.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/developer-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/developer-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/developer-faqs.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -172,8 +171,7 @@ and supply your patch as an attachment t
 <h2 id="wzxhzdk10where-can-i-download-developer-buildswzxhzdk11"><a name="where_can_i_download_developer_builds">Where can I download developer builds?</a></h2>
 <p>Developer builds are not official releases and may be unstable.  But they can be useful to download for those who 
 need early access to builds, but who do not want to compile their own build.</p>
-<p>Information on buildbot builds for linux64, window7, and linux32 can be found <a href="http://ci.apache.org/builders/">here</a>.<br />
-</p>
+<p>Information on buildbot builds for linux64, window7, and linux32 can be found <a href="http://ci.apache.org/builders/">here</a>.  </p>
 <p>Development snapshots can be found in</p>
 <blockquote>
 <p><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds">the Unofficial Development Snapshots page</a></p>

Modified: websites/staging/openoffice/trunk/content/docs/download_process.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/download_process.html (original)
+++ websites/staging/openoffice/trunk/content/docs/download_process.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/docs/edit-cms.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/edit-cms.html (original)
+++ websites/staging/openoffice/trunk/content/docs/edit-cms.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -131,25 +130,25 @@ the public web site.</p>
 <p>It is assumed that you have already checked out the code from the SVN repository
 (https://svn.apache.org/repos/asf/openoffice).</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>
+<div class="codehilite"><pre> <span class="n">vi</span> <span class="n">myfile</span><span class="p">.</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>&quot;<span class="n">My</span> <span class="nb">log</span> <span class="n">message</span>&quot; <span class="n">myfile</span><span class="p">.</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">penofficeorg</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">/openofficeorg/m</span><span class="n">yfile</span><span class="o">.</span><span class="n">html</span>
+<div class="codehilite"><pre> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">openofficeorg</span><span class="p">.</span><span class="n">staging</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">openofficeorg</span><span class="o">/</span><span class="n">myfile</span><span class="p">.</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>
+<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="p">:</span><span class="o">//</span><span class="n">s</span><span class="p">.</span><span class="n">apache</span><span class="p">.</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">openofficeorg</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>
+<div class="codehilite"><pre><span class="n">ssh</span> <span class="o">-</span><span class="n">t</span> <span class="o">&lt;</span><span class="n">user</span><span class="o">&gt;</span><span class="p">@</span><span class="n">people</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span> <span class="n">publish</span><span class="p">.</span><span class="n">pl</span> <span class="n">openofficeorg</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>
 
 
@@ -193,8 +192,7 @@ to the production site.</p>
 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>
+live version of your changes.  </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>

Modified: websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html (original)
+++ websites/staging/openoffice/trunk/content/docs/governance/consensusBuilding.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html (original)
+++ websites/staging/openoffice/trunk/content/docs/governance/lazyConsensus.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/docs/governance/voting.html
==============================================================================
--- websites/staging/openoffice/trunk/content/docs/governance/voting.html (original)
+++ websites/staging/openoffice/trunk/content/docs/governance/voting.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -123,58 +122,58 @@ and present the results. Everyone has 1 
    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>
+<div class="codehilite"><pre><span class="n">Address</span><span class="o">:</span> <span class="kd">private</span><span class="err">@</span>
+<span class="n">Subject</span><span class="o">:</span> <span class="o">[</span><span class="n">VOTE</span><span class="o">]</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="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="n">Text</span><span class="o">:</span>
+<span class="s2">&quot;I would like to propose to vote in John Doe as committer. John has showed in</span>
+<span class="s2">the last months that he has the skills and oversight for improving things (think</span>
+<span class="s2">about the last UI change of the &quot;</span><span class="n">Find</span><span class="s2">&quot; dialog).&quot;</span>
+
+<span class="o">+</span><span class="mi">1</span> <span class="o">(</span><span class="n">means</span> <span class="n">I</span> <span class="n">vote</span> <span class="k">for</span> <span class="n">John</span><span class="o">)</span>
+ <span class="mi">0</span> <span class="o">(</span><span class="n">means</span> <span class="n">vote</span> <span class="n">abstention</span><span class="o">)</span>
+<span class="o">-</span><span class="mi">1</span> <span class="o">(</span><span class="n">means</span> <span class="n">I</span> <span class="n">vote</span> <span class="n">against</span> <span class="n">John</span> <span class="n">because</span> <span class="n">of</span> <span class="n">the</span> <span class="n">following</span> <span class="n">reason</span><span class="o">:</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>
+<span class="n">Voting</span> <span class="n">time</span> <span class="n">frame</span> <span class="k">is</span> <span class="n">finished</span> <span class="mi">72</span> <span class="n">hours</span> <span class="n">from</span> <span class="n">now</span> <span class="n">until</span> <span class="n">June</span> <span class="mi">30</span><span class="o">,</span> <span class="mi">12</span><span class="o">:</span><span class="mi">00</span> <span class="n">PM</span> <span class="n">UTC</span><span class="o">.</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>
+<div class="codehilite"><pre><span class="n">Text</span><span class="p">:</span>
+<span class="o">+</span>1
 
-<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>
+<span class="n">I</span> <span class="n">like</span> <span class="n">his</span> <span class="n">work</span> <span class="n">and</span> <span class="n">want</span> <span class="n">him</span> <span class="n">to</span> <span class="n">stay</span> <span class="n">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="p">.</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>
+<div class="codehilite"><pre><span class="n">Subject</span><span class="p">:</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">Text</span><span class="p">:</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> 27<span class="p">,</span> 2011 <span class="n">at</span> 12<span class="p">:</span>00 <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="p">.</span>
 
-<span class="n">Voting</span> <span class="n">results:</span>
+<span class="n">Voting</span> <span class="n">results</span><span class="p">:</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>1<span class="p">:</span> 12
+ 0<span class="p">:</span> 0
+<span class="o">-</span>1<span class="p">:</span> 0
 
 <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>
+<span class="o">+</span>1 <span class="n">John</span> <span class="n">Low</span>
+<span class="o">+</span>1 <span class="n">Marc</span>
+<span class="o">+</span>1 <span class="n">David</span>
+<span class="o">+</span>1 <span class="n">Robert</span>
+<span class="o">+</span>1 <span class="n">Steve</span>
+<span class="o">+</span>1 <span class="n">Chris</span>
+<span class="o">+</span>1 <span class="n">Stefan</span>
+<span class="o">+</span>1 <span class="n">Andrew</span>
+<span class="o">+</span>1 <span class="n">Dennis</span>
+<span class="o">+</span>1 <span class="n">Karl</span>
+<span class="o">+</span>1 <span class="n">Simon</span>
+<span class="o">+</span>1 <span class="n">Greg</span>
 </pre></div>
 
 

Modified: websites/staging/openoffice/trunk/content/events.html
==============================================================================
--- websites/staging/openoffice/trunk/content/events.html (original)
+++ websites/staging/openoffice/trunk/content/events.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/get-it-here.html
==============================================================================
--- websites/staging/openoffice/trunk/content/get-it-here.html (original)
+++ websites/staging/openoffice/trunk/content/get-it-here.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -134,8 +133,7 @@ http://www.openoffice.org/de, http://www
 <li>
 <p>The logo <strong>must not</strong> link to a specific download file or mirror.  This
 causes problems with load balancing and fallbacks and may prevent
-users from getting the latest version of OpenOffice.<br />
-</p>
+users from getting the latest version of OpenOffice.  </p>
 </li>
 <li>
 <p>Any use of this logo or any other Apache logo beyond the above 

Modified: websites/staging/openoffice/trunk/content/index.html
==============================================================================
--- websites/staging/openoffice/trunk/content/index.html (original)
+++ websites/staging/openoffice/trunk/content/index.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/license.html
==============================================================================
--- websites/staging/openoffice/trunk/content/license.html (original)
+++ websites/staging/openoffice/trunk/content/license.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -261,19 +260,20 @@ enclosed in the appropriate comment synt
 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]
+<div class="codehilite"><pre>   <span class="p">:::</span><span class="n">text</span>
+   <span class="n">Copyright</span> <span class="p">[</span><span class="n">yyyy</span><span class="p">]</span> <span class="p">[</span><span class="n">name</span> <span class="n">of</span> <span class="n">copyright</span> <span class="n">owner</span><span class="p">]</span>
 
-   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
+   <span class="n">Licensed</span> <span class="n">under</span> <span class="n">the</span> <span class="n">Apache</span> <span class="n">License</span><span class="p">,</span> <span class="n">Version</span> 2<span class="p">.</span>0 <span class="p">(</span><span class="n">the</span> &quot;<span class="n">License</span>&quot;<span class="p">);</span>
+   <span class="n">you</span> <span class="n">may</span> <span class="n">not</span> <span class="n">use</span> <span class="n">this</span> <span class="n">file</span> <span class="n">except</span> <span class="n">in</span> <span class="n">compliance</span> <span class="n">with</span> <span class="n">the</span> <span class="n">License</span><span class="p">.</span>
+   <span class="n">You</span> <span class="n">may</span> <span class="n">obtain</span> <span class="n">a</span> <span class="n">copy</span> <span class="n">of</span> <span class="n">the</span> <span class="n">License</span> <span class="n">at</span>
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">licenses</span><span class="o">/</span><span class="n">LICENSE</span><span class="o">-</span>2<span class="p">.</span>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.
+   <span class="n">Unless</span> <span class="n">required</span> <span class="n">by</span> <span class="n">applicable</span> <span class="n">law</span> <span class="n">or</span> <span class="n">agreed</span> <span class="n">to</span> <span class="n">in</span> <span class="n">writing</span><span class="p">,</span> <span class="n">software</span>
+   <span class="n">distributed</span> <span class="n">under</span> <span class="n">the</span> <span class="n">License</span> <span class="n">is</span> <span class="n">distributed</span> <span class="n">on</span> <span class="n">an</span> &quot;<span class="n">AS</span> <span class="n">IS</span>&quot; <span class="n">BASIS</span><span class="p">,</span>
+   <span class="n">WITHOUT</span> <span class="n">WARRANTIES</span> <span class="n">OR</span> <span class="n">CONDITIONS</span> <span class="n">OF</span> <span class="n">ANY</span> <span class="n">KIND</span><span class="p">,</span> <span class="n">either</span> <span class="n">express</span> <span class="n">or</span> <span class="n">implied</span><span class="p">.</span>
+   <span class="n">See</span> <span class="n">the</span> <span class="n">License</span> <span class="k">for</span> <span class="n">the</span> <span class="n">specific</span> <span class="n">language</span> <span class="n">governing</span> <span class="n">permissions</span> <span class="n">and</span>
+   <span class="n">limitations</span> <span class="n">under</span> <span class="n">the</span> <span class="n">License</span><span class="p">.</span>
 </pre></div>
   </div>
 

Modified: websites/staging/openoffice/trunk/content/list-conduct.html
==============================================================================
--- websites/staging/openoffice/trunk/content/list-conduct.html (original)
+++ websites/staging/openoffice/trunk/content/list-conduct.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -141,8 +140,7 @@ Perhaps the rule of thumb could be to re
 once per day, to any given thread. The highest frequency of responses does not 
 necessarily “Win” in a community of equals. The most concise and useful post 
 tends to win, because furthering the dialog and advancing the community's goals
- is what we all desire.<br />
-</p>
+ is what we all desire.  </p>
 <p>Of course, not all threads are decision-making threads.  Some are debugging or 
 problem solving.  In those cases, the opposite advice applies.  If you know the
  answer, and can state it briefly, then do so.</p>
@@ -165,8 +163,7 @@ lists on the project, e.g., the PMC list
 occasion interact with other private lists, like legal-internal or 
 infrastructure-private.  Anything you read in a private list is confidential and
  not to be spoken of, or copied to people who are not members of that private 
-list.<br />
-</p>
+list.  </p>
 <p>Note:  the other side of respecting the private lists is to use them only when 
 necessary, and for for topics that require confidentiality, such as information 
 that deals with security vulnerabilities, personnel matters, user private 

Modified: websites/staging/openoffice/trunk/content/mailing-lists.html
==============================================================================
--- websites/staging/openoffice/trunk/content/mailing-lists.html (original)
+++ websites/staging/openoffice/trunk/content/mailing-lists.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -123,11 +122,9 @@ Archive Policy</a></p>
 </ul>
 <h2 id="using-mailing-lists">Using Mailing Lists</h2>
 <p>A mailing list is a way to share information and coordinate with other project members.  When you send an email
-to a mailing list it is forwarded to all other subscribers to that mailing list.<br />
-</p>
+to a mailing list it is forwarded to all other subscribers to that mailing list.  </p>
 <p>Every OpenOffice mailing list has a list address, of the form: <em>xyz</em>@openoffice.apache.org, where
-you <strong>replace "<em>xyz</em>" with the actual list name</strong>, such as "dev" or "qa" or "marketing".<br />
-</p>
+you <strong>replace "<em>xyz</em>" with the actual list name</strong>, such as "dev" or "qa" or "marketing".  </p>
 <p>There are three basic operations you should know about:</p>
 <ul>
 <li>To send an email to the mailing list, and have it forwarded to all other subscribers, send an email to the

Modified: websites/staging/openoffice/trunk/content/mission.html
==============================================================================
--- websites/staging/openoffice/trunk/content/mission.html (original)
+++ websites/staging/openoffice/trunk/content/mission.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/native-lang.html
==============================================================================
--- websites/staging/openoffice/trunk/content/native-lang.html (original)
+++ websites/staging/openoffice/trunk/content/native-lang.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -138,12 +137,12 @@ moderators to be established. Initiate s
 <p>Additional information and archives for these list as well as any other Apache mailing
 list can be found at the <a href="http://mail-archives.apache.org/mod_mbox/">Available Mailing List page</a>.</p>
 <p>Subscribe to any of these lists using the following format:</p>
-<div class="codehilite"><pre><span class="s">&quot;list name&quot;</span><span class="o">-</span><span class="n">subscribe</span><span class="nv">@openoffice</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span>
+<div class="codehilite"><pre>&quot;<span class="n">list</span> <span class="n">name</span>&quot;<span class="o">-</span><span class="n">subscribe</span><span class="p">@</span><span class="n">openoffice</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span>
 </pre></div>
 
 
 <p>For example: </p>
-<div class="codehilite"><pre><span class="n">users</span><span class="o">-</span><span class="n">de</span><span class="o">-</span><span class="n">subscribe</span><span class="nv">@openoffice</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span>
+<div class="codehilite"><pre><span class="n">users</span><span class="o">-</span><span class="n">de</span><span class="o">-</span><span class="n">subscribe</span><span class="p">@</span><span class="n">openoffice</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span>
 </pre></div>
 
 

Modified: websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/how-aoo-project-works.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -101,7 +100,7 @@
     <h1 class="title">How the Apache OpenOffice Project Works
</h1>
     <ol>
 <li>
-<p>Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting How the Apache OpenOffice Project Works">dev@openoffice.apache.org</a> to let us know you are working on this module.</p>
+<p>Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting%20How%20the%20Apache%20OpenOffice%20Project%20Works">dev@openoffice.apache.org</a> to let us know you are working on this module.</p>
 </li>
 <li>
 <p>As you learned in the <a href="intro-contributing.html">previous module</a> the Apache Software Foundation formally has Members, who elect a Board of Directors who appoint Officers, including
@@ -135,7 +134,7 @@ users around the globe.  This includes t
 </ul>
 </li>
 <li>
-<p>Congratulations!  You have completed this Level.  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed How the Apache OpenOffice Project Works">dev@openoffice.apache.org</a> so 
+<p>Congratulations!  You have completed this Level.  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed%20How%20the%20Apache%20OpenOffice%20Project%20Works">dev@openoffice.apache.org</a> so 
 we all know you have completed this level.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
 </li>
 </ol>

Modified: websites/staging/openoffice/trunk/content/orientation/infrastructure.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/infrastructure.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/infrastructure.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -104,7 +103,7 @@ or at least hear them discussed on the l
 need more information or run into problems.</p>
 <ol>
 <li>
-<p>First, Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting Infrastructure Module">dev@openoffice.apache.org</a> 
+<p>First, Please send an email to <a href="mailto:dev@openoffice.apache.org?subject=Starting%20Infrastructure%20Module">dev@openoffice.apache.org</a> 
 to let us know you are working on this module.</p>
 </li>
 <li>
@@ -167,8 +166,7 @@ need to raise an issue with another grou
 including many of the services described above.  As you can imagine, with all the projects that are part of Apache, this is huge job.<br />
 In order to support this number of projects and provide good service levels in this shared infrastructure environment, we align ourselves 
 with the common services that are made available to other projects.  In other words, we have a "menu" of services that we can enable for the project, 
-and the ability to do some customization, within defined bounds, but we cannot easily use a service outside of that menu.<br />
-</p>
+and the ability to do some customization, within defined bounds, but we cannot easily use a service outside of that menu.  </p>
 </li>
 <li>
 <p>What to do if you have a problem:</p>
@@ -181,7 +179,7 @@ first on the project's mailing list.</li
 </ul>
 </li>
 <li>
-<p>Congratulations!  You have completed this Module.  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed Infrastructure Module">dev@openoffice.apache.org</a> so 
+<p>Congratulations!  You have completed this Module.  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed%20Infrastructure%20Module">dev@openoffice.apache.org</a> so 
 we all know you have completed this level.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
 </li>
 </ol>

Modified: websites/staging/openoffice/trunk/content/orientation/intro-contributing.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-contributing.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-contributing.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -101,15 +100,14 @@
     <h1 class="title">Introduction to Contributing to Apache OpenOffice</h1>
     <p>In this Orientation Module you will gain basic familiarity with the Apache Software Foundation and how it works, 
 get signed up for various important online project services, and introduce yourself to the other volunteers on 
-the project's mailing mailing list.<br />
-</p>
+the project's mailing mailing list.  </p>
 <p>Level 1 is focused on connecting you to the project.</p>
 <p>If you have prior experience with an open source software project, especially one at
 Apache, then much of this will already be familiar to you.</p>
 <ol>
 <li>
 <p>Introduce yourself to the other project Volunteers by sending an email to our main public 
-mailing list <a href="mailto:dev@openoffice.apache.org?subject=Starting Introduction to Contributing to Apache OpenOffice Module">dev@openoffice.apache.org</a>.  Who are you, where 
+mailing list <a href="mailto:dev@openoffice.apache.org?subject=Starting%20Introduction%20to%20Contributing%20to%20Apache%20OpenOffice%20Module">dev@openoffice.apache.org</a>.  Who are you, where 
 are you from, what are you interested in?  These are all good things to cover.  Also, as you work through the 
 items on this page, if you have questions or problems, please feel free to ask for help by sending a note to 
 this list.</p>
@@ -183,7 +181,7 @@ and <a href="http://openoffice.apache.or
 </li>
 <li>
 <p>Finally, once you have done the above, go to our our <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers">Directory of Volunteers</a> wiki page and add your 
-information.  Congratulations!  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed Introduction to Contributing to Apache OpenOffice Module">dev@openoffice.apache.org</a> 
+information.  Congratulations!  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed%20Introduction%20to%20Contributing%20to%20Apache%20OpenOffice%20Module">dev@openoffice.apache.org</a> 
 so we know.</p>
 </li>
 </ol>

Modified: websites/staging/openoffice/trunk/content/orientation/intro-development.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-development.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-development.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -104,9 +103,8 @@
 <p>To complete this module, read through the material on this page, including the linked references.  There will also
 be some start-up tasks for you to perform, such as signing up for an account in our defect tracking database.</p>
 <p>Your first task is to subscribe to our Development mailing list. You can subscribe by sending an email to 
-<a href="mailto:dev-subscribe@openoffice.apache.org">dev-subscribe@openoffice.apache.org</a>.<br />
-</p>
-<p>Then you can introduce yourself by <a href="mailto:dev@openoffice.apache.org?subject=New Dev Volunteer">sending an email to the list</a>.
+<a href="mailto:dev-subscribe@openoffice.apache.org">dev-subscribe@openoffice.apache.org</a>.  </p>
+<p>Then you can introduce yourself by <a href="mailto:dev@openoffice.apache.org?subject=New%20Dev%20Volunteer">sending an email to the list</a>.
 We'd love to hear who you are, where you are from, what your background is, etc.   Also as you work through the 
 items on this page, if you have questions or problems, please feel free to ask for help by sending a note to 
 this same list.</p>
@@ -130,7 +128,7 @@ is a known problem with a known solution
 <p>Note also the current list of configuration flags used in building the development snapshot builds at the 
 bottom of the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Development+Snapshot+Builds#DevelopmentSnapshotBuilds-AOO3.4.1">development snapshot builds page</a>.
 Although there are many other combinations of flags you can use, some of which are very useful for development,  the flags on that page are what we use in our official releases.</p>
-<p>Once you have a successful build, <a href="mailto:dev@openoffice.apache.org?subject=Successful 1st Build!">post a note to the dev list</a> for some well-earned congratulations!</p>
+<p>Once you have a successful build, <a href="mailto:dev@openoffice.apache.org?subject=Successful%201st%20Build!">post a note to the dev list</a> for some well-earned congratulations!</p>
 <h2 id="orienting-yourself">Orienting Yourself</h2>
 <p>A few suggestions to help you find your way around this massive codebase:</p>
 <ul>
@@ -149,8 +147,7 @@ much the same.</p>
 assign yourself existing ones.</p>
 <p>Many tasks are classified in the "difficulty" field.  The ones classified as "easy" or "simple" (one level harder than "easy") are good ones to start with.   You can find these with the
 <a href="https://issues.apache.org/ooo/buglist.cgi?f1=cf_fix_difficulty&amp;o1=equals&amp;resolution=---&amp;query_format=advanced&amp;v1=easy&amp;list_id=42478">easy-hacks</a> and <a href="https://issues.apache.org/ooo/buglist.cgi?f1=cf_fix_difficulty&amp;o1=equals&amp;resolution=---&amp;query_format=advanced&amp;v1=simple&amp;list_id=42478">simple-hacks</a> queries.</p>
-<p>Once you pick a bug and assign it to yourself, you might want to post a note to the dev list, letting us know.  We might have some helpful hints to get you started.<br />
-</p>
+<p>Once you pick a bug and assign it to yourself, you might want to post a note to the dev list, letting us know.  We might have some helpful hints to get you started.  </p>
 <h2 id="coding-standards">Coding Standards</h2>
 <p>For reference note the following coding standards for the project:</p>
 <ul>
@@ -176,7 +173,7 @@ a lot of information, some of it up-to-d
 </ul>
 <h2 id="module-completion">Module Completion</h2>
 <p>Once you have completed this module, go to our our <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers">Directory of Volunteers</a> wiki page and add or update 
-your information.  Congratulations!  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed Introduction to Development">dev@openoffice.apache.org</a> so we know.</p>
+your information.  Congratulations!  Please send a note to <a href="mailto:dev@openoffice.apache.org?subject=Completed%20Introduction%20to%20Development">dev@openoffice.apache.org</a> so we know.</p>
   </div>
 
   <div id="footera">

Modified: websites/staging/openoffice/trunk/content/orientation/intro-doc.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-doc.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-doc.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -104,9 +103,8 @@
 <p>To complete this module, read through the material on this page, including the linked references.  There will also
 be some start-up tasks for you to perform, such as signing up for an account in our wiki.</p>
 <p>Your first task is to subscribe to our Documentation mailing list. You can subscribe by sending an email to 
-<a href="mailto:doc-subscribe@openoffice.apache.org">doc-subscribe@openoffice.apache.org</a>.<br />
-</p>
-<p>Then you can introduce yourself by <a href="mailto:doc@openoffice.apache.org?subject=New Doc Volunteer">sending an email to the list</a>.
+<a href="mailto:doc-subscribe@openoffice.apache.org">doc-subscribe@openoffice.apache.org</a>.  </p>
+<p>Then you can introduce yourself by <a href="mailto:doc@openoffice.apache.org?subject=New%20Doc%20Volunteer">sending an email to the list</a>.
 We'd love to hear who you are, where you are from, what your background is, etc.   Also as you work through the 
 items on this page, if you have questions or problems, please feel free to ask for help by sending a note to 
 this same list.</p>
@@ -164,19 +162,17 @@ language errors.  So you don't need to h
 <h2 id="getting-started">Getting Started</h2>
 <p>The Documentation Team is the easiest one to get started with.  There are just a few basic steps:</p>
 <ol>
-<li>Subscribe to our Documentation mailing list by sending an email to <a href="mailto:doc-subscribe@openoffice.apache.org">doc-subscribe@openoffice.apache.org</a>.<br />
-</li>
+<li>Subscribe to our Documentation mailing list by sending an email to <a href="mailto:doc-subscribe@openoffice.apache.org">doc-subscribe@openoffice.apache.org</a>.  </li>
 <li>Sign up for an account on <a href="http://wiki.openoffice.org/wiki/Main_Page">our MWiki</a></li>
 <li>Sign up for an account on <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Wiki+Home">our CWiki</a> (Why do we have two wikis?  It is a long story...)</li>
 <li>Add your name to our <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers">Directory of Volunteers</a> and 
 <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Documentation+Volunteers">Documentation Volunteers</a> pages.</li>
-<li>Send an email to the <a href="mailto:doc@openoffice.apache.org?subject=New Doc Volunteer">Documentation mailing list</a> and introduce yourself.<br />
-</li>
+<li>Send an email to the <a href="mailto:doc@openoffice.apache.org?subject=New%20Doc%20Volunteer">Documentation mailing list</a> and introduce yourself.  </li>
 </ol>
 <p>We can then bring you up to speed on what we're currently working on.</p>
 <h2 id="module-completion">Module Completion</h2>
 <p>Once you have completed this module, go to our our <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Directory+of+Volunteers">Directory of Volunteers</a> wiki page and add or update 
-your information.  Congratulations!  Please send a note to <a href="mailto:doc@openoffice.apache.org?subject=Completed Introduction to Documentation">doc@openoffice.apache.org</a> so we know.</p>
+your information.  Congratulations!  Please send a note to <a href="mailto:doc@openoffice.apache.org?subject=Completed%20Introduction%20to%20Documentation">doc@openoffice.apache.org</a> so we know.</p>
   </div>
 
   <div id="footera">

Modified: websites/staging/openoffice/trunk/content/orientation/intro-l10n.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-l10n.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-l10n.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -101,10 +100,10 @@
     <h1 class="title">Introduction to Localization
</h1>
     <ol>
 <li>
-<p>Please send an email to <a href="mailto:L10N@openoffice.apache.org?subject=Starting Introduction to Localization">L10N@openoffice.apache.org</a> to let us know you are working on this module.</p>
+<p>Please send an email to <a href="mailto:L10N@openoffice.apache.org?subject=Starting%20Introduction%20to%20Localization">L10N@openoffice.apache.org</a> to let us know you are working on this module.</p>
 </li>
 <li>
-<p>Congratulations!  You have completed this Level.  Please send a note to <a href="mailto:L10N@openoffice.apache.org?subject=Completed Introduction to Localization">L10N@openoffice.apache.org</a> so 
+<p>Congratulations!  You have completed this Level.  Please send a note to <a href="mailto:L10N@openoffice.apache.org?subject=Completed%20Introduction%20to%20Localization">L10N@openoffice.apache.org</a> so 
 we all know you have completed this level.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
 </li>
 </ol>

Modified: websites/staging/openoffice/trunk/content/orientation/intro-marketing.html
==============================================================================
--- websites/staging/openoffice/trunk/content/orientation/intro-marketing.html (original)
+++ websites/staging/openoffice/trunk/content/orientation/intro-marketing.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -103,10 +102,9 @@
 You will learn about many of the ways in which we can do marketing, as well as some of the constraints we must 
 keep in mind as an non-profit organization.  After completion of this module you should be prepared to jump in and
 assist with ongoing marketing activities.</p>
-<p>To complete this module you should read the following material, along with associated links.<br />
-</p>
+<p>To complete this module you should read the following material, along with associated links.  </p>
 <p>But first, please subscribe to our <a href="http://openoffice.apache.org/mailing-lists.html#marketing-mailing-list">Marketing Mailing List</a>, 
-and then <a href="mailto:marketing@openoffice.apache.org?subject=Starting Intro to Marketing Module">send a note</a> to introduce yourself.</p>
+and then <a href="mailto:marketing@openoffice.apache.org?subject=Starting%20Intro%20to%20Marketing%20Module">send a note</a> to introduce yourself.</p>
 <p>Note:  You may also want to review the <a href="http://openoffice.apache.org/orientation/index.html">Level 1 and Level 2 Orientation Modules</a> which
 give an overview of the project as a whole, and a perspective on working on open source at Apache.</p>
 <h2 id="what-is-marketing">What is Marketing?</h2>
@@ -127,15 +125,13 @@ Read more <a href="http://mail-archives.
 <li>OpenOffice is one of the best known open source brands, up there with Linux, Android and Firefox.  Your 
 contributions to our marketing efforts will potentially be seen by millions of users.</li>
 <li>We're a fun, international group of volunteers, with a range of skills and experience, dedicated to free software and spreading the word about OpenOffice.</li>
-<li>This is a good way to learn about marketing, or one if its sub-disciplines, and gain practical experience.<br />
-</li>
+<li>This is a good way to learn about marketing, or one if its sub-disciplines, and gain practical experience.  </li>
 <li>Helping with marketing is a good way to "give back" to the open source community, something that can be done without requiring special technical skills.</li>
 <li>We have tasks for volunteers with a range of experience levels and interests.  From copy writing to event planning to graphic design,
 we need volunteers in many creative and business-oriented disciplines.</li>
 </ul>
 <h2 id="marketing-activities">Marketing Activities</h2>
-<p>Marketing activities within the Apache OpenOffice project include:  <br />
-</p>
+<p>Marketing activities within the Apache OpenOffice project include:    </p>
 <ul>
 <li>Planning and participating at local and international conferences, giving presentations or staffing booths 
 and answering questions about Apache OpenOffice and the project</li>
@@ -200,7 +196,7 @@ decides another product serves them bett
 <li>Marketing != Competing against</li>
 </ul>
 <h2 id="end-of-module">End of Module</h2>
-<p>Congratulations!  You have completed this Module.  Please send a note to <a href="mailto:marketing@openoffice.apache.org?subject=Completed Marketing Module">marketing@openoffice.apache.org</a> so 
+<p>Congratulations!  You have completed this Module.  Please send a note to <a href="mailto:marketing@openoffice.apache.org?subject=Completed%20Marketing%20Module">marketing@openoffice.apache.org</a> so 
 we all know you have completed this level.   This is also a good opportunity to send along any feedback or questions you might have on this Orientation Module.</p>
   </div>
 

Modified: websites/staging/openoffice/trunk/content/people.html
==============================================================================
--- websites/staging/openoffice/trunk/content/people.html (original)
+++ websites/staging/openoffice/trunk/content/people.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/pmc-faqs.html
==============================================================================
--- websites/staging/openoffice/trunk/content/pmc-faqs.html (original)
+++ websites/staging/openoffice/trunk/content/pmc-faqs.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -297,8 +296,7 @@ instructed.</p>
     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>
+    more accomplished as a committer.  </p>
 </li>
 <li>
 <p>Being a committer also grants access to some non-public resources and mailing

Modified: websites/staging/openoffice/trunk/content/privacy.html
==============================================================================
--- websites/staging/openoffice/trunk/content/privacy.html (original)
+++ websites/staging/openoffice/trunk/content/privacy.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/pt-br/index.html
==============================================================================
--- websites/staging/openoffice/trunk/content/pt-br/index.html (original)
+++ websites/staging/openoffice/trunk/content/pt-br/index.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/pt-br/participe.html
==============================================================================
--- websites/staging/openoffice/trunk/content/pt-br/participe.html (original)
+++ websites/staging/openoffice/trunk/content/pt-br/participe.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/qa.html
==============================================================================
--- websites/staging/openoffice/trunk/content/qa.html (original)
+++ websites/staging/openoffice/trunk/content/qa.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/release-process.html
==============================================================================
--- websites/staging/openoffice/trunk/content/release-process.html (original)
+++ websites/staging/openoffice/trunk/content/release-process.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -103,9 +102,8 @@
 <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>
+<p>Increase the default Java heap available to Maven (required for Java SE 6)  </p>
+<div class="codehilite"><pre><span class="n">export</span> <span class="n">MAVEN_OPTS</span><span class="p">=</span>&quot;<span class="o">-</span><span class="n">Xmx1024m</span> <span class="o">-</span><span class="n">XX</span><span class="p">:</span><span class="n">MaxPermSize</span><span class="p">=</span>256<span class="n">m</span>&quot;
 </pre></div>
 
 
@@ -116,8 +114,7 @@
 </ol>
 </li>
 <li>
-<p>Prepare the source for release:   <br />
-</p>
+<p>Prepare the source for release:     </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>
@@ -130,8 +127,7 @@
 </ol>
 </li>
 <li>
-<p>Checkout a clean copy of the trunk to release using command line svn. <br />
-</p>
+<p>Checkout a clean copy of the trunk to release using command line svn.   </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>
@@ -140,9 +136,8 @@
 <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>
+<p>Do a dry run of the release:prepare step:  </p>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="n">release</span><span class="p">:</span><span class="n">prepare</span> <span class="o">-</span><span class="n">DdryRun</span><span class="p">=</span><span class="n">true</span>
 </pre></div>
 
 
@@ -152,8 +147,7 @@
       * 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>
+      * GPG Passprhase  </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>
@@ -161,11 +155,10 @@
 <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>
+<p>If other formatting changes have been made you should review the changes and then commit them -   </p>
+<div class="codehilite"><pre>$ <span class="n">svn</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> &quot;<span class="n">fixing</span> <span class="n">formatting</span> <span class="k">for</span> <span class="n">release</span>&quot;
+3<span class="p">.</span> <span class="n">Check</span> <span class="n">release</span><span class="p">.</span><span class="k">properties</span> <span class="n">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="k">properties</span> <span class="n">have</span> <span class="n">the</span> <span class="n">right</span> <span class="n">version</span><span class="p">.</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="n">not</span> <span class="n">the</span> <span class="n">next</span> <span class="n">version</span><span class="p">.</span>
+4<span class="p">.</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="p">:</span><span class="o">//</span><span class="n">incubator</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">rave</span><span class="o">/</span><span class="n">release</span><span class="o">-</span><span class="n">process</span><span class="p">.</span><span class="n">html</span>#<span class="n">verify_signatures</span><span class="p">))</span>
 </pre></div>
 
 
@@ -173,9 +166,8 @@
 </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>
+<p>Once any failures or required updates have been committed to svn, rollback the release prepare files:  </p>
+<div class="codehilite"><pre>$ <span class="n">mvn</span> <span class="o">-</span><span class="n">Papache</span><span class="o">-</span><span class="n">release</span> <span class="n">release</span><span class="p">:</span><span class="n">rollback</span>
 </pre></div>
 
 
@@ -185,7 +177,7 @@
 </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>
+<div class="codehilite"><pre>  $ <span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">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="p">=</span>&quot;<span class="n">clean</span> <span class="n">install</span> <span class="n">cargo</span><span class="p">:</span><span class="n">package</span>&quot;
 </pre></div>
 
 
@@ -198,10 +190,10 @@
 </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>
+<div class="codehilite"><pre>    $ <span class="n">mvn</span> <span class="n">release</span><span class="p">:</span><span class="n">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="p">.</span><span class="n">name</span><span class="p">=</span><span class="o">&lt;</span><span class="n">your_apache_uid</span><span class="o">&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</sp
 an> <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>
+<span class="o">*</span><span class="n">If</span> <span class="n">your</span> <span class="n">local</span> <span class="n">OS</span> <span class="n">userid</span> <span class="n">doesn</span><span class="o">&#39;</span><span class="n">t</span> <span class="n">match</span> <span class="n">your</span> <span class="n">Apache</span> <span class="n">userid</span><span class="p">,</span> <span class="n">then</span> <span class="n">you</span><span class="o">&#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="p">.</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="n">not</span> <span class="k">for</span> <span class="n">Mac</span> <span class="n">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> &quot;<span class="n">deploy</span> <span class="n">site</span> <span class="n">site</span><span class="p">:</span><span class="n">deploy</span>&quot; <span class="n">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="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">.*</span>
 </pre></div>
 
 
@@ -281,8 +273,7 @@
   $ 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>
+  $ wget https://repository.apache.org/content/repositories/releases/org/apache/rave/rave-parent/${project.version}/rave-parent-${project.version}-source-release.zip.sha1    </p>
 </li>
 </ol>
 <p><strong>Make sure all the copied files have g+rw set and only o+r set</strong></p>

Modified: websites/staging/openoffice/trunk/content/security.html
==============================================================================
--- websites/staging/openoffice/trunk/content/security.html (original)
+++ websites/staging/openoffice/trunk/content/security.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>

Modified: websites/staging/openoffice/trunk/content/social.html
==============================================================================
--- websites/staging/openoffice/trunk/content/social.html (original)
+++ websites/staging/openoffice/trunk/content/social.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -107,8 +106,7 @@ PMC use this accounts to inform and enga
 <h2 id="identica">Identi.ca</h2>
 <p>We can be found <a href="http://identi.ca/apacheoo">here</a> on identi.ca</p>
 <h2 id="twitter">Twitter</h2>
-<p>Follow us <a href="https://twitter.com/#!/apacheoo">@ApacheOO</a><br />
-</p>
+<p>Follow us <a href="https://twitter.com/#!/apacheoo">@ApacheOO</a>  </p>
 <h2 id="hashtags">Hashtags</h2>
 <p>Recommended hashtags for Twitter and Identi.ca are:  #aoo #apacheoo</p>
 <h2 id="facebook">Facebook</h2>

Modified: websites/staging/openoffice/trunk/content/students.html
==============================================================================
--- websites/staging/openoffice/trunk/content/students.html (original)
+++ websites/staging/openoffice/trunk/content/students.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -117,8 +116,7 @@ context.  The following points will help
 </li>
 <li>
 <p>Be patient and don't be deterred if your initial notes are not responded to immediately.  We're a community of volunteers, spread through
-  many time zones.  Many of us have "day jobs" or otherwise work on OpenOffice only part time.<br />
-</p>
+  many time zones.  Many of us have "day jobs" or otherwise work on OpenOffice only part time.  </p>
 </li>
 <li>
 <p>In general, it takes longer to become productive with the programming side of OpenOffice than with the QA, translation or marketing areas.

Modified: websites/staging/openoffice/trunk/content/style-test.html
==============================================================================
--- websites/staging/openoffice/trunk/content/style-test.html (original)
+++ websites/staging/openoffice/trunk/content/style-test.html Mon Jul 22 21:53:03 2013
@@ -85,8 +85,7 @@
 <h1 id="project-management-pmc">Project Management PMC</h1>
 <ul>
 <li><a href="http://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a><br />
-</li>
+<li><a href="/pmc-faqs.html">PMC FAQs</a>  </li>
 </ul>
 <h1 id="the-apache-software-foundation">The Apache Software Foundation</h1>
 <ul>
@@ -122,9 +121,9 @@ Vestibulum enim wisi, viverra nec, fring
 <p>Here is a horizontal rule</p>
 <hr />
 <div class="codehilite"><pre>    <span class="n">This</span> <span class="n">is</span> <span class="n">a</span> <span class="n">code</span> <span class="n">block</span>
-    <span class="nb">int</span> <span class="n">x</span> <span class="o">=</span> <span class="mi">3</span><span class="p">;</span>
+    <span class="n">int</span> <span class="n">x</span> <span class="p">=</span> 3<span class="p">;</span>
     <span class="n">x</span><span class="o">++</span><span class="p">;</span>
-    <span class="nb">printf</span><span class="p">(</span><span class="s">&quot;%d&quot;</span><span class="p">,</span><span class="n">x</span><span class="p">);</span>
+    <span class="n">printf</span><span class="p">(</span>&quot;<span class="c">%d&quot;,x);</span>
 </pre></div>