From 2142ba0769a2ddd69bcde786a78e83045216acae Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 24 Dec 2005 14:56:29 +1100
Subject:    - jmc@cvs.openbsd.org 2005/12/23 14:55:53      [ssh.1]      - sync
 the description of -e w/ synopsis      - simplify the description of -I     
 - note that -I is only available if support compiled in, and that it     
 isn't by default      feedback/ok djm@

---
 ChangeLog | 9 ++++++++-
 ssh.1     | 9 +++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37cd66bd9..4795f9a62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,13 @@
      [ssh.1]
      expand the description of -w somewhat;
      help/ok reyk
+   - jmc@cvs.openbsd.org 2005/12/23 14:55:53
+     [ssh.1]
+     - sync the description of -e w/ synopsis
+     - simplify the description of -I
+     - note that -I is only available if support compiled in, and that it
+     isn't by default
+     feedback/ok djm@
 
 20051220
  - (dtucker) OpenBSD CVS Sync
@@ -3535,4 +3542,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4048 2005/12/24 03:56:04 djm Exp $
+$Id: ChangeLog,v 1.4049 2005/12/24 03:56:29 djm Exp $
diff --git a/ssh.1 b/ssh.1
index c42d74eba..28633fff1 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (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: ssh.1,v 1.228 2005/12/22 11:23:42 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.229 2005/12/23 14:55:53 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -256,7 +256,7 @@ indicates that the listening port be bound for local use only, while an
 empty address or
 .Sq *
 indicates that the port should be available from all interfaces.
-.It Fl e Ar ch | ^ch | none
+.It Fl e Ar escape_char
 Sets the escape character for sessions with a pty (default:
 .Ql ~ ) .
 The escape character is only recognized at the beginning of a line.
@@ -292,11 +292,12 @@ something like
 .It Fl g
 Allows remote hosts to connect to local forwarded ports.
 .It Fl I Ar smartcard_device
-Specifies which smartcard device to use.
-The argument is the device
+Specify the device
 .Nm
 should use to communicate with a smartcard used for storing the user's
 private RSA key.
+This option is only available if support for smartcard devices
+is compiled in (default is no support).
 .It Fl i Ar identity_file
 Selects a file from which the identity (private key) for
 RSA or DSA authentication is read.
-- 
cgit v1.2.3