summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-21 17:25:26 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-21 17:25:26 -0500
commitd8d8885602a02f0c8f0c964926c88cabee773b91 (patch)
tree4062182380162408754e25ff39df249b48c04b90
parent97c0b4f9ba18f9e09b430ece4f1b762958238f31 (diff)
parent609154c350df229c288428a6aecc4c8b47bea810 (diff)
Merge commit 'dkg/master'
-rw-r--r--packaging/debian/NEWS2
-rw-r--r--website/getting-started-admin.mdwn3
-rw-r--r--website/getting-started-user.mdwn3
3 files changed, 7 insertions, 1 deletions
diff --git a/packaging/debian/NEWS b/packaging/debian/NEWS
index 3fceea2..8551c87 100644
--- a/packaging/debian/NEWS
+++ b/packaging/debian/NEWS
@@ -6,7 +6,7 @@ monkeysphere (0.23-1) unstable; urgency=low
its functionality has been folded into monkeysphere as a subcommand.
So if you are currently using:
ssh -oProxyCommand='monkeysphere-ssh-proxycommand %h %p'
- plese use instead:
+ please use instead:
ssh -oProxyCommand='monkeysphere ssh-proxycommand %h %p'
* For sysadmins: monkeysphere-server has been split into
monkeysphere-host (for publishing the ssh host key of your machine)
diff --git a/website/getting-started-admin.mdwn b/website/getting-started-admin.mdwn
index ca44956..bff1773 100644
--- a/website/getting-started-admin.mdwn
+++ b/website/getting-started-admin.mdwn
@@ -1,6 +1,9 @@
Monkeysphere Server Administrator README
========================================
+ Note: This documentation is for Monkeysphere version 0.23 or later.
+ If you are running a version prior to 0.23, we recommend that you upgrade.
+
As the administrator of an SSH server, you can take advantage of the
Monkeysphere in two ways:
diff --git a/website/getting-started-user.mdwn b/website/getting-started-user.mdwn
index 9e2be26..96fd54e 100644
--- a/website/getting-started-user.mdwn
+++ b/website/getting-started-user.mdwn
@@ -1,6 +1,9 @@
Monkeysphere User README
========================
+ Note: This documentation is for Monkeysphere version 0.23 or later.
+ If you are running a version prior to 0.23, we recommend that you upgrade.
+
You don't have to be an OpenSSH or OpenPGP expert to use the
Monkeysphere. However, you should be comfortable using secure shell
(ssh), and you should already have an OpenPGP key before you begin.