Added navigation for xenhv_keys page and fixed some formatting issues

diff --git a/xen.org/products/xenhyp.html b/xen.org/products/xenhyp.html
index c40305e1b4a328cd7cd3cb32b9a5631158dff8f4..f522ad15afec2711c83376ae3bdbc1319478358a 100644 (file)
--- a/xen.org/products/xenhyp.html
+++ b/xen.org/products/xenhyp.html
@@ -59,6 +59,7 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
                <h3><a href="http://xenbits.xen.org/hg/xen-unstable.hg/">Source Code</a></h3>
                <h3><a href="http://xenbits.xen.org/">Mercurial Repository</a></h3>
                <h3><a href="/products/xen_roadmap.html">Roadmap</a></h3>
+               <h3><a href="/projects/xenhv_devs.html">OpenPGP keys</a></h3>
                <h3><a href="/projects/xenhv_devs.html">Developers</a></h3>
             </div>
        </td>

diff --git a/xen.org/projects/xenhv_devs.html b/xen.org/projects/xenhv_devs.html
index e2f0b59ea37d32c31139715c98bc1331821caa5d..14a98afd1c1b00ac61bcf187eb9adf999c068cb3 100644 (file)
--- a/xen.org/projects/xenhv_devs.html
+++ b/xen.org/projects/xenhv_devs.html
@@ -50,12 +50,17 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
        <tr valign="top">
        <td width="200">
             <div id="leftnavbox">
+               <h3><a href="http://wiki.xen.org/wiki/Xen_Overview">Overview</a></h3>
                <h3><a href="/products/xen_source.html">Download</a></h3>
                <h3><a href="/products/xen_archives.html">Archives</a></h3>
-               <h3><a href="http://lxr.xensource.com/lxr/source">Source Browser</a></h3>
-               <h3><a href="http://xenbits.xen.org/">Mercurial Repository</a></h3>
                <h3><a href="/products/xen_support.html">Support</a></h3>
+               <h3><a href="/community/vendors/XenProjectsPage.html">Xen Projects and Extensions</a></h3>
+               <h3><a href="http://wiki.xen.org">Wiki</a></h3>
+               <hr>
+               <h3><a href="http://xenbits.xen.org/hg/xen-unstable.hg/">Source Code</a></h3>
+               <h3><a href="http://xenbits.xen.org/">Mercurial Repository</a></h3>
                <h3><a href="/products/xen_roadmap.html">Roadmap</a></h3>
+               <h3><a href="/projects/xenhv_devs.html">OpenPGP keys</a></h3>
                <h3><a href="/projects/xenhv_devs.html">Developers</a></h3>
             </div>
        </td>

diff --git a/xen.org/projects/xenhv_keys.html b/xen.org/projects/xenhv_keys.html
index 98615bb7d3234afa4a20627b1071453fb5d5c081..d714d16b5f6f808489dab5b9bd3099c6666dd236 100644 (file)
--- a/xen.org/projects/xenhv_keys.html
+++ b/xen.org/projects/xenhv_keys.html
@@ -50,13 +50,17 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
        <tr valign="top">
        <td width="200">
             <div id="leftnavbox">
+               <h3><a href="http://wiki.xen.org/wiki/Xen_Overview">Overview</a></h3>
                <h3><a href="/products/xen_source.html">Download</a></h3>
                <h3><a href="/products/xen_archives.html">Archives</a></h3>
-               <h3><a href="http://lxr.xensource.com/lxr/source">Source Browser</a></h3>
-               <h3><a href="http://xenbits.xen.org/">Mercurial Repository</a></h3>
                <h3><a href="/products/xen_support.html">Support</a></h3>
+               <h3><a href="/community/vendors/XenProjectsPage.html">Xen Projects and Extensions</a></h3>
+               <h3><a href="http://wiki.xen.org">Wiki</a></h3>
+               <hr>
+               <h3><a href="http://xenbits.xen.org/hg/xen-unstable.hg/">Source Code</a></h3>
+               <h3><a href="http://xenbits.xen.org/">Mercurial Repository</a></h3>
                <h3><a href="/products/xen_roadmap.html">Roadmap</a></h3>
-               <h3><a href="/projects/xenhv_keys.html">Developers</a></h3>
+               <h3><a href="/projects/xenhv_devs.html">OpenPGP keys</a></h3>
                <h3><a href="/projects/xenhv_devs.html">Developers</a></h3>
             </div>
        </td>
@@ -64,47 +68,42 @@ if(ns4)_d.write("<scr"+"ipt type=text/javascript src=/globals/mmenuns4.js><\/scr
        <td>
           <h1>Xen Hypervisor Project: OpenPGP keys</h1>
 
-          The Xen Hypervisor Project uses OpenPGP when necessary to
-          provide essential confidentiality and integrity.
-<p>
-          Our current set of in-use, published, keys are these:
-
-<h2>Xen tree code signing and announcements</h2>
-<pre>
-pub   2048R/57E82BD9 2010-04-06
-      Key fingerprint = 23E3 222C 145F 4475 FA80  60A7 83FE 14C9 57E8 2BD9
-uid                  Xen.org Xen tree code signing (signatures on the xen hypervisor and tools) &lt;pgp@xen.org&gt;
-</pre>
-We use this key to sign git and hg tags on xen-unstable.hg and
-qemu-xen-*.git, whenever we make a Xen release.
-We also use it to sign Xen security advisories from the security team.
-
-<h2>Xen 3.4 code signing key</h2>
-<pre>
-pub   4096R/4A26F09C 2011-09-29
-      Key fingerprint = 7CD5 3BA8 A7A4 A5BD 4A61  FDBE 7B37 6A42 4A26 F09C
-uid                  Keith Coleman <keith.coleman@n2servers.com>
-uid                  Xen.org Xen 3.4 tree code signing (signatures on the xen hypervisor and tools) &lt;keith.coleman@n2servers.com&lt;
-sub   4096R/177F4534 2011-09-29
-</pre>
-We use this key to sign tags on xen-3.4-testing.hg, whenever the
-3.4 maintainer makes a release from the Xen 3.4 maintenance branch.
+          <p>The Xen Hypervisor Project uses OpenPGP when necessary to
+          provide essential confidentiality and integrity.</p>
+          <p>Our current set of in-use, published, keys are these:</p>
 
-<h2>Security team incoming email</h2>
-<pre>
-pub   2048R/82D3A964 2012-05-02
-      Key fingerprint = F1F9 380F 6287 0056 A186  2CC0 743A 3FCA 82D3 A964
-uid                  Xen.org (incoming email) &lt;security@xen.org&gt;
-sub   2048R/46D7BB82 2012-05-02
-</pre>
-If you need to send encrypted email to the Xen.org security team,
-please use this key.  We prefer that routine communications not
-be encrypted.
+         <h2>Xen tree code signing and announcements</h2>
+         <pre>
+         pub   2048R/57E82BD9 2010-04-06
+               Key fingerprint = 23E3 222C 145F 4475 FA80  60A7 83FE 14C9 57E8 2BD9
+         uid                  Xen.org Xen tree code signing (signatures on the xen hypervisor and tools) &lt;pgp@xen.org&gt;
+         </pre>
+         <p>We use this key to sign git and hg tags on xen-unstable.hg and
+         qemu-xen-*.git, whenever we make a Xen release.
+         We also use it to sign Xen security advisories from the security team.</p>
+         
+         <h2>Xen 3.4 code signing key</h2>
+         <pre>
+         pub   4096R/4A26F09C 2011-09-29
+               Key fingerprint = 7CD5 3BA8 A7A4 A5BD 4A61  FDBE 7B37 6A42 4A26 F09C
+         uid                  Keith Coleman <keith.coleman@n2servers.com>
+         uid                  Xen.org Xen 3.4 tree code signing (signatures on the xen hypervisor and tools) &lt;keith.coleman@n2servers.com&lt;
+         sub   4096R/177F4534 2011-09-29
+         </pre>
+         <p>We use this key to sign tags on xen-3.4-testing.hg, whenever the
+         3.4 maintainer makes a release from the Xen 3.4 maintenance branch.</p>
+         
+         <h2>Security team incoming email</h2>
+         <pre>
+         pub   2048R/82D3A964 2012-05-02
+               Key fingerprint = F1F9 380F 6287 0056 A186  2CC0 743A 3FCA 82D3 A964
+         uid                  Xen.org (incoming email) &lt;security@xen.org&gt;
+         sub   2048R/46D7BB82 2012-05-02
+         </pre>
+         <p>If you need to send encrypted email to the Xen.org security team,
+         please use this key.  We prefer that routine communications not
+         be encrypted.</p>
 
-                  <td width="5px"></td>
-          <td valign="top"><img src="/images/blog/UncleSamSmall.png" width="140px" /></td>
-          <td width="15px"></td>
-          </tr></table>
         </table>
     <td>&nbsp;</td>
   </tr>