From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 5 Sep 2008 04:39:05 +0000 (-0400)
Subject: Merge commit 'web/master'
X-Git-Tag: monkeysphere_0.15-1~16^2~3
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=2debdd8e5b4550c78cc99df7e887288d73b5e294;hp=eeaa6fa40c74b674602562701b423bd244f2691f;p=monkeysphere.git

Merge commit 'web/master'
---

diff --git a/doc/george/changelog b/doc/george/changelog
index e570270..cd9aa90 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -18,6 +18,7 @@
 	  make sure they're well-connected to george's web of trust, and
 	  then add their User ID to
 	  ~monkey/.monkeysphere/authorized_user_ids
+	* more mime types for mathopd: image/png image/x-icon
 	
 2008-09-03 - micah
 	* migrated /home/*/.config/monkeysphere/authorized_user_ids to new
diff --git a/website/local.css b/website/local.css
index 69defae..cb966f8 100644
--- a/website/local.css
+++ b/website/local.css
@@ -61,12 +61,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 { 
diff --git a/website/sidebar.mdwn b/website/sidebar.mdwn
index 33ab8ce..bc5dc69 100644
--- a/website/sidebar.mdwn
+++ b/website/sidebar.mdwn
@@ -3,11 +3,11 @@
 <a class="logo" href="/"><img class="logo" src="/logo.png" alt="monkeysphere" width="343" height="85" /></a>
 </td><td>
 
-[[WHY?|why]]
-[[DOWNLOAD|download]]
-[[DOCUMENTATION|doc]] 
-[[NEWS|news]]
-[[COMMUNITY|community]]
-[[BUGS|bugs]]
+[[Why?|why]]
+[[Download|download]]
+[[Documentation|doc]] 
+[[News|news]]
+[[Community|community]]
+[[Bugs|bugs]]
 
 </td></tr></tbody></table>
diff --git a/website/trust-models.mdwn b/website/trust-models.mdwn
index 8fee5cb..789e3a3 100644
--- a/website/trust-models.mdwn
+++ b/website/trust-models.mdwn
@@ -6,11 +6,11 @@ Monkeysphere relies on GPG's definition of the OpenPGP web of trust,
 so it's important to understand how GPG calculates User ID validity
 for a key.
 
-The basic question asked is: For a given User ID on a specific key,
-given some set of valid certifications (signatures), and some explicit
-statements about whose certifications you think are trustworthy
-(ownertrust), should we consider this User ID to be legitimately
-attached to this key (a "valid" User ID)?
+The basic question that a trust model tries to answer is: For a given
+User ID on a specific key, given some set of valid certifications
+(signatures), and some explicit statements about whose certifications
+you think are trustworthy (ownertrust), should we consider this User
+ID to be legitimately attached to this key (a "valid" User ID)?
 
 It's worth noting that there are two integral parts in this
 calculation: