some formatting tweaks to the website.

diff --git a/doc/README b/doc/README
index cf8a8d6ee1756c879bc3f269a0bb2705cfd6eddf..544465f27aed9f144c21f52681fa07235acebe09 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -2,15 +2,16 @@ Monkeysphere User README
 ========================
 
 You don't have to be an OpenSSH or OpenPGP expert to use the
-Monkeysphere. However, you should be comfortable using secure shell and
-you should already have GnuPG installed and an OpenPGP key pair before
-you begin.
+Monkeysphere.  However, you should be comfortable using secure shell
+(ssh), and you should already have GnuPG installed and an OpenPGP key
+pair before you begin.
 
 As a regular user on a system where the monkeysphere package is
 installed, you probably want to do a few things:
 
-Keeping your keyring up-to-date
--------------------------------
+
+Keep your keyring up-to-date
+----------------------------
 
 Regularly refresh your GnuPG keyring from the keyservers.  This can be
 done with a simple cronjob.  An example of crontab line to do this is:
@@ -66,6 +67,7 @@ can establish that they are setup correctly.
 The remaining steps will complete the second half: allow servers to
 verify you based on your OpenPGP key.
 
+
 Setting up an OpenPGP authentication key
 ----------------------------------------
 
@@ -82,6 +84,7 @@ gpg --list-secret-keys
 The first line (starting with sec) will include your key length followed
 by the type of key (e.g. 1024D) followed by a slash and then your keyid.
 
+
 Using your OpenPGP authentication key for SSH
 ---------------------------------------------
 
@@ -134,6 +137,7 @@ automatically everytime you login.
 
 FIXME: using the key with a single session?
 
+
 Miscellaneous
 -------------
 

diff --git a/website/bugs.mdwn b/website/bugs.mdwn
index 201cec889de8a0970490f05d5a58114bca0cc80d..33a1dcef0079c8eb08d5b0e652d2954496ca327d 100644 (file)
--- a/website/bugs.mdwn
+++ b/website/bugs.mdwn
@@ -1,6 +1,6 @@
 [[!template id="nav"]]
 
-This is Monkeysphere's bug list. Link bugs to [[bugs/done]] when done.
+This is Monkeysphere's bug list.  You can also browse our [completed bugs](done).
 
 [[inline pages="./bugs/* and !./bugs/done and !link(done) 
 and !*/Discussion" actions=yes postform=yes show=0]]

diff --git a/website/community.mdwn b/website/community.mdwn
index 9335a1b639ec165d5406857698ee0a505a71cf92..78ed9be1a78f1ec7807f5d9a0743210ff491e747 100644 (file)
--- a/website/community.mdwn
+++ b/website/community.mdwn
@@ -1,6 +1,7 @@
-[[meta title="Monkeysphere community"]]
 [[!template id="nav"]]
 
+[[meta title="Monkeysphere community"]]
+
 # Mailing list #
 
 The Monkeysphere project is a new project with just one mailing list
@@ -11,4 +12,4 @@ subjects around the web of trust.
 [Join us](https://lists.riseup.net/www/info/monkeysphere), we're a
 friendly bunch. You can also [look through our
 archives](https://lists.riseup.net/www/arc/monkeysphere) if you don't
-believe me.
+believe us.

diff --git a/website/download.mdwn b/website/download.mdwn
index da9f7638da5e8186e46883951727e8133a59f18b..f3caaf1b033fbea6752c2caa03e98e220bd0794e 100644 (file)
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -46,17 +46,17 @@ any of the developer repositories, including:
 
 The git repo from this web site:
 
-       git clone git://monkeysphere.info/monkeysphere monkeysphere
+       git clone git://monkeysphere.info/monkeysphere
 
-[Jameson Graef Rollins](http://cmrg.fifthhorseman.net/wiki/jrollins):
+[Daniel Kahn Gillmor](http://cmrg.fifthhorseman.net/wiki/dkg):
 
-       git clone git://lair.fifthhorseman.net/~jrollins/monkeysphere monkeysphere
+       git clone git://lair.fifthhorseman.net/~dkg/monkeysphere
 
-[Daniel Kahn Gillmor](http://cmrg.fifthhorseman.net/wiki/dkg):
+[Jameson Graef Rollins](http://cmrg.fifthhorseman.net/wiki/jrollins):
 
-       git clone git://lair.fifthhorseman.net/~dkg/monkeysphere monkeysphere
+       git clone git://lair.fifthhorseman.net/~jrollins/monkeysphere
 
-[Micah Anderson]
+Micah Anderson
        
        git clone git://labs.riseup.net/~micah/monkeysphere
 

diff --git a/website/index.mdwn b/website/index.mdwn
index 21a03f1089233a4574955d32cf792a06527c14ab..5b757fa95376c327a998b31aa1aff639e16f8530 100644 (file)
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -4,9 +4,9 @@ The Monkeysphere project's goal is to extend the web of trust model
 and other features of OpenPGP to other areas of the Internet to help
 us securely identify each other while we work online.
 
-Specifically, monkeysphere is a framework to leverage the OpenPGP
-web of trust for OpenSSH authentication.  In other words, it allows
-you to use your OpenPGP keys when using secure shell to both identify
+Specifically, monkeysphere is a framework to leverage the OpenPGP web
+of trust for OpenSSH authentication.  In other words, it allows you to
+use your OpenPGP keys when using secure shell to both identify
 yourself and the servers you administer or connect to.  OpenPGP keys
 are tracked via GnuPG, and managed in the `known_hosts` and
 `authorized_keys` files used by OpenSSH for connection authentication.

diff --git a/website/templates/nav.mdwn b/website/templates/nav.mdwn
index 47bdfd1476fe5892a7caeb0cba1390880000a3d2..55885ce8f09eb5a70271ff1ca6fb5fa13970de7e 100644 (file)
--- a/website/templates/nav.mdwn
+++ b/website/templates/nav.mdwn
@@ -1 +1 @@
-[why?](/why) | [[download]] | [[documentation|doc]] | [[news]] | [[community]] | [[bugs]]
+[[why?|why]] | [[download]] | [[documentation|doc]] | [[news]] | [[community]] | [[bugs]]