summaryrefslogtreecommitdiff
path: root/usr.bin/chpass
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-03-05 19:20:38 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-03-05 19:20:38 +0000
commit5f11dae5029c2844c96130eb16d99769ea137c83 (patch)
tree4dd7fb0c8146cfb3c8aaa75a616b5941a802caae /usr.bin/chpass
parent002ad733068d179d95191e3aaf9ef3c0180fd1d7 (diff)
Change prompt string from "Location:" to "Office Location:", to disambiguate
from what is expected, and to be consistent with finger(1); from FreeBSD.
Diffstat (limited to 'usr.bin/chpass')
-rw-r--r--usr.bin/chpass/chpass.112
-rw-r--r--usr.bin/chpass/edit.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 0589d92c43f..d5cbacf2f5e 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chpass.1,v 1.13 1999/08/21 19:34:40 niklas Exp $
+.\" $OpenBSD: chpass.1,v 1.14 2000/03/05 19:20:36 aaron Exp $
.\" $NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
@@ -87,7 +87,7 @@ is a modification request and there is a local entry for the specified user.
.Pp
Possible display items are as follows:
.Pp
-.Bl -tag -width "Home Directory:" -compact -offset indent
+.Bl -tag -width "Office Location:" -compact -offset indent
.It Login:
user's login name
.It Password:
@@ -108,12 +108,12 @@ user's home directory
user's login shell
.It Full Name:
user's real name
-.It Location:
-user's normal location
-.It Home Phone:
-user's home phone
+.It Office Location:
+user's office location
.It Office Phone:
user's office phone
+.It Home Phone:
+user's home phone
.El
.Pp
The
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index 6cc40675879..53a759a2baf 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edit.c,v 1.18 1999/12/05 20:18:35 millert Exp $ */
+/* $OpenBSD: edit.c,v 1.19 2000/03/05 19:20:37 aaron Exp $ */
/* $NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: edit.c,v 1.18 1999/12/05 20:18:35 millert Exp $";
+static char rcsid[] = "$OpenBSD: edit.c,v 1.19 2000/03/05 19:20:37 aaron Exp $";
#endif
#endif /* not lint */
@@ -130,7 +130,7 @@ display(tempname, fd, pw)
p = strsep(&bp, ",");
(void)fprintf(fp, "Full Name: %s\n", p ? p : "");
p = strsep(&bp, ",");
- (void)fprintf(fp, "Location: %s\n", p ? p : "");
+ (void)fprintf(fp, "Office Location: %s\n", p ? p : "");
p = strsep(&bp, ",");
(void)fprintf(fp, "Office Phone: %s\n", p ? p : "");
p = strsep(&bp, ",");