docs/80186: Footnote is wrong in the /usr/src/UPDATING

[MASAOKA Hajime]

>Number:         80186
>Category:       docs
>Synopsis:       Footnote is wrong in the /usr/src/UPDATING
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 21 07:40:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     MASAOKA Hajime
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
Kochi Univ. of Tech.
>Environment:
System: FreeBSD foo.example.org 5.4-STABLE FreeBSD 5.4-STABLE #0: Fri Apr 8 15:25:54 JST 2005 root at foo.example.org:/usr/obj/usr/src/sys/GENERIC i386
/usr/src/UPDATING Revision 1.342.2.25 or later

>Description:
	/usr/src/UPDATING is wrong. 
	The footnote on the "To upgrade in-place from 4.x-stable to
	current" section was changed on the revision 1.342.2.25.  Also,
	the section of "The following items are known to cause problems
	with the upgrade:" was changed.  However, the section of "To
	rebuild everything and install it on the current system." was
	not changed.  Therefore, footnote is contradicted.

>How-To-Repeat:
	Read /usr/src/UPDATING
>Fix:
a patch follow

--- UPDATING.diff begins here ---
--- UPDATING	Fri Apr 15 03:24:27 2005
+++ UPDATING.new	Thu Apr 21 14:12:01 2005
@@ -1794,16 +1794,16 @@
 	# is listed here if you are upgrading from a really old current.
 
 	<make sure you have good level 0 dumps>
-	<maybe fix /etc/fstab>				[7]
+	<maybe fix /etc/fstab>				[1]
 	make buildworld
 	make buildkernel KERNCONF=YOUR_KERNEL_HERE
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
-							[1]
-	<reboot in single user>				[3]
-	/etc/rc.d/preseedrandom				[10]
-	mergemaster -p					[5]
+							[6]
+	<reboot in single user>				[7]
+	/etc/rc.d/preseedrandom				[8]
+	mergemaster -p					[9]
 	make installworld
-	mergemaster					[4]
+	mergemaster					[10]
 	<reboot>
 
 
--- UPDATING.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: