Merge remote branch 'dkg/master'

[monkeysphere.git] / man / man1 / openpgp2ssh.1

diff --git a/man/man1/openpgp2ssh.1 b/man/man1/openpgp2ssh.1
index 9b0d1a42d0b5a1e3f47488d6f4baa2508d5e723b..304a442577b3f60e3765737b999a8d87688bda8c 100644 (file)
--- a/man/man1/openpgp2ssh.1
+++ b/man/man1/openpgp2ssh.1
@@ -1,5 +1,5 @@
 .\"  -*- nroff -*-
 .\"  -*- nroff -*-

-.Dd $Mdocdate: June 11, 2008 $
+.Dd $Mdocdate: March 1, 2009 $

 .Dt OPENPGP2SSH 1
 .Os
 .Sh NAME
 .Dt OPENPGP2SSH 1
 .Os
 .Sh NAME


@@ -8,9 +8,9 @@ openpgp2ssh
 .Sh SYNOPSIS
 .Nm openpgp2ssh < mykey.gpg 
 .Pp
 .Sh SYNOPSIS
 .Nm openpgp2ssh < mykey.gpg 
 .Pp

-.Nm gpg --export $KEYID | openpgp2ssh $KEYID
+.Nm gpg \-\-export $KEYID | openpgp2ssh $KEYID

 .Pp
 .Pp

-.Nm gpg --export-secret-key $KEYID | openpgp2ssh $KEYID
+.Nm gpg \-\-export\-secret\-key $KEYID | openpgp2ssh $KEYID

 .Sh DESCRIPTION
 .Nm
 takes an OpenPGP-formatted primary key and associated
 .Sh DESCRIPTION
 .Nm
 takes an OpenPGP-formatted primary key and associated


@@ -30,7 +30,7 @@ ID.
 .Pp
 If the input contains an OpenPGP RSA public key, it will be converted
 to the OpenSSH-style single-line keystring, prefixed with the key type
 .Pp
 If the input contains an OpenPGP RSA public key, it will be converted
 to the OpenSSH-style single-line keystring, prefixed with the key type

-(ssh-rsa).  This format is suitable (with minor alterations) for
+(`ssh\-rsa').  This format is suitable (with minor alterations) for

 insertion into known_hosts files and authorized_keys files.
 .Pp
 If the input contains an OpenPGP RSA secret key, it will be converted
 insertion into known_hosts files and authorized_keys files.
 .Pp
 If the input contains an OpenPGP RSA secret key, it will be converted


@@ -52,14 +52,14 @@ other things, that it will happily export revoked keys, unverifiable
 keys, expired keys, etc.  Make sure you do your own key validation
 before using this tool!
 .Sh EXAMPLES
 keys, expired keys, etc.  Make sure you do your own key validation
 before using this tool!
 .Sh EXAMPLES

-.Nm gpg --export-secret-key $KEYID | openpgp2ssh $KEYID | ssh-add -c /dev/stdin
+.Nm gpg \-\-export\-secret\-key $KEYID | openpgp2ssh $KEYID | ssh\-add \-c /dev/stdin

 .Pp
 This pushes the secret key into the active
 .Pp
 This pushes the secret key into the active

-.Xr ssh-agent 1 . 
+.Xr ssh\-agent 1 . 

 Tools such as 
 .Xr ssh 1
 which know how to talk to the 
 Tools such as 
 .Xr ssh 1
 which know how to talk to the 

-.Xr ssh-agent 1
+.Xr ssh\-agent 1

 can now rely on the key.
 .Sh AUTHOR
 .Nm
 can now rely on the key.
 .Sh AUTHOR
 .Nm


@@ -77,7 +77,9 @@ accept ASCII-armored input.
 .Nm
 Currently only exports into formats used by the OpenSSH.
 It should support other key output formats, such as those used by
 .Nm
 Currently only exports into formats used by the OpenSSH.
 It should support other key output formats, such as those used by

-lsh(1) and putty(1).
+.Xr lsh 1
+and
+.Xr putty 1 .

 .Pp
 Secret key output is currently not passphrase-protected.
 .Pp
 .Pp
 Secret key output is currently not passphrase-protected.
 .Pp


@@ -88,4 +90,5 @@ currently cannot handle passphrase-protected secret keys on input.
 .Xr monkeysphere 1 ,
 .Xr monkeysphere 7 ,
 .Xr ssh 1 ,
 .Xr monkeysphere 1 ,
 .Xr monkeysphere 7 ,
 .Xr ssh 1 ,

-.Xr monkeysphere-server 8
+.Xr monkeysphere-authentication 8 ,
+.Xr monkeysphere-host 8