merged jrollins/master

[monkeysphere.git] / website / getting-started-admin.mdwn

diff --git a/website/getting-started-admin.mdwn b/website/getting-started-admin.mdwn
index 6bdd166b6c84976bbeb36d253d6d99deea48a156..ca44956986827998494591841fc12116de7d1f34 100644 (file)
--- a/website/getting-started-admin.mdwn
+++ b/website/getting-started-admin.mdwn
@@ -22,19 +22,13 @@ To begin, you must first import an ssh host key.  This assumes that
 you have the ssh server installed, and that you have generated a host
 RSA key.  Once that has been done, import the key:
 
 you have the ssh server installed, and that you have generated a host
 RSA key.  Once that has been done, import the key:
 

-       # monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key
+       # monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key server.example.net

 
 This will generate an OpenPGP certificate for the server.  The primary
 user ID for this certificate will be the ssh service URI for the host,
 
 This will generate an OpenPGP certificate for the server.  The primary
 user ID for this certificate will be the ssh service URI for the host,

-which by default is based on the output of `hostname -f`
-(eg. `ssh://server.example.net`).  If the name determined from
-`hostname -f` is not the name you want to have in the service URI,
-then you can provide one manually:
-
-       # monkeysphere-host import-key /etc/ssh/ssh_host_rsa_key host.example.net
-
-The hostname you provide should probably be a fully qualified domain
-name for the host in order for your users to find it.
+(eg. `ssh://server.example.net`).  Remember that the name you provide
+here should probably be a fully qualified domain name for the host in
+order for your users to find it.

 
 Now you can display information about the host key's certificate with
 the 'show-key' command:
 
 Now you can display information about the host key's certificate with
 the 'show-key' command: