- jmc@cvs.openbsd.org 2006/01/20 11:21:45
[ssh_config.5]
- word change, agreed w/ markus
- consistency fixes
diff --git a/ChangeLog b/ChangeLog
index da8a70a..ada3d3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20060131
+ - (djm) OpenBSD CVS Sync
+ - jmc@cvs.openbsd.org 2006/01/20 11:21:45
+ [ssh_config.5]
+ - word change, agreed w/ markus
+ - consistency fixes
+
20060129
- (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the
opensshd.init script interpretter if /sbin/sh does not exist. ok tim@
@@ -3722,4 +3729,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.4094 2006/01/29 13:22:39 dtucker Exp $
+$Id: ChangeLog,v 1.4095 2006/01/31 10:39:03 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 790c9b2..5c94ffc 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.75 2006/01/20 00:14:55 dtucker Exp $
+.\" $OpenBSD: ssh_config.5,v 1.76 2006/01/20 11:21:45 jmc Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -720,19 +720,19 @@
This option applies to protocol version 2 only.
.It Cm RekeyLimit
Specifies the maximum amount of data that may be transmitted before the
-session key will be renegotiated.
+session key is renegotiated.
The argument is the number of bytes, with an optional suffix of
-.Dq K ,
-.Dq M ,
+.Sq K ,
+.Sq M ,
or
-.Dq G
+.Sq G
to indicate Kilobytes, Megabytes, or Gigabytes, respectively.
The default is between
.Dq 1G
and
.Dq 4G ,
depending on the cipher.
-Note that this option applies to protocol version 2 only.
+This option applies to protocol version 2 only.
.It Cm RemoteForward
Specifies that a TCP port on the remote machine be forwarded over
the secure channel to the specified host and port from the local machine.