You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by bu...@apache.org on 2011/06/15 23:35:24 UTC
svn commit: r791021 - in /websites/staging/rave/trunk/content/rave:
release-process.html release-setup.html
Author: buildbot
Date: Wed Jun 15 21:35:24 2011
New Revision: 791021
Log:
Staging update by buildbot
Modified:
websites/staging/rave/trunk/content/rave/release-process.html
websites/staging/rave/trunk/content/rave/release-setup.html
Modified: websites/staging/rave/trunk/content/rave/release-process.html
==============================================================================
--- websites/staging/rave/trunk/content/rave/release-process.html (original)
+++ websites/staging/rave/trunk/content/rave/release-process.html Wed Jun 15 21:35:24 2011
@@ -20,7 +20,7 @@
-->
<link rel="shortcut icon" href="/rave/images/RAVE-icon.ico" type="image/x-icon" />
<link href="/rave/css/rave.css" rel="stylesheet" type="text/css">
- <title></title>
+ <title>Release Process</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
@@ -63,31 +63,17 @@
</div>
<div id="content">
- <h1 class="title"></h1>
- <p>Title:Release Process
-Notice: Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.</p>
-<h3 id="incubator_release_steps">Incubator Release Steps</h3>
+ <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>
-<p><code>export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m"</code></p>
+<div class="codehilite"><pre><span class="n">export</span> <span class="n">MAVEN_OPTS</span><span class="o">=</span><span class="s">"-Xmx1024m -XX:MaxPermSize=256m"</span>
+</pre></div>
+
+
</li>
<li>
<p>Use the latest Sun 1.6.0 JDK</p>
@@ -97,11 +83,12 @@ Notice: Licensed to the Apache Softwa
<p>Make sure the <a href="release-setup.html">Release Setup</a> steps have been performed.</p>
</li>
<li>
-<p>Prepare the source for release:</p>
+<p>Prepare the source for release:<br />
+</p>
</li>
<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 CHANGES.txt based on the Text release reports from JIRA.</li>
+<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>
@@ -110,7 +97,7 @@ Notice: Licensed to the Apache Softwa
<p>Stage any Roadmap or Release landing pages on the site.</p>
</li>
<li>
-<p>Checkout a clean copy of the trunk/branch to release using command line svn. <br />
+<p>Checkout a clean copy of the trunk to release using command line svn. <br />
</p>
</li>
</ol>
@@ -123,11 +110,11 @@ Notice: Licensed to the Apache Softwa
* SCM release tag - <em>DO NOT TAKE THE DEFAULT</em> -: : 0.1-incubating
* New development version - take the default
* GPG Passprhase</p>
-<p><code>$ mvn -Papache-release release:prepare -DdryRun=true</code></p>
-<div class="codehilite"><pre><span class="o">*</span><span class="n">If</span> <span class="n">you</span> <span class="n">cancel</span> <span class="n">a</span> <span class="n">release:prepare</span> <span class="n">before</span> <span class="n">it</span> <span class="n">updates</span> <span class="n">the</span> <span class="n">pom</span><span class="o">.</span><span class="n">xml</span> <span class="n">versions</span><span class="p">,</span> <span class="k">then</span> <span class="k">use</span> <span class="n">the</span> <span class="n">release:clean</span> <span class="n">goal</span> <span class="n">to</span> <span class="n">just</span> <span class="n">remove</span> <span class="n">the</span> <span class="n">extra</span> <span class="n">files</span> <span class="n">that</span> <span class="n">were</span> <span class="n">created</span><span class="o">.*</span>
+<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>
+<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>
<ol>
@@ -135,7 +122,7 @@ Notice: Licensed to the Apache Softwa
<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="sb">`$ svn commit -m "fixing formatting for release"`</span>
+<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">"fixing formatting for release"</span>
</pre></div>
@@ -144,21 +131,24 @@ Notice: Licensed to the Apache Softwa
<p>Verify that the release process completed as expected</p>
<ol>
<li>Check release.properties and make sure that the scm properties have the right version. Sometimes the scm location can be the previous version not the next version.</li>
-<li>verify signatures (<a href="http://incubator.apache.org/bval/cwiki/release-process.html#ReleaseProcess-Verifyingreleasesignatures">Verifying release signatures</a>)</li>
+<li>verify signatures (<a href="http://incubator.apache.org/rave/cwiki/release-process.html#ReleaseProcess-Verifyingreleasesignatures">Verifying release signatures</a>)</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>
-</ol>
-<p><code>$ mvn -Papache-release release:rollback</code></p>
-<ol>
-<li>Prepare the release</li>
<li>
<p>Run the "release:prepare" step for real this time. You'll be prompted for the same version information.</p>
<p><em>Different arguments and steps are required as there are problems with the maven-jar-plugin and maven-release-plugin when using the test-jar goal. See http://jira.codehaus.org/browse/MJAR-68 and http://jira.codehaus.org/browse/MRELEASE-285.</em></p>
-<p><code>$ mvn release:prepare -Papache-release -DskipTests=true -DpreparationGoals="clean install cargo:package"</code></p>
+<p>$ mvn release:prepare -Papache-release -DpreparationGoals="clean install cargo:package"</p>
</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>
@@ -168,10 +158,10 @@ Notice: Licensed to the Apache Softwa
</li>
</ol>
<p>This step will create a maven staging repository and site for use in testing and voting. </p>
-<p><code>$ mvn release:perform -Papache-release -Duser.name=<your_apache_uid></code></p>
-<div class="codehilite"><pre><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">'t match your Apache userid, then you'</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>
+<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"><your_apache_uid></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">"deploy site site:deploy"</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="nb">local</span> <span class="n">OS</span> <span class="n">userid</span> <span class="n">doesn</span><span class="s">'t match your Apache userid, then you'</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">"deploy site site:deploy"</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>
@@ -181,19 +171,19 @@ Notice: Licensed to the Apache Softwa
<li>Verify the staged artifacts in the nexus repo <br />
1. https://repository.apache.org/index.html
2. Enterprise --> Staging
- 3. Staging tab --> Name column --> org.apache.bval
+ 3. Staging tab --> Name column --> 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 --> Staging</li>
-<li>Staging tab --> Name column --> org.apache.bval</li>
-<li>Right click on the open staging repo (org.apache.bval-XXX) and select Close.</li>
+<li>Staging tab --> Name column --> 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 bval-dev@ to record votes as replies, like <a href="release-vote.txt">this</a></li>
-<li>Create a DISCUSS email thread on bval-dev@ for any vote questions, <a href="release-discuss.txt">this</a></li>
+<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>
@@ -238,20 +228,20 @@ Notice: Licensed to the Apache Softwa
<ol>
<li>https://repository.apache.org/index.html</li>
<li>Enterprise --> Staging</li>
-<li>Staging tab --> Name column --> org.apache.bval</li>
-<li>Right click on the closed staging repo (org.apache.bval-XXX) and select Promote.</li>
+<li>Staging tab --> Name column --> 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>Copy the distribution artifacts over to the distribution area</li>
</ol>
<p>$ ssh ${user.name}@people.apache.org<br />
- $ mkdir /www/www.apache.org/dist/incubator/bval/${project.version} <br />
- $ cd /www/www.apache.org/dist/incubator/bval/${project.version} <br />
- $ wget https://repository.apache.org/content/repositories/releases/org/apache/bval/bval-parent/${project.version}/bval-parent-${project.version}-source-release.zip <br />
- $ wget https://repository.apache.org/content/repositories/releases/org/apache/bval/bval-parent/${project.version}/bval-parent-${project.version}-source-release.zip.asc <br />
- $ wget https://repository.apache.org/content/repositories/releases/org/apache/bval/bval-parent/${project.version}/bval-parent-${project.version}-source-release.zip.md5 <br />
- $ wget https://repository.apache.org/content/repositories/releases/org/apache/bval/bval-parent/${project.version}/bval-parent-${project.version}-source-release.zip.sha1 <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>
<p><strong>Make sure all the copied files have g+rw set and only o+r set</strong></p>
<p>$ find . -user ${user.name} -type f | xargs chmod 664
@@ -266,8 +256,8 @@ Notice: Licensed to the Apache Softwa
</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 BeanValidation wiki.</li>
-<li>Make an announcement about the release on the bval-users@incubator.apache.org, bval-dev@incubator.apache.org, general@incubator.apache.org, and announce@apache.org list as per the Apache Announcement Mailing Lists page)</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>
@@ -289,15 +279,15 @@ Notice: Licensed to the Apache Softwa
</li>
<li>
<p>Delete the svn tag created by the release:perform step -</p>
-<p>$ svn del https://svn.apache.org/repos/asf/incubator/bval/tags/0.1-incubating -m "deleting tag from rolled back release"</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 --> Staging</li>
-<li>Staging tab --> Name column --> org.apache.bval</li>
-<li>Right click on the closed staging repo (org.apache.bval-XXX) and select Drop.</li>
+<li>Staging tab --> Name column --> org.apache.rave</li>
+<li>Right click on the closed staging repo (org.apache.rave-XXX) and select Drop.</li>
</ol>
</li>
<li>
Modified: websites/staging/rave/trunk/content/rave/release-setup.html
==============================================================================
--- websites/staging/rave/trunk/content/rave/release-setup.html (original)
+++ websites/staging/rave/trunk/content/rave/release-setup.html Wed Jun 15 21:35:24 2011
@@ -20,7 +20,7 @@
-->
<link rel="shortcut icon" href="/rave/images/RAVE-icon.ico" type="image/x-icon" />
<link href="/rave/css/rave.css" rel="stylesheet" type="text/css">
- <title></title>
+ <title>Release Setup</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
@@ -63,25 +63,8 @@
</div>
<div id="content">
- <h1 class="title"></h1>
- <p>Title:Release Guide
-Notice: Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-These setup steps only need to be performed on a particular machine once.</p>
+ <h1 class="title">Release Setup</h1>
+ <p>These setup steps only need to be performed on a particular machine once.</p>
<p><em>Developers using Linux workstations can skip over the references to Cygwin. If using Windows, install cygwin, including Utils/gnupg and Net/openssh packages.</em></p>
<h4 id="create_and_install_a_ssh_key">Create and install a SSH key</h4>
<ol>
@@ -89,38 +72,39 @@ These setup steps only need to be perfor
<li>Use ssh-keygen to create an SSH key.</li>
</ol>
<p><em>Follow the latest steps and guides on the <a href="http://www.apache.org/dev/openpgp.html#generate-key">ASF website</a> as you should <strong>NOT</strong> be using SHA1 and new keys <strong>MUST</strong> be at least 4096 bits.</em></p>
-<div class="codehilite"><pre><span class="sb">`$ ssh-keygen -t rsa -b 4096`</span>
+<div class="codehilite"><pre> <span class="nv">$</span> <span class="nv">ssh</span><span class="o">-</span><span class="n">keygen</span> <span class="o">-</span><span class="n">t</span> <span class="n">rsa</span> <span class="o">-</span><span class="n">b</span> <span class="mi">4096</span>
</pre></div>
<p>Program defaults should be fine. No passphrase is required for the ssh key generation. The keys will be saved in ~/.ssh/id_dsa (private) and ~/.ssh/id_dsa.pub (public).</p>
<p><em>See <a href="http://www.networknewz.com/networknewz-10-20030707AuthenticatingbyPublicKeyOpenSSH.html">Authenticating By Public Key (OpenSSH)</a> for a good description on why and how to perform this task.</em></p>
<ol>
-<li>SCP your SSH public key ~/.ssh/id_dsa.pub created in last step to ~/id_dsa.pub on people.apache.org.<br />
+<li>
+<p>SCP your SSH public key ~/.ssh/id_dsa.pub created in last step to ~/id_dsa.pub on people.apache.org.<br />
+</p>
+<p>$ cd ~/.ssh<br />
+ $ scp id_dsa.pub <your userid>@people.apache.org:id_dsa.pub<br />
+ $ You will be prompted for your password.</p>
+</li>
+<li>
+<p>Use ssh to login to people.apache.org</p>
+<p>$ cd ~ <br />
+ $ ssh <your userid>@people.apache.org<br />
+</p>
</li>
</ol>
-<p><code>$ cd ~/.ssh
- $ scp id_dsa.pub <your userid>@people.apache.org:id_dsa.pub
- $ You will be prompted for your password.</code>
-4. Use ssh to login to people.apache.org</p>
-<div class="codehilite"><pre><span class="sb">`$ cd ~ </span>
-<span class="sb">$ ssh <your userid>@people.apache.org </span>
-<span class="sb">`</span>
-</pre></div>
-
-
<p>At this point, you will still be prompted for your password.</p>
<ol>
<li>
<p>Create a ~/.ssh folder in your home directory on people.apache.org and change its file mode to 700.</p>
-<p><code>$ mkdir ~/.ssh
-$ chmod 700 ~/.ssh</code></p>
+<p>$ mkdir ~/.ssh<br />
+ $ chmod 700 ~/.ssh<br />
+</p>
</li>
<li>
<p>Move or append ~/id_dsa.pub to ~/.ssh/authorized_keys and change its file mode to 600.</p>
-<p><code>$ mv ~/id_dsa.pub ~/.ssh/authorized_keys
-$ chmod 600 ~/.ssh/authorized_keys</code> <br />
-</p>
+<p>$ mv ~/id_dsa.pub ~/.ssh/authorized_keys
+ $ chmod 600 ~/.ssh/authorized_keys</p>
<ul>
<li>*Each public key in the authorized_keys spans only one line.</li>
<li>For example: "ssh-dss AAAAB3NzaC1kc3MAAA ..... agBmmfZ9uAbSqA== dsa-key-20071107"</li>
@@ -132,7 +116,7 @@ $ chmod 600 ~/.ssh/authorized_keys</code
</li>
<li>
<p>Start a new ssh session. No login should be required this time due to the private ssh key on your local box matching up with the public ssh key in your home directory (~/.ssh).</p>
-<p><code>$ ssh <your userid>@people.apache.org</code></p>
+<p>$ ssh <your userid>@people.apache.org</p>
<p><em>If you are still prompted for a password, then you have not set up the ssh keys properly. Review the steps above and ensure that all of the steps were followed properly. Or, maybe the instructions are still not quite right and they still need some adjusting. In that case, please update the instructions accordingly.</em></p>
</li>
</ol>
@@ -141,7 +125,7 @@ $ chmod 600 ~/.ssh/authorized_keys</code
<li>Open a shell window. If using Windows, open a cygwin window.</li>
<li>
<p>Generate a key-pair with gpg, using default key kind ("RSA and RSA") and keys size (4096).</p>
-<p><code>$ gpg --gen-key</code></p>
+<p>$ gpg --gen-key</p>
<p>The program's default values should be fine. For the "Real Name" enter your full name (ie. Stan Programmer). For the "e-mail address" enter your apache address (ie. sprogrammer@apache.org). You will also be required to enter a "passphrase" for the GPG key generation. Keep track of this as you will need this for the Release processing.</p>
</li>
<li>
@@ -155,7 +139,7 @@ $ chmod 600 ~/.ssh/authorized_keys</code
</li>
<li>
<p>Add your public key to the <a href="https://svn.apache.org/repos/asf/incubator/rave/KEYS">SVN repository</a>. See the commands describe at the beginning of this KEYS file to perform this task. The gpg key-pair is used to sign the published artifacts for the Rave releases.</p>
-<p><code>$ gpg --list-sigs <Real Name> && gpg --armor -- export <Real Name></code></p>
+<p>$ gpg --list-sigs <Real Name> && gpg --armor -- export <Real Name></p>
<p><em>The <a href="https://svn.apache.org/repos/asf/incubator/rave/KEYS">KEYS</a> file is updated via normal svn commit procedures. The one under w.a.o/dist/ has to be manually updated from svn.</em></p>
</li>
<li>