diff --git a/distrib/notes/common/contents b/distrib/notes/common/contents
index d523dee96d63..5938d5c86539 100644
--- a/distrib/notes/common/contents
+++ b/distrib/notes/common/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.46 2002/04/10 19:01:59 scw Exp $
+.\"	$NetBSD: contents,v 1.47 2002/04/14 13:12:37 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -292,20 +292,6 @@ partitions.
 .\}
 .
 .
-.if r_arm32 \{\
-There are a collection of arm32 kernels in the
-.Pa arm32/kernels
-subdirectory of the
-.Nx \*V
-distribution. Some of these kernels
-contain a root file system image and should only be used for the
-initial installation. Some of the kernels only support a particular
-subset of the platforms that arm32 supports (See
-.Pa arm32/kernels/README
-for more details.)
-.\}
-.
-.
 .Ss2 Binary distribution sets
 The
 .Nx
@@ -338,7 +324,6 @@ everything described below.
 .if r_alpha .Em 22.7 MB gzipped, 59.8 MB uncompressed
 .if r_amiga .Em 15.6 MB gzipped, 41.4 MB uncompressed
 .if r_arc .Em 19.5 MB gzipped, 61.4 MB uncompressed
-.if r_arm32 .Em 19.2 MB gzipped, 47.4 MB uncompressed
 .if r_atari .Em 15.3 MB gzipped, 40.7 MB uncompressed
 .if r_hp300 .Em 15.7 MB gzipped, 41.5 MB uncompressed
 .if r_hpcmips .Em 19.5 MB gzipped, 61.4 MB uncompressed
@@ -372,7 +357,6 @@ system call and library manual pages.
 .if r_alpha .Em 18.1 MB gzipped, 81.2 MB uncompressed
 .if r_amiga .Em 11.8 MB gzipped, 39.5 MB uncompressed
 .if r_arc .Em 13.9 MB gzipped, 59.3 MB uncompressed
-.if r_arm32 .Em 13.8 MB gzipped, 45.4 MB uncompressed
 .if r_atari .Em 11.6 MB gzipped, 38.9 MB uncompressed
 .if r_hp300 .Em 11.8 MB gzipped, 39.5 MB uncompressed
 .if r_hpcmips .Em 13.8 MB gzipped, 59.4 MB uncompressed
@@ -410,7 +394,6 @@ This set includes the games and their manual pages.
 .\" Shareable within MACHINE_ARCH
 .if r_alpha .Em 3.1 MB gzipped, 7.6 MB uncompressed
 .if r_arm .Em 2.9 MB gzipped, ? MB uncompressed
-.if r_arm32 .Em 3.0 MB gzipped, 7.5 MB uncompressed
 .if r_i386 .Em 2.9 MB gzipped, 7.0 MB uncompressed
 .if r_m68k .Em 2.9 MB gzipped, 6.8 MB uncompressed
 .if r_mips .Em 3.0 MB gzipped, 7.9 MB uncompressed
@@ -436,7 +419,6 @@ install this distribution set.
 .if r_alpha .Em 2.1 MB gzipped, 5.0 MB uncompressed
 .if r_amiga .Em 1.1 MB gzipped, 2.4 MB uncompressed
 .if r_arc .Em 1.5 MB gzipped, 3.7 MB uncompressed
-.if r_arm32 .Em 1.1 MB gzipped, 2.3 MB uncompressed
 .if r_hp300 .Em 0.7 MB gzipped, 1.6 MB uncompressed
 .if r_hpcmips .Em 1.0 MB gzipped, 2.6 MB uncompressed
 .if r_i386 .Em 2.2 MB gzipped, 4.7 MB uncompressed
@@ -479,7 +461,6 @@ all related programs, and their manual pages.
 .\" Shareable within MACHINE_ARCH
 .if r_alpha .Em 1.4 MB gzipped, 5.1 MB uncompressed
 .if r_arm .Em 1.5 MB gzipped, ? MB uncompressed
-.if r_arm32 .Em 1.4 MB gzipped, 4.8 MB uncompressed
 .if r_i386 .Em 1.2 MB gzipped, 4.2 MB uncompressed
 .if r_m68k .Em 1.5 MB gzipped, 5.0 MB uncompressed
 .if r_mips .Em 1.3 MB gzipped, 5.6 MB uncompressed
@@ -513,7 +494,6 @@ the X servers.
 .\" Shareable within MACHINE_ARCH, except atari
 .if r_alpha .Em 3.6 MB gzipped, 13.7 MB uncompressed
 .if r_arm .Em ? MB gzipped, ? MB uncompressed
-.if r_arm32 .Em 3.2 MB gzipped, 9.5 MB uncompressed
 .if r_i386 .Em 2.7 MB gzipped, 7.9 MB uncompressed
 .if r_atari .Em 2.6 MB gzipped, 8.4 MB uncompressed
 .ie r_m68k .Em 2.6 MB gzipped, 8.2 MB uncompressed
@@ -531,7 +511,6 @@ The extra libraries and include files needed to compile X source code.
 .\" Shareable within MACHINE_ARCH
 .if r_alpha .Em 2.6 MB gzipped, 13.9 MB uncompressed
 .if r_arm .Em ? MB gzipped, ? MB uncompressed
-.if r_arm32 .Em 2.1 MB gzipped, 8.2 MB uncompressed
 .if r_i386 .Em 1.8 MB gzipped, 7.9 MB uncompressed
 .if r_m68k .Em 1.7 MB gzipped, 7.2 MB uncompressed
 .if r_mips .Em 2.1 MB gzipped, 9.5 MB uncompressed
@@ -548,7 +527,6 @@ Programs that were contributed to X.
 .\" Shareable within MACHINE_ARCH
 .if r_alpha .Em 0.2 MB gzipped, 0.8 MB uncompressed
 .if r_arm .Em ? MB gzipped, ? MB uncompressed
-.if r_arm32 .Em 0.2 MB gzipped, 0.7 MB uncompressed
 .if r_i386 .Em 0.2 MB gzipped, 0.5 MB uncompressed
 .if r_m68k .Em 0.2 MB gzipped, 0.7 MB uncompressed
 .if r_mips .Em 0.2 MB gzipped, 0.8 MB uncompressed
@@ -572,7 +550,6 @@ Miscellaneous X programs.
 .\" Shareable within MACHINE_ARCH
 .if r_alpha .Em ? MB gzipped, ? MB uncompressed
 .if r_arm .Em ? MB gzipped, ? MB uncompressed
-.if r_arm32 .Em ? MB gzipped, ? MB uncompressed
 .if r_i386 .Em ? MB gzipped, ? MB uncompressed
 .if r_m68k .Em ? MB gzipped, ? MB uncompressed
 .if r_mips .Em ? MB gzipped, ? MB uncompressed
@@ -596,12 +573,6 @@ Miscellaneous X programs.
 .Em 1.6 MB gzipped, 3.9 MB uncompressed
 .\}
 .
-.if r_arm32 \{\
-.It Sy xserver
-.br
-.Em 6.8 MB gzipped, 17.4 MB uncompressed
-.\}
-.
 .if r_atari \{\
 .It Sy xserver
 The Xservers and some programs not shared with the other m68k ports. Please
@@ -720,22 +691,12 @@ command from
 .
 .if r_acorn26 \{\
 .Pp
-Additional kernels to those included in the distribution sets may be found
-in the
-.Pa acorn26/binary/kernel
-subdirectory of the
-.Nx \*V
-distribution tree. These kernels are generally named something like
-.Pa netbsd.BOOT.gz
-or some other suitable name. Please note that these kernels are simply
-gzipped and are not in tar archives.
-.Pp
 There is a copy of the
 .Nx Ns /acorn26
 bootloader,
 .Ic boot26 ,
 in the
-.Pa acorn26/installation
+.Pa installation/misc
 subdirectory.  This is a RISC OS relocatable module, and should have its file
 type set to ffa (Module) once it's been copied to a RISC OS system.
 .\}
diff --git a/distrib/notes/common/macros b/distrib/notes/common/macros
index 952ab8ce012b..f2b01cac2f0b 100644
--- a/distrib/notes/common/macros
+++ b/distrib/notes/common/macros
@@ -1,4 +1,4 @@
-.\"	$NetBSD: macros,v 1.17 2002/03/29 21:36:18 bjh21 Exp $
+.\"	$NetBSD: macros,v 1.18 2002/04/14 13:12:37 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -370,12 +370,11 @@
 .define_all \*[MACHINE_LIST]
 .
 .\" Supported CPUs:
-.\"	arm alpha arm32 i386 m68k mips pc532 powerpc sh3 sparc sparc64 vax
+.\"	alpha arm i386 m68k mips pc532 powerpc sh3 sparc sparc64 vax
 .\" Define registers for MACHINE_ARCHs with multiple MACHINEs
 .
 .ds A \*M
-.if \n[acorn26]:\n[evbarm]:\n[hpcarm]:\n[netwinder] .ds A arm
-.if \n[acorn32]:\n[cats]:\n[shark] .ds A arm32
+.if \n[acorn26]:\n[acorn32]:\n[cats]:\n[evbarm]:\n[hpcarm]:\n[netwinder]:\n[shark] .ds A arm
 .if \n[amiga]:\n[atari]:\n[hp300]:\n[luna68k]:\n[mac68k]:\n[mvme68k]:\n[news68k]:\n[next68k]:\n[sun3]:\n[x68k] .ds A m68k
 .if \n[arc]:\n[cobalt]:\n[hpcmips]:\n[newsmips]:\n[pmax]:\n[sgimips] .ds A mips
 .if \n[amigappc]:\n[bebox]:\n[macppc]:\n[ofppc]:\n[prep] .ds A powerpc
diff --git a/distrib/notes/common/main b/distrib/notes/common/main
index c5b99d3a0c1c..911d0552d699 100644
--- a/distrib/notes/common/main
+++ b/distrib/notes/common/main
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.167 2002/04/11 06:36:12 lukem Exp $
+.\"	$NetBSD: main,v 1.168 2002/04/14 13:12:37 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -44,7 +44,7 @@
 .
 .nr FOR_RELEASE 1
 .nr DOC_XR 1
-.ds MACHINE_LIST algor alpha amiga amigappc arc acorn26 arm32 atari bebox cats
+.ds MACHINE_LIST algor alpha amiga amigappc arc acorn26 atari bebox cats
 .as MACHINE_LIST " cobalt dreamcast evbarm evbmips evbsh3 hp300 hpcmips hpcsh i386
 .as MACHINE_LIST " luna68k mac68k macppc mmeye mvme68k mvmeppc news68k newsmips
 .as MACHINE_LIST " next68k ofppc pc532 playstation2 pmax prep sbmips sgimips
diff --git a/distrib/notes/common/postinstall b/distrib/notes/common/postinstall
index e8f665a722fe..4ff85e9f649e 100644
--- a/distrib/notes/common/postinstall
+++ b/distrib/notes/common/postinstall
@@ -1,4 +1,4 @@
-.\"	$NetBSD: postinstall,v 1.31 2002/01/03 03:32:10 mbw Exp $
+.\"	$NetBSD: postinstall,v 1.32 2002/04/14 13:12:38 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -187,7 +187,7 @@ that may require modification or setting up include
 .Pa /etc/nsswitch.conf ,
 and
 .Pa /etc/wscons.conf .
-.ie r_arm32 \{\
+.ie r_shark \{\
 .Pp
 For Digital DNARD machines you will need to edit
 .Pa /etc/ttys
@@ -236,7 +236,7 @@ X11R6 FAQ.
 .br
 .Lk http://www.netbsd.org/Ports/macppc/x11.html
 .\}
-.if \n[arm32]:\n[i386] \{\
+.if \n[cats]:\n[i386]:\n[shark] \{\
 .Pp
 You will need to set up a configuration file, see
 .Pa /usr/X11R6/lib/X11/XF86Config.eg
diff --git a/distrib/notes/common/upgrade b/distrib/notes/common/upgrade
index 637f414d06a0..6890dc06ecdf 100644
--- a/distrib/notes/common/upgrade
+++ b/distrib/notes/common/upgrade
@@ -1,4 +1,4 @@
-.\"	$NetBSD: upgrade,v 1.12 2001/05/25 08:04:13 mbw Exp $
+.\"	$NetBSD: upgrade,v 1.13 2002/04/14 13:12:38 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,24 +33,6 @@
 .\"
 .
 .
-.ie r_arm32 \{\
-.
-Upgrading from a previous version of
-.Nx
-isn't currently supported by
-.Nx*M .
-If you are currently running
-.Nx*M
-then make a
-FULL BACKUP of your current installation, and install
-.Nx \*V
-from scratch. Obviously some of the steps can be skipped (in particular,
-hard disk partitioning) as they will already be done.
-.
-.\}
-.
-.el \{\
-.
 .Pp
 The upgrade to
 .Nx \*V
@@ -165,4 +147,3 @@ of the version of
 that you upgraded from and have since been removed from the
 .Nx
 distribution.
-.\}
diff --git a/distrib/notes/common/xfer b/distrib/notes/common/xfer
index 36643b607409..a52940b23df7 100644
--- a/distrib/notes/common/xfer
+++ b/distrib/notes/common/xfer
@@ -1,4 +1,4 @@
-.\"	$NetBSD: xfer,v 1.22 2002/04/01 11:10:19 skrll Exp $
+.\"	$NetBSD: xfer,v 1.23 2002/04/14 13:12:38 bjh21 Exp $
 .\"
 .\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -45,14 +45,6 @@ can boot gzipped kernels, so there's no need to gunzip it.
 .Pp
 .\} \" r_acorn26
 .
-.if r_arm32 \{\
-You will need to have an installation kernel and possibly a boot application.
-See
-.Pa arm32/ Ns Ar platform Ns Pa /prep
-for details.
-.Pp
-.\} \" r_arm32
-.
 .if r_cats \{\
 You will need to create a CD with an install kernel on it or have another
 machine available to allow net booting.