- (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test

[openssh.git] / sshd_config.5

diff --git a/sshd_config.5 b/sshd_config.5
index 3835fcd6289e4cea76e78dac89afe195df9eb25b..71a293ffb223013ec92677038504eee27ac78241 100644 (file)
--- 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.
 .\"
 .\" (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.46 2005/12/06 22:38:28 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
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os


@@ -181,7 +181,7 @@ The default is
     aes192-ctr,aes256-ctr''
 .Ed
 .It Cm ClientAliveCountMax
     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.
 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
 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.
 .Cm ClientAliveCountMax
 is left at the default, unresponsive ssh clients
 will be disconnected after approximately 45 seconds.


@@ -506,6 +506,12 @@ root is not allowed to log in.
 Specifies whether
 .Xr tun 4
 device forwarding is allowed.
 Specifies whether
 .Xr tun 4
 device forwarding is allowed.

+The argument must be
+.Dq yes ,
+.Dq point-to-point ,
+.Dq ethernet
+or
+.Dq no .

 The default is
 .Dq no .
 .It Cm PermitUserEnvironment
 The default is
 .Dq no .
 .It Cm PermitUserEnvironment