summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd.84
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 42e00382b..0d0f54508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
27 domain ed25519 reference code from SUPERCOP, see 27 domain ed25519 reference code from SUPERCOP, see
28 http://ed25519.cr.yp.to/software.html 28 http://ed25519.cr.yp.to/software.html
29 feedback, help & ok djm@ 29 feedback, help & ok djm@
30 - jmc@cvs.openbsd.org 2013/12/06 15:29:07
31 [sshd.8]
32 missing comma;
30 33
3120131205 3420131205
32 - (djm) OpenBSD CVS Sync 35 - (djm) OpenBSD CVS Sync
diff --git a/sshd.8 b/sshd.8
index b5d614c50..62615bf6d 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,7 +33,7 @@
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.271 2013/12/06 13:39:49 markus Exp $ 36.\" $OpenBSD: sshd.8,v 1.272 2013/12/06 15:29:07 jmc Exp $
37.Dd $Mdocdate: December 6 2013 $ 37.Dd $Mdocdate: December 6 2013 $
38.Dt SSHD 8 38.Dt SSHD 8
39.Os 39.Os
@@ -494,7 +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-ed25519 ,
498.Dq ssh-dss 498.Dq ssh-dss
499or 499or
500.Dq ssh-rsa . 500.Dq ssh-rsa .