o Move to recommending the {build,install}kernel targets for updating from

  older versions of FreeBSD.
o Continue to document the old way of doing it with a warning stating if that
  doesn't work, to do the {build,install}kernel thing.
o minor wordsmithing on what a make world really is.

1 files changed, 21 insertions, 9 deletions

diff --git a/UPDATING b/UPDATING
index d9b806798c5b..9da81045696a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -215,15 +215,27 @@ COMMON ITEMS:
 
 	To build a kernel
 	-----------------
-	Update config, genassym and go:
-		config YOUR_KERNEL_HERE			[1]
-		cd ../../compile/YOUR_KERNEL_HERE
-		make depend && make
-		make install
-	[1] If upgrading, add -r won't hurt and sometimes helps.
-
-	To rebuild everything
-	---------------------
+	If you are updating from a prior version of FreeBSD (even one just
+	a few days old), you should follow this proceedure. With a
+	/usr/obj tree with a fresh buildworld,
+	make buildkernel KERNEL=YOUR_KERNEL_HERE
+	make installkernel KERNEL=YOUR_KERNEL_HERE
+
+	To just build a kernel when you know that it won't mess you up
+	--------------------------------------------------------------
+	cd src/sys/{i386,alpha}/conf
+	config KERNEL_NAME_HERE			[1]
+	cd ../../compile/KERNEL_NAME_HERE
+	make depend
+	make
+	make install	
+	
+	[1] If in doubt, -r might help here.
+
+	If this fails, go to the "To build a kernel" section.
+
+	To rebuild everything and install it on the current system.
+	-----------------------------------------------------------
 	make world
 
 	To upgrade from 4.x-stable to current