From owner-svn-src-stable@freebsd.org  Thu Mar 16 01:38:09 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36F10D0DF52;
 Thu, 16 Mar 2017 01:38:09 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 061FC18DE;
 Thu, 16 Mar 2017 01:38:08 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2G1c8qU058480;
 Thu, 16 Mar 2017 01:38:08 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2G1c8gA058479;
 Thu, 16 Mar 2017 01:38:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703160138.v2G1c8gA058479@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Thu, 16 Mar 2017 01:38:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r315344 - stable/11/usr.sbin/mergemaster
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Mar 2017 01:38:09 -0000

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.