1 files changed, 3 insertions, 2 deletions
diff --git a/sshd.8 b/sshd.8
index b0c7ab6bd..b5d614c50 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.270 2013/06/27 14:05:37 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.271 2013/12/06 13:39:49 markus Exp $
-.Dd $Mdocdate: June 27 2013 $
+.Dd $Mdocdate: December 6 2013 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -494,6 +494,7 @@ For protocol version 2 the keytype is
 .Dq ecdsa-sha2-nistp256 ,
 .Dq ecdsa-sha2-nistp384 ,
 .Dq ecdsa-sha2-nistp521 ,
+.Dq ssh-ed25519
 .Dq ssh-dss
 or
 .Dq ssh-rsa .

diff --git a/sshd.8 b/sshd.8 index b0c7ab6bd..b5d614c50 100644 --- a/sshd.8 +++ b/sshd.8
@@ -33,8 +33,8 @@
33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	33	.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	34	.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35	.\"	35	.\"
36	.\" $OpenBSD: sshd.8,v 1.270 2013/06/27 14:05:37 jmc Exp $	36	.\" $OpenBSD: sshd.8,v 1.271 2013/12/06 13:39:49 markus Exp $
37	.Dd $Mdocdate: June 27 2013 $	37	.Dd $Mdocdate: December 6 2013 $
38	.Dt SSHD 8	38	.Dt SSHD 8
39	.Os	39	.Os
40	.Sh NAME	40	.Sh NAME
@@ -494,6 +494,7 @@ For protocol version 2 the keytype is
494	.Dq ecdsa-sha2-nistp256 ,	494	.Dq ecdsa-sha2-nistp256 ,
495	.Dq ecdsa-sha2-nistp384 ,	495	.Dq ecdsa-sha2-nistp384 ,
496	.Dq ecdsa-sha2-nistp521 ,	496	.Dq ecdsa-sha2-nistp521 ,
		497	.Dq ssh-ed25519
497	.Dq ssh-dss	498	.Dq ssh-dss
498	or	499	or
499	.Dq ssh-rsa .	500	.Dq ssh-rsa .