From b3509014cec85818fb74d3b90073f3ca8745253e Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 20 Jan 2005 11:01:46 +1100 Subject: [PATCH] - jmc@cvs.openbsd.org 2005/01/08 00:41:19 [sshd_config.5] `login'(n) -> `log in'(v); --- ChangeLog | 5 ++++- sshd_config.5 | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35fe08531..d3eb1047a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,9 @@ - markus@cvs.openbsd.org 2005/01/05 08:51:32 [sshconnect.c] remove dead code, log connect() failures with level error, ok djm@ + - jmc@cvs.openbsd.org 2005/01/08 00:41:19 + [sshd_config.5] + `login'(n) -> `log in'(v); 20050118 - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement @@ -1985,4 +1988,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.3612 2005/01/20 00:00:46 dtucker Exp $ +$Id: ChangeLog,v 1.3613 2005/01/20 00:01:46 dtucker Exp $ diff --git a/sshd_config.5 b/sshd_config.5 index 07f91b6ed..e50b4bc4f 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.37 2004/12/23 23:11:00 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.38 2005/01/08 00:41:19 jmc Exp $ .Dd September 25, 1999 .Dt SSHD_CONFIG 5 .Os @@ -466,7 +466,7 @@ server allows login to accounts with empty password strings. The default is .Dq no . .It Cm PermitRootLogin -Specifies whether root can login using +Specifies whether root can log in using .Xr ssh 1 . The argument must be .Dq yes , @@ -495,7 +495,7 @@ All other authentication methods are disabled for root. .Pp If this option is set to .Dq no -root is not allowed to login. +root is not allowed to log in. .It Cm PermitUserEnvironment Specifies whether .Pa ~/.ssh/environment