From 84d714d74e782c57b185a1016304f8dd1c158a36 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 26 Mar 2016 11:41:35 +0000
Subject: Remove some unneeded headers

Found by 'include-what-you-use'
---
 pw/cpdir.c    | 1 -
 pw/pw_user.c  | 2 --
 pw/pw_utils.c | 3 ---
 pw/pw_vpw.c   | 1 -
 4 files changed, 7 deletions(-)

diff --git a/pw/cpdir.c b/pw/cpdir.c
index 334f789..679758b 100644
--- a/pw/cpdir.c
+++ b/pw/cpdir.c
@@ -37,7 +37,6 @@ static const char rcsid[] =
 #include <unistd.h>
 
 #include "pw.h"
-#include "pwupd.h"
 
 void
 copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid,
diff --git a/pw/pw_user.c b/pw/pw_user.c
index 2f87b56..5ad1409 100644
--- a/pw/pw_user.c
+++ b/pw/pw_user.c
@@ -31,8 +31,6 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <sys/resource.h>
-#include <sys/time.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/pw/pw_utils.c b/pw/pw_utils.c
index 1a4f812..e483977 100644
--- a/pw/pw_utils.c
+++ b/pw/pw_utils.c
@@ -27,13 +27,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include <err.h>
-#include <inttypes.h>
 #include <sysexits.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c
index 2d1c75b..08c8bd5 100644
--- a/pw/pw_vpw.c
+++ b/pw/pw_vpw.c
@@ -37,7 +37,6 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/param.h>
 #include <err.h>
 
 #include "pwupd.h"
-- 
cgit v1.2.3-56-ge451


From eff36b967e84317ed3b4afd8550ab25c2aa06a14 Mon Sep 17 00:00:00 2001
From: Warren Block <wblock@FreeBSD.org>
Date: Mon, 28 Mar 2016 02:05:35 +0000
Subject: Adjust misleading wording of the -G option and simplify a few
 surrounding sentences.  From a discussion on -ports.

Reviewed by:	David Wolfskill <david@catwhisker.org>
---
 pw/pw.8 | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pw/pw.8 b/pw/pw.8
index 3a9c0b0..84ceda3 100644
--- a/pw/pw.8
+++ b/pw/pw.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 14, 2015
+.Dd March 27, 2016
 .Dt PW 8
 .Os
 .Sh NAME
@@ -420,18 +420,16 @@ Set the account's primary group to the given group.
 .Ar group
 may be defined by either its name or group number.
 .It Fl G Ar grouplist
-Set additional group memberships for an account.
+Set secondary group memberships for an account.
 .Ar grouplist
-is a comma, space or tab-separated list of group names or group numbers.
-The user's name is added to the group lists in
-.Pa /etc/group ,
-and
-removed from any groups not specified in
-.Ar grouplist .
-Note: a user should not be added to their primary group with
+is a comma, space, or tab-separated list of group names or group numbers.
+The user is added to the groups specified in
+.Ar grouplist ,
+and removed from all groups not specified.
+The current login session is not affected by group membership changes,
+which only take effect when the user reconnects.
+Note: do not add a user to their primary group with
 .Ar grouplist .
-Also, group membership changes do not take effect for current user login
-sessions, requiring the user to reconnect to be affected by the changes.
 .It Fl L Ar class
 This option sets the login class for the user being created.
 See
-- 
cgit v1.2.3-56-ge451