docs/186625: Handbook rebuilding "world" upgrade procedure wrong mergemaster command

[Wout Decré]

>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


>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: