http://www.freebsd.org/doc/handbook/makeworld.html

[Martin Johnson]

Hello,

I'd like to suggest two minor edits for that page.  Firstly in the main
text :-

        "mergemaster

        Now you can update the remaining configuration files, since you
have a new world on disk."

Suggest "mergemaster -F" (to suppress prompting about countless files
where only the VCSID has changed since the last release, and the user
hadn't changed that particular default config file).

Secondly in the summary paragraph:-

        # adjkerntz -i
        # mount -a -t ufs
        # mergemaster -p
        # cd /usr/src
        # installworld
        # mergemaster
        # reboot

The second mergemaster should be "mergemaster -F".  The first one is
probably best left as is, since older versions of mergemaster don't have -F.

Kind regards,

- Martin.