[Bug 206866] [handbook] Replace mergemaster(8) with newer etcupdate(8) utility for source upgrades

bugzilla-noreply at freebsd.org bugzilla-noreply at freebsd.org
Wed Feb 3 00:47:39 UTC 2016


https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=206866

            Bug ID: 206866
           Summary: [handbook] Replace mergemaster(8) with newer
                    etcupdate(8) utility for source upgrades
           Product: Documentation
           Version: Latest
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: Documentation
          Assignee: freebsd-doc at FreeBSD.org
          Reporter: woodsb02 at gmail.com

The attached patch updates chapter 23 of the FreeBSD Handbook for "Updating and
Upgrading FreeBSD" to replace all references to the mergemaster(8) utility with
the newer etcupdate(8) utility when performing source upgrades.

The benefit of the etcupdate(8) utility is that it provides 3-way merge
functionality, meaning that the user does not need to review every difference
between the new configuration file from the source tree and that already
installed on the running system if they can be automatically merged.

This change was recommended by feld@ and des@ on Twitter.

-- 
You are receiving this mail because:
You are the assignee for the bug.


More information about the freebsd-doc mailing list