UPDATING: Change update procedure to use etcupdate(8) over mergemaster(8)

This commit aligns the steps in UPDATING with the steps from the
handbook which already prefers etcupdate(8). While here also remove a
dubious comment.

PR:			252417
Reviewed by:		ceri
Approved by:		philip (mentor), imp
Differential Revision:	https://reviews.freebsd.org/D28062

1 files changed, 6 insertions, 10 deletions

diff --git a/UPDATING b/UPDATING
index bd79cda17aa3..f013826393fb 100644
--- a/UPDATING
+++ b/UPDATING
@@ -2463,9 +2463,9 @@ COMMON ITEMS:
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
-	mergemaster -Fp					[5]
+	etcupdate -p					[5]
 	make installworld
-	mergemaster -Fi					[4]
+	etcupdate -B					[4]
 	make delete-old					[6]
 	<reboot>
 
@@ -2501,9 +2501,9 @@ COMMON ITEMS:
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
-	mergemaster -Fp					[5]
+	etcupdate -p					[5]
 	make installworld
-	mergemaster -Fi					[4]
+	etcupdate -B					[4]
 	make delete-old					[6]
 	<reboot>
 
@@ -2545,15 +2545,11 @@ COMMON ITEMS:
 	system.  Attempting to do it by hand is not recommended and those
 	that pursue this avenue should read this file carefully, as well
 	as the archives of freebsd-current and freebsd-hackers mailing lists
-	for potential gotchas.  The -U option is also useful to consider.
-	See mergemaster(8) for more information.
+	for potential gotchas.  See etcupdate(8) for more information.
 
 	[5] Usually this step is a no-op.  However, from time to time
 	you may need to do this if you get unknown user in the following
-	step.  It never hurts to do it all the time.  You may need to
-	install a new mergemaster (cd src/usr.sbin/mergemaster && make
-	install) after the buildworld before this step if you last updated
-	from current before 20130425 or from -stable before 20130430.
+	step.
 
 	[6] This only deletes old files and directories. Old libraries
 	can be deleted by "make delete-old-libs", but you have to make