Merge remote branch 'origin/master'

[monkeysphere.git] / website / advanced-user.mdwn

diff --git a/website/advanced-user.mdwn b/website/advanced-user.mdwn
index 138fd486014c722dd83c5a5dd83cf4a53f760938..723b16119453002bb2ba3657a382217549116bc0 100644 (file)
--- a/website/advanced-user.mdwn
+++ b/website/advanced-user.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Advanced usage of the Monkeysphere"]]
+[[!meta title="Advanced usage of the Monkeysphere"]]
 
 Advanced usage of the monkeysphere
 ==================================
@@ -105,19 +105,19 @@ Note: Due to a limitation with gnupg, it is not currently possible to
 limit the domain scope properly, which means that if you fully trust
 an admin, you'll trust all their certifications.
 
-Because the Monkeysphre relies on GPG's definition of the OpenPGP web
-of trust, it is important to understand [how GPG calculates User ID
-validity for a key](/trust-models).
+Because the Monkeysphere currently relies on GPG's definition of the
+OpenPGP web of trust, it is important to understand [how GPG
+calculates User ID validity for a key](/trust-models).
 
 
 Miscellaneous
 -------------
 
 Users can also maintain their own `~/.ssh/authorized_keys` files with
-the Monkeysphere.  This is primarily useful for accounts on hosts that
-are not already systematically using the Monkeysphere for user
-authentication.  If you're not sure whether this is the case for your
-host, ask your system administrator.
+the Monkeysphere directly.  This is primarily useful for accounts on
+hosts that are not already systematically using the Monkeysphere for
+user authentication.  If you're not sure whether this is the case for
+your host, ask your system administrator.
 
 If you want to do this as a regular user, use the
 `update-authorized_keys` command: