From nobody@FreeBSD.org  Mon Feb 10 11:20:15 2014
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C1557FFC
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Feb 2014 11:20:15 +0000 (UTC)
Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id AB50212D4
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Feb 2014 11:20:15 +0000 (UTC)
Received: from cgiserv.freebsd.org ([127.0.1.6])
	by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s1ABKEYU052846
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Feb 2014 11:20:14 GMT
	(envelope-from nobody@cgiserv.freebsd.org)
Received: (from nobody@localhost)
	by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s1ABKECO052831;
	Mon, 10 Feb 2014 11:20:14 GMT
	(envelope-from nobody)
Message-Id: <201402101120.s1ABKECO052831@cgiserv.freebsd.org>
Date: Mon, 10 Feb 2014 11:20:14 GMT
From: Wout Decr <wout@canodus.be>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Handbook rebuilding "world" upgrade procedure wrong mergemaster command
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         186625
>Category:       docs
>Synopsis:       Handbook rebuilding "world" upgrade procedure wrong mergemaster command
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dru
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 10 11:30:00 UTC 2014
>Closed-Date:    Fri Mar 07 18:40:06 UTC 2014
>Last-Modified:  Fri Mar  7 18:50:00 UTC 2014
>Originator:     Wout Decr
>Release:        
>Organization:
Canodus
>Environment:
>Description:
Under Procedure 23.2. Overview of Build World Process, step 9:

Update any remaining configuration files.

# mergemaster -p

It suggests you should do the mergemaster command two times with the -p option.

Before r43796, this was:

# mergemaster


>How-To-Repeat:
Check http://www.freebsd.org/doc/handbook/makeworld.html
>Fix:
I think this should just be:

# mergemaster

>Release-Note:
>Audit-Trail:

From: Wout =?ISO-8859-1?Q?Decr=E9?= <wout@canodus.be>
To: freebsd-gnats-submit@FreeBSD.org, freebsd-doc@freebsd.org
Cc:  
Subject: Re: docs/186625: Handbook rebuilding "world" upgrade procedure
 wrong mergemaster command
Date: Thu, 27 Feb 2014 14:38:49 +0100

 On Mon, 2014-02-10 at 11:20 +0000, Wout Decr wrote:
 > >Number:         186625
 > >Category:       docs
 > >Synopsis:       Handbook rebuilding "world" upgrade procedure wrong mergemaster command
 > >Confidential:   no
 > >Severity:       non-critical
 > >Priority:       low
 > >Responsible:    freebsd-doc
 > >State:          open
 > >Quarter:        
 > >Keywords:       
 > >Date-Required:
 > >Class:          doc-bug
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Mon Feb 10 11:30:00 UTC 2014
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Wout Decr
 > >Release:        
 > >Organization:
 > Canodus
 > >Environment:
 > >Description:
 > Under Procedure 23.2. Overview of Build World Process, step 9:
 > 
 > Update any remaining configuration files.
 > 
 > # mergemaster -p
 > 
 > It suggests you should do the mergemaster command two times with the -p option.
 > 
 > Before r43796, this was:
 > 
 > # mergemaster
 > 
 
 Can someone confirm this? If it was a mistake, I think it should be
 corrected soon, as people may not fully merge their /etc directory when
 rebuilding world.
 
 Maybe a note can be added describing the -F option (ignore files which
 differ only by VCS Id)?
 
 Cheers
 
 > 
 > >How-To-Repeat:
 > Check http://www.freebsd.org/doc/handbook/makeworld.html
 > >Fix:
 > I think this should just be:
 > 
 > # mergemaster
 > 
 > >Release-Note:
 > >Audit-Trail:
 > >Unformatted:
 > _______________________________________________
 > freebsd-doc@freebsd.org mailing list
 > http://lists.freebsd.org/mailman/listinfo/freebsd-doc
 > To unsubscribe, send any mail to "freebsd-doc-unsubscribe@freebsd.org"
 
 
Responsible-Changed-From-To: freebsd-doc->dru 
Responsible-Changed-By: dru 
Responsible-Changed-When: Fri Mar 7 18:39:00 UTC 2014 
Responsible-Changed-Why:  
I'll take this one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186625 
State-Changed-From-To: open->closed 
State-Changed-By: dru 
State-Changed-When: Fri Mar 7 18:39:24 UTC 2014 
State-Changed-Why:  
Fixed in r44183. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186625 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: docs/186625: commit references a PR
Date: Fri,  7 Mar 2014 18:38:49 +0000 (UTC)

 Author: dru
 Date: Fri Mar  7 18:38:41 2014
 New Revision: 44183
 URL: http://svnweb.freebsd.org/changeset/doc/44183
 
 Log:
   Edit needed to close PR.
   
   PR: 186625
   Sponsored by: iXsystems
 
 Modified:
   head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
 
 Modified: head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml
 ==============================================================================
 --- head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Fri Mar  7 18:34:22 2014	(r44182)
 +++ head/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml	Fri Mar  7 18:38:41 2014	(r44183)
 @@ -1641,7 +1641,7 @@ before running "/usr/sbin/freebsd-update
  	<step>
  	  <para>Update any remaining configuration files.</para>
  
 -	  <screen>&prompt.root; <userinput>mergemaster -p</userinput></screen>
 +	  <screen>&prompt.root; <userinput>mergemaster</userinput></screen>
  	</step>
  
  	<step>
 _______________________________________________
 svn-doc-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-doc-all
 To unsubscribe, send any mail to "svn-doc-all-unsubscribe@freebsd.org"
 
>Unformatted:
