tidy up SYNOPSIS, options description, FILES, and usage();

from Igor Sobrado

2 files changed, 11 insertions, 11 deletions

diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 3b82b8ad546..b469d6eed2c 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: login.1,v 1.24 2005/06/02 07:51:37 jmc Exp $
+.\"	$OpenBSD: login.1,v 1.25 2007/03/26 14:29:37 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -39,8 +39,8 @@
 .Nm login
 .Op Fl fp
 .Op Fl h Ar hostname
-.Op Fl L Ar local-ip-address
-.Op Fl R Ar remote-ip-address
+.Op Fl L Ar local-ip
+.Op Fl R Ar remote-ip
 .Op Fl u Ar username
 .Op Ar user
 .Sh DESCRIPTION
@@ -75,7 +75,7 @@ logged in user is logging in as themselves.
 .It Fl h Ar hostname
 Specifies the host from which the connection was received.
 This option may only be used by the superuser.
-.It Fl L
+.It Fl L Ar local-ip
 The
 .Fl L
 option specifies the local IP address of a socket.
@@ -88,7 +88,7 @@ discards any previous environment.
 The
 .Fl p
 option disables this behavior.
-.It Fl R
+.It Fl R Ar remote-ip
 The
 .Fl R
 option specifies the remote IP address of a socket.
@@ -211,8 +211,6 @@ login configuration
 message-of-the-day
 .It Pa /etc/nologin
 disallows logins
-.It Pa /var/run/utmp
-current logins
 .It Pa /var/log/failedlogin
 failed login account records
 .It Pa /var/log/lastlog
@@ -221,6 +219,8 @@ last login account records
 login account records
 .It Pa /var/mail/user
 system mailboxes
+.It Pa /var/run/utmp
+current logins
 .It Pa \&.hushlogin
 makes login quieter
 .El
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index e2cdea51f69..35366029c5d 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: login.c,v 1.55 2004/08/30 23:00:22 millert Exp $	*/
+/*	$OpenBSD: login.c,v 1.56 2007/03/26 14:29:37 jmc Exp $	*/
 /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
 
 /*-
@@ -73,7 +73,7 @@ static const char copyright[] =
 #if 0
 static const char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
-static const char rcsid[] = "$OpenBSD: login.c,v 1.55 2004/08/30 23:00:22 millert Exp $";
+static const char rcsid[] = "$OpenBSD: login.c,v 1.56 2007/03/26 14:29:37 jmc Exp $";
 #endif /* not lint */
 
 /*
@@ -263,8 +263,8 @@ main(int argc, char *argv[])
 			if (!uid)
 				syslog(LOG_ERR, "invalid flag %c", ch);
 			(void)fprintf(stderr,
-			    "usage: login [-fp] [-h hostname] [-L lipaddr] "
-			    "[-R ripaddr] [-u username] [user]\n");
+			    "usage: login [-fp] [-h hostname] [-L local-ip] "
+			    "[-R remote-ip] [-u username]\n\t[user]\n");
 			quickexit(1);
 		}
 	argc -= optind;