Note: mergemaster stopped being optional a long time ago. Caution against

doing it by hand (but provide pointers to those wanting to do it by hand).

1 files changed, 8 insertions, 1 deletions

diff --git a/UPDATING b/UPDATING
index a602a13b5b87..18e6342df02c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -702,7 +702,7 @@ COMMON ITEMS:
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	reboot in single user [3]
 	make installworld
-	mergemaster
+	mergemaster		[4]
 	[1]
 	<reboot>
 
@@ -733,6 +733,13 @@ COMMON ITEMS:
 		cd /usr/src
 		adjkerntz -i		# if COMS is wall time
 
+	[4] Note: This step is non-optional.  Failure to do this step
+	can result in a significant reduction in the functionality of the
+	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.
+
 FORMAT:
 
 This file contains a list, in reverse chronological order, of major