diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ssh_config.5 | 12 |
2 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20060131 | ||
2 | - (djm) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2006/01/20 11:21:45 | ||
4 | [ssh_config.5] | ||
5 | - word change, agreed w/ markus | ||
6 | - consistency fixes | ||
7 | |||
1 | 20060129 | 8 | 20060129 |
2 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the | 9 | - (dtucker) [configure.ac opensshd.init.in] Bug #1144: Use /bin/sh for the |
3 | opensshd.init script interpretter if /sbin/sh does not exist. ok tim@ | 10 | opensshd.init script interpretter if /sbin/sh does not exist. ok tim@ |
@@ -3722,4 +3729,4 @@ | |||
3722 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3729 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3723 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3730 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3724 | 3731 | ||
3725 | $Id: ChangeLog,v 1.4094 2006/01/29 13:22:39 dtucker Exp $ | 3732 | $Id: ChangeLog,v 1.4095 2006/01/31 10:39:03 djm Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index 790c9b204..5c94ffc9c 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.75 2006/01/20 00:14:55 dtucker Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.76 2006/01/20 11:21:45 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 |
@@ -720,19 +720,19 @@ The default is | |||
720 | This option applies to protocol version 2 only. | 720 | This option applies to protocol version 2 only. |
721 | .It Cm RekeyLimit | 721 | .It Cm RekeyLimit |
722 | Specifies the maximum amount of data that may be transmitted before the | 722 | Specifies the maximum amount of data that may be transmitted before the |
723 | session key will be renegotiated. | 723 | session key is renegotiated. |
724 | The argument is the number of bytes, with an optional suffix of | 724 | The argument is the number of bytes, with an optional suffix of |
725 | .Dq K , | 725 | .Sq K , |
726 | .Dq M , | 726 | .Sq M , |
727 | or | 727 | or |
728 | .Dq G | 728 | .Sq G |
729 | to indicate Kilobytes, Megabytes, or Gigabytes, respectively. | 729 | to indicate Kilobytes, Megabytes, or Gigabytes, respectively. |
730 | The default is between | 730 | The default is between |
731 | .Dq 1G | 731 | .Dq 1G |
732 | and | 732 | and |
733 | .Dq 4G , | 733 | .Dq 4G , |
734 | depending on the cipher. | 734 | depending on the cipher. |
735 | Note that this option applies to protocol version 2 only. | 735 | This option applies to protocol version 2 only. |
736 | .It Cm RemoteForward | 736 | .It Cm RemoteForward |
737 | Specifies that a TCP port on the remote machine be forwarded over | 737 | Specifies that a TCP port on the remote machine be forwarded over |
738 | the secure channel to the specified host and port from the local machine. | 738 | the secure channel to the specified host and port from the local machine. |