Author: ngie
Date: Thu Mar 16 01:38:07 2017
New Revision: 315344
URL: https://svnweb.freebsd.org/changeset/base/315344
Log:
MFC r314830:
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.
Modified:
stable/11/usr.sbin/mergemaster/mergemaster.8
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/mergemaster/mergemaster.8
==============================================================================
--- stable/11/usr.sbin/mergemaster/mergemaster.8 Thu Mar 16 01:38:04
2017 (r315343)
+++ stable/11/usr.sbin/mergemaster/mergemaster.8 Thu Mar 16 01:38:07
2017 (r315344)
@@ -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.
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
