svn commit: r314830 - head/usr.sbin/mergemaster

[Ngie Cooper]

Author: ngie
Date: Tue Mar  7 04:13:22 2017
New Revision: 314830
URL: https://svnweb.freebsd.org/changeset/base/314830

Log:
  mergemaster: fix description of -p
  
  -p only handles updating /etc/master.passwd and /etc/group . No more,
  no less.
  
  Also, mergemaster (and no other portions of the vanilla FreeBSD build
  process) should be messing with __MAKECONF or SRCCONF as part of the
  installworld or distribution process. Don't insinuate that mergemaster
  does that as it's a false claim.
  
  MFC after:	1 week
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.sbin/mergemaster/mergemaster.8

Modified: head/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.8	Tue Mar  7 03:53:09 2017	(r314829)
+++ head/usr.sbin/mergemaster/mergemaster.8	Tue Mar  7 04:13:22 2017	(r314830)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 29, 2015
+.Dd March 6, 2017
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -226,9 +226,10 @@ destination directory.
 .It Fl p
 Pre-buildworld mode.
 Compares only files known to be essential to the success of
-{build|install}world,
-including
-.Pa /etc/make.conf .
+{build|install}world, i.e.,
+.Pa /etc/group
+and
+.Pa /etc/master.passwd .
 .It Fl F
 If the files differ only by VCS Id ($FreeBSD)
 install the new file.