diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ssh.1 | 9 |
2 files changed, 13 insertions, 5 deletions
@@ -33,6 +33,13 @@ | |||
33 | [ssh.1] | 33 | [ssh.1] |
34 | expand the description of -w somewhat; | 34 | expand the description of -w somewhat; |
35 | help/ok reyk | 35 | help/ok reyk |
36 | - jmc@cvs.openbsd.org 2005/12/23 14:55:53 | ||
37 | [ssh.1] | ||
38 | - sync the description of -e w/ synopsis | ||
39 | - simplify the description of -I | ||
40 | - note that -I is only available if support compiled in, and that it | ||
41 | isn't by default | ||
42 | feedback/ok djm@ | ||
36 | 43 | ||
37 | 20051220 | 44 | 20051220 |
38 | - (dtucker) OpenBSD CVS Sync | 45 | - (dtucker) OpenBSD CVS Sync |
@@ -3535,4 +3542,4 @@ | |||
3535 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3542 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3536 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3543 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3537 | 3544 | ||
3538 | $Id: ChangeLog,v 1.4048 2005/12/24 03:56:04 djm Exp $ | 3545 | $Id: ChangeLog,v 1.4049 2005/12/24 03:56:29 djm Exp $ |
@@ -34,7 +34,7 @@ | |||
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.228 2005/12/22 11:23:42 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.229 2005/12/23 14:55:53 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -256,7 +256,7 @@ indicates that the listening port be bound for local use only, while an | |||
256 | empty address or | 256 | empty address or |
257 | .Sq * | 257 | .Sq * |
258 | indicates that the port should be available from all interfaces. | 258 | indicates that the port should be available from all interfaces. |
259 | .It Fl e Ar ch | ^ch | none | 259 | .It Fl e Ar escape_char |
260 | Sets the escape character for sessions with a pty (default: | 260 | Sets the escape character for sessions with a pty (default: |
261 | .Ql ~ ) . | 261 | .Ql ~ ) . |
262 | The escape character is only recognized at the beginning of a line. | 262 | The escape character is only recognized at the beginning of a line. |
@@ -292,11 +292,12 @@ something like | |||
292 | .It Fl g | 292 | .It Fl g |
293 | Allows remote hosts to connect to local forwarded ports. | 293 | Allows remote hosts to connect to local forwarded ports. |
294 | .It Fl I Ar smartcard_device | 294 | .It Fl I Ar smartcard_device |
295 | Specifies which smartcard device to use. | 295 | Specify the device |
296 | The argument is the device | ||
297 | .Nm | 296 | .Nm |
298 | should use to communicate with a smartcard used for storing the user's | 297 | should use to communicate with a smartcard used for storing the user's |
299 | private RSA key. | 298 | private RSA key. |
299 | This option is only available if support for smartcard devices | ||
300 | is compiled in (default is no support). | ||
300 | .It Fl i Ar identity_file | 301 | .It Fl i Ar identity_file |
301 | Selects a file from which the identity (private key) for | 302 | Selects a file from which the identity (private key) for |
302 | RSA or DSA authentication is read. | 303 | RSA or DSA authentication is read. |