Merge commit 'dkg/master'

diff --combined website/doc.mdwn
index 6bf319a2a13f70f5de098fb42cee8364aa1456fe,c59119f950f6dd35cd6efd6ba8c6a99433414512..56498e83cbc620a1fbab64e33beeef1aea0dbb86
--- 1/website/doc.mdwn
--- 2/website/doc.mdwn
+++ b/website/doc.mdwn
@@@ -1,7 -1,5 +1,7 @@@
  [[meta title="Documentation"]]
  
 +# Documentation #
 +
  ## Dependencies ##
  
  Monkeysphere relies on:
@@@ -27,3 -25,4 +27,4 @@@
  ## Other ##
  
   * [Similar Projects](/similar) (other attempts at a PKI for SSH)
+  * [Mirroring the website](/mirrors)

diff --combined website/local.css
index 3d00d715abc34f92a68b0b62f14045d4ff26c4a6,f7a20060def5e74b710525dc267ce6824bb8a2c7..29939b89cac8e3e0d5762e0be6d46c23ff3ab2a9
--- 1/website/local.css
--- 2/website/local.css
+++ b/website/local.css
@@@ -1,12 -1,3 +1,12 @@@
 +h1 {
 +  -moz-border-radius: 4px;
 +  background-color: #B67B4E;
 +  color: black;
 +  display: block;
 +  font-weight: bold;
 +  padding: 0 0 0 10px;
 +}
 +
  h2 {
    -moz-border-radius: 4px;
    background-color: #B67B4E;
@@@ -52,6 -43,7 +52,7 @@@ pre 
    border: 1px solid #aaa;
    padding: 3px 3px 3px 3px;
    margin-left: 2em;
+   overflow: auto;
  }
  
  table.sitenav { 
@@@ -70,12 -62,14 +71,14 @@@ table.sitenav img.logo 
  table.sitenav a { 
    font-weight: bold;
    margin-right: 1em;
+   font-variant: small-caps;
  }
  
  table.sitenav span.selflink { 
    font-weight: bold;
    text-decoration: underline;
    margin-right: 1em;
+   font-variant: small-caps;
  }
  
  div.header {