From 7595222a228c6cc813949a6e0b32a0e83163d92a Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 2 Mar 2001 00:36:13 +0000
Subject: [PATCH] Spell deprecated correctly (dufault) Suggest mergemaster in
 the 4.x-stable -> current upgrade (fenner) correct path to hints file
 (fenner)

Submitted by: dufault, fenner.
---
 UPDATING | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/UPDATING b/UPDATING
index 77c23929348b..855d08089ad6 100644
--- a/UPDATING
+++ b/UPDATING
@@ -34,7 +34,7 @@ ITEMS:'
 	do not include devfs in your kernel as problems result.
 
 20010205:
-	FFS_ROOT and CD9660_ROOT have been removed or depricated.
+	FFS_ROOT and CD9660_ROOT have been removed or deprecated.
 	Remove them from your config.
 
 20010122:
@@ -530,9 +530,10 @@ COMMON ITEMS:
 	-------------------------------------
 	make buildworld
 	make buildkernel KERNCONF=YOUR_KERNEL_HERE
-	cp src/sys/${MACHINE_ARCH}/arch/GENERIC.hints /boot/device.hints [2]
+	cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2]
 	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	make installworld
+	mergemaster
 	[1]
 	<reboot>