diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh_config.5 | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -79,6 +79,9 @@ | |||
79 | raise error when the user specifies a RekeyLimit that is smaller than 16 | 79 | raise error when the user specifies a RekeyLimit that is smaller than 16 |
80 | (the smallest of our cipher's blocksize) or big enough to cause integer | 80 | (the smallest of our cipher's blocksize) or big enough to cause integer |
81 | wraparound; ok & feedback dtucker@ | 81 | wraparound; ok & feedback dtucker@ |
82 | - jmc@cvs.openbsd.org 2006/02/12 10:49:44 | ||
83 | [ssh_config.5] | ||
84 | slight rewording; ok djm | ||
82 | 85 | ||
83 | 20060313 | 86 | 20060313 |
84 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 87 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -3980,4 +3983,4 @@ | |||
3980 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3983 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3981 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3984 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3982 | 3985 | ||
3983 | $Id: ChangeLog,v 1.4161 2006/03/15 00:30:38 djm Exp $ | 3986 | $Id: ChangeLog,v 1.4162 2006/03/15 00:31:01 djm Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index 5d821a0b1..62a185a39 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -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_config.5,v 1.77 2006/02/12 06:45:34 djm Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.78 2006/02/12 10:49:44 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -317,7 +317,7 @@ by the remote login username. | |||
317 | It is recommended that any | 317 | It is recommended that any |
318 | .Cm ControlPath | 318 | .Cm ControlPath |
319 | used for opportunistic connection sharing include | 319 | used for opportunistic connection sharing include |
320 | at least the last three of these escape sequences (%h, %p and %r). | 320 | at least %h, %p, and %r. |
321 | This ensures that shared connections are uniquely identified. | 321 | This ensures that shared connections are uniquely identified. |
322 | .It Cm DynamicForward | 322 | .It Cm DynamicForward |
323 | Specifies that a TCP port on the local machine be forwarded | 323 | Specifies that a TCP port on the local machine be forwarded |