Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/chroot Re-order and synchronize options listed in m...



details:   https://anonhg.NetBSD.org/src/rev/70edb2394350
branches:  trunk
changeset: 768362:70edb2394350
user:      wiz <wiz%NetBSD.org@localhost>
date:      Mon Aug 15 14:43:17 2011 +0000

description:
Re-order and synchronize options listed in manpage (`SYNOPSIS' and
text) as well as `usage'-line; several punctuation improvements.
>From Snader_LB.

diffstat:

 usr.sbin/chroot/chroot.8 |  20 ++++++++++----------
 usr.sbin/chroot/chroot.c |   6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (87 lines):

diff -r 48a9274e8ea2 -r 70edb2394350 usr.sbin/chroot/chroot.8
--- a/usr.sbin/chroot/chroot.8  Mon Aug 15 14:31:58 2011 +0000
+++ b/usr.sbin/chroot/chroot.8  Mon Aug 15 14:43:17 2011 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: chroot.8,v 1.13 2010/07/06 23:05:56 jruoho Exp $
+.\"    $NetBSD: chroot.8,v 1.14 2011/08/15 14:43:17 wiz Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     from: @(#)chroot.8     8.1 (Berkeley) 6/9/93
 .\"
-.Dd July 7, 2010
+.Dd August 13, 2011
 .Dt CHROOT 8
 .Os
 .Sh NAME
@@ -37,9 +37,9 @@
 .Nd change root directory
 .Sh SYNOPSIS
 .Nm
-.Op Fl u Ar user
+.Op Fl G Ar group,group,...
 .Op Fl g Ar group
-.Op Fl G Ar group,group,...
+.Op Fl u Ar user
 .Ar newroot
 .Op Ar command
 .Sh DESCRIPTION
@@ -49,23 +49,23 @@
 .Ar newroot
 and exec's
 .Ar command ,
-if supplied, or an interactive copy of your shell.
+or, if not supplied, an interactive copy of your shell.
 .Pp
 If the
 .Fl u ,
-.Fl g
+.Fl g ,
 or
 .Fl G
-options are given, the user, group and group list of the process are
-set to these values after the chroot has taken place.  See
+options are given, the user, group, and group list of the process are
+set to these values after the chroot has taken place; see
 .Xr setgid 2 ,
 .Xr setgroups 2 ,
 .Xr setuid 2 ,
-.Xr getgrnam 3
+.Xr getgrnam 3 ,
 and
 .Xr getpwnam 3 .
 .Pp
-Note,
+Note:
 .Ar command
 or the shell are run as your real-user-id.
 .Sh ENVIRONMENT
diff -r 48a9274e8ea2 -r 70edb2394350 usr.sbin/chroot/chroot.c
--- a/usr.sbin/chroot/chroot.c  Mon Aug 15 14:31:58 2011 +0000
+++ b/usr.sbin/chroot/chroot.c  Mon Aug 15 14:43:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chroot.c,v 1.15 2008/07/21 13:36:57 lukem Exp $        */
+/*     $NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $  */
 
 /*
  * Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)chroot.c   8.1 (Berkeley) 6/9/93";
 #else
-__RCSID("$NetBSD: chroot.c,v 1.15 2008/07/21 13:36:57 lukem Exp $");
+__RCSID("$NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $");
 #endif
 #endif /* not lint */
 
@@ -179,7 +179,7 @@
 usage(void)
 {
 
-       (void)fprintf(stderr, "usage: chroot [-g group] [-G group,group,...] "
+       (void)fprintf(stderr, "usage: chroot [-G group,group,...] [-g group] "
            "[-u user] newroot [command]\n");
        exit(1);
 }



Home | Main Index | Thread Index | Old Index