summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-01-03 18:47:31 +1100
committerDamien Miller <djm@mindrot.org>2006-01-03 18:47:31 +1100
commitb797770da28c07a10b51528f79af3bacae2ff613 (patch)
tree9ffd1e79db2d59841f99f84ac35df711a38f931b
parenta07a59188a5a236c0fb8ef3fb8188ca3d6227458 (diff)
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2006/01/02 17:09:49 [ssh_config.5 sshd_config.5] some corrections from michael knudsen;
-rw-r--r--ChangeLog8
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 99b7aedc..60ea75fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20060103
+ - (djm) OpenBSD CVS Sync
+ - jmc@cvs.openbsd.org 2006/01/02 17:09:49
+ [ssh_config.5 sshd_config.5]
+ some corrections from michael knudsen;
+
20060102
- (djm) [README.tun] Add README.tun, missed during sync of tun(4) support
- (djm) OpenBSD CVS Sync
@@ -3622,4 +3628,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.4071 2006/01/02 12:41:37 djm Exp $
+$Id: ChangeLog,v 1.4072 2006/01/03 07:47:31 djm Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 072ea11a..d091bcbf 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.72 2005/12/22 10:31:40 jmc Exp $
+.\" $OpenBSD: ssh_config.5,v 1.73 2006/01/02 17:09:49 jmc Exp $
.Dd September 25, 1999
.Dt SSH_CONFIG 5
.Os
@@ -797,7 +797,7 @@ across multiple
directives.
The default is not to send any environment variables.
.It Cm ServerAliveCountMax
-Sets the number of server alive messages (see above) which may be
+Sets the number of server alive messages (see below) which may be
sent without
.Nm ssh
receiving any messages back from the server.
@@ -819,7 +819,7 @@ server depend on knowing when a connection has become inactive.
The default value is 3.
If, for example,
.Cm ServerAliveInterval
-(above) is set to 15, and
+(see below) is set to 15, and
.Cm ServerAliveCountMax
is left at the default, if the server becomes unresponsive ssh
will disconnect after approximately 45 seconds.
diff --git a/sshd_config.5 b/sshd_config.5
index a10b365d..71a293ff 100644
--- a/sshd_config.5
+++ b/sshd_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: sshd_config.5,v 1.47 2005/12/08 18:34:11 reyk Exp $
+.\" $OpenBSD: sshd_config.5,v 1.48 2006/01/02 17:09:49 jmc Exp $
.Dd September 25, 1999
.Dt SSHD_CONFIG 5
.Os
@@ -181,7 +181,7 @@ The default is
aes192-ctr,aes256-ctr''
.Ed
.It Cm ClientAliveCountMax
-Sets the number of client alive messages (see above) which may be
+Sets the number of client alive messages (see below) which may be
sent without
.Nm sshd
receiving any messages back from the client.
@@ -203,7 +203,7 @@ server depend on knowing when a connection has become inactive.
The default value is 3.
If
.Cm ClientAliveInterval
-(above) is set to 15, and
+(see below) is set to 15, and
.Cm ClientAliveCountMax
is left at the default, unresponsive ssh clients
will be disconnected after approximately 45 seconds.