From 63cb445e514ab9149e6ee07329f1917474458cec Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 26 Oct 2002 06:25:11 +0000
Subject: [PATCH] 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.
---
 UPDATING | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/UPDATING b/UPDATING
index b5e6a31a9fe5..204cc7ce899b 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
 	-------------------------------------