A simple make world is too dangerous for most upgrades. Instead, copy

the updating from stable section, and remove the kludge-o-rounds that
are in there.

Sometimes make world is safe, sometimes not.  Let's document the safe
way to deal.

1 files changed, 14 insertions, 2 deletions

diff --git a/UPDATING b/UPDATING
index b5e6a31..204cc7c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -1001,8 +1001,20 @@ COMMON ITEMS:
 
 	To rebuild everything and install it on the current system.
 	-----------------------------------------------------------
-	make world
-	Build a new kernel, see above.
+	# Note: sometimes if you are running current you gotta do more than
+	# is listed here if you are upgrading from a really old current.
+
+	<maybe fix /etc/fstab>				[7]
+	make buildworld
+	make buildkernel KERNCONF=YOUR_KERNEL_HERE
+	make installkernel KERNCONF=YOUR_KERNEL_HERE
+							[1]
+	<reboot in single user>				[3]
+	mergemaster -p					[5]
+	make installworld
+	mergemaster					[4]
+	<reboot>
+
 
 	To upgrade from 4.x-stable to current
 	-------------------------------------