summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh.18
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a9d0db91..fcf85fae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
27 - djm@cvs.openbsd.org 2010/07/21 02:10:58 27 - djm@cvs.openbsd.org 2010/07/21 02:10:58
28 [misc.c] 28 [misc.c]
29 sync timingsafe_bcmp() with the one dempsky@ committed to sys/lib/libkern 29 sync timingsafe_bcmp() with the one dempsky@ committed to sys/lib/libkern
30 - dtucker@cvs.openbsd.org 2010/07/23 08:49:25
31 [ssh.1]
32 Ciphers is documented in ssh_config(5) these days
30 33
3120100819 3420100819
32 - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more 35 - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more
diff --git a/ssh.1 b/ssh.1
index 23df1c5a0..d8b3775da 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.306 2010/07/14 17:06:58 jmc Exp $ 37.\" $OpenBSD: ssh.1,v 1.307 2010/07/23 08:49:25 dtucker Exp $
38.Dd $Mdocdate: July 14 2010 $ 38.Dd $Mdocdate: July 23 2010 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -176,7 +176,9 @@ is a comma-separated list of ciphers
176listed in order of preference. 176listed in order of preference.
177See the 177See the
178.Cm Ciphers 178.Cm Ciphers
179keyword for more information. 179keyword in
180.Xr ssh_config 5
181for more information.
180.It Fl D Xo 182.It Fl D Xo
181.Sm off 183.Sm off
182.Oo Ar bind_address : Oc 184.Oo Ar bind_address : Oc