Finish the asbestos suited move of $mach/conf/*.$mach to conf/*.$mach.

Fix some more typos.

6 files changed, 8 insertions, 6 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 97cfe5c8e2cf..776d958bc90f 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -12,7 +12,7 @@
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
-#	/sys/alpha/conf/Makefile.alpha
+#	/sys/conf/Makefile.alpha
 # after which config should be rerun for all machines.
 #
 
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index a87234ea5b5b..581cf20c9cc5 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -12,7 +12,7 @@
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
-#	/sys/i386/conf/Makefile.i386
+#	/sys/conf/Makefile.i386
 # after which config should be rerun for all machines.
 #
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 986fa1845479..3d2da53c4603 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -11,6 +11,8 @@
 #	/sys/ia64/conf/``machineid''
 # after which you should do
 #	 config machineid
+# Generic makefile changes should be made in
+#	/sys/conf/Makefile.ia64
 # after which config should be rerun for all machines.
 #
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 172974119d04..cb103fb512ae 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -10,11 +10,11 @@
 # This makefile is constructed from a machine description:
 #	config machineid
 # Most changes should be made in the machine description
-#	/sys/i386/conf/``machineid''
+#	/sys/pc98/conf/``machineid''
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
-#	/sys/i386/conf/Makefile.i386
+#	/sys/conf/Makefile.pc98
 # after which config should be rerun for all machines.
 #
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 144476c8a7e3..acd850d4234d 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -12,7 +12,7 @@
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
-#	/sys/powerpc/conf/Makefile.powerpc
+#	/sys/conf/Makefile.powerpc
 # after which config should be rerun for all machines.
 #
 
diff --git a/sys/conf/Makefile.sparc64 b/sys/conf/Makefile.sparc64
index 8ab67f7b73c9..34396d1eea38 100644
--- a/sys/conf/Makefile.sparc64
+++ b/sys/conf/Makefile.sparc64
@@ -12,7 +12,7 @@
 # after which you should do
 #	 config machineid
 # Generic makefile changes should be made in
-#	/sys/sparc64/conf/Makefile.sparc64
+#	/sys/conf/Makefile.sparc64
 # after which config should be rerun for all machines.
 #