first pass de-suckification for 2015. modernize content a bit, fix dirty

rotten lies, improve wording, sync legalese with reality, yada yada yada.

distrib/notes/acorn32/legal

@@ -1,8 +1,6 @@
-.\"	$NetBSD: legal,v 1.3 2009/10/23 04:51:36 snj Exp $
+.\"	$NetBSD: legal,v 1.4 2015/05/09 08:13:34 snj Exp $
 .
 .It
-This product includes software developed by Advanced Risc Machines Ltd.
-.It
 This product includes software developed by the RiscBSD kernel team.
 .It
 This product includes software developed by Scott Stevens.

distrib/notes/acorn32/prep

@@ -1,4 +1,4 @@
-.\"	$NetBSD: prep,v 1.14 2009/04/23 01:56:48 snj Exp $
+.\"	$NetBSD: prep,v 1.15 2015/05/09 08:13:34 snj Exp $
 .
 First and foremost, before beginning the installation process,
 .Em make sure you have a reliable backup
@@ -14,7 +14,7 @@ We recommend that you get David Pilling's !SparkPlug.
 A self-extracting version of this
 can be found in the distribution directory at
 .Pa installation/misc/splug.bas
-or at David Pilling's web site:
+or at David Pilling's website:
 .Lk http://www.davidpilling.net/free.html
 .It
 A program to report your disk's geometry:

distrib/notes/acorn32/prep.RISCOS

@@ -1,4 +1,4 @@
-	$NetBSD: prep.RISCOS,v 1.22 2009/04/26 16:58:30 sborrill Exp $
+	$NetBSD: prep.RISCOS,v 1.23 2015/05/09 08:13:34 snj Exp $
 
 These instructions are specific to NetBSD/acorn32 on Acorn RISC OS platforms
 (RiscPC/A7000/A7000+/NC).
@@ -24,7 +24,7 @@ ought to help with the RISC OS installation specifically.
 
 1.1 Hardware
 
-Refer to the NetBSD installation notes and/or the web site
+Refer to the NetBSD installation notes and/or the website
 http://www.NetBSD.org/ports/acorn32/ for a list of supported hardware.
 
 
@@ -34,7 +34,7 @@ You will need the following RISC OS software:
 
 	A program that will unpack sparchives. We recommend that you
 	get David Pilling's !SparkPlug. A self-extracting version of this
-	can be found at David Pilling's web site
+	can be found at David Pilling's website
 	(http://www.davidpilling.net/free.html).
 
 	A program to report your disk's geometry:

distrib/notes/amd64/contents

@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.3 2015/01/11 04:03:47 snj Exp $
+.\"	$NetBSD: contents,v 1.4 2015/05/09 08:13:34 snj Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -57,9 +57,11 @@ kernel containing code for everything supported in this release.
 .			It Pa netbsd-INSTALL.gz
 The installation kernel.
 .			It Pa netbsd-INSTALL_XEN3_DOMU.gz
+An installation kernel for Xen domU instances.
 .			It Pa netbsd-XEN3_DOM0.gz
+A Xen dom0 kernel.
 .			It Pa netbsd-XEN3_DOMU.gz
-.
+A Xen domU kernel.
 .		tag) \" binary/kernel/
 .
 .		It Pa sets/
@@ -88,18 +90,14 @@ installation section below.
 .Ss2 Binary distribution sets
 The
 .Nx
-\*M
+\*V release for \*M is comprised of the following binary sets, which
-binary distribution sets contain the binaries which
+can be found in the
-comprise the
-.Nx
-\*V release for \*M.
-The binary distribution sets can be found in the
 .Pa \*M/binary/sets
 subdirectory
 of the
 .Nx
 \*V
-distribution tree, and are as follows:
+distribution tree:
 .(tag xserver \" sets
 .\"
 .\" XXX: most sets except kern and xserver should be shared
@@ -213,7 +211,7 @@ Configuration files for X which could be locally modified.
 .
 .It Sy xserver
 The X server. 
-This includes the modular Xorg server.
+This includes the modular X.Org server.
 .
 .tag) \" x sets
 .
@@ -226,9 +224,8 @@ This includes the modular Xorg server.
 .Pp
 The \*M binary distribution sets are distributed as gzipped tar files
 named with the extension
-.Sy .tgz ,
+.Sy .tgz
-e.g.
+.Pq e.g., Pa base.tgz .
-.Pa base.tgz .
 .
 .
 .Pp
@@ -237,7 +234,7 @@ well for the binary sets, but it is worth noting that if you use that
 method, the filenames stored in the sets are relative and therefore
 the files are extracted
 .Em below the current directory .
-Therefore, if you want to extract the binaries into your system, i.e.
+Therefore, if you want to extract the binaries into your system, i.e.,
 replace the system binaries with them, you have to run the
 .Ic "tar -xzpf"
 command from the root directory (

distrib/notes/cats/legal

@@ -1,8 +1,6 @@
-.\"	$NetBSD: legal,v 1.3 2009/10/23 04:51:37 snj Exp $
+.\"	$NetBSD: legal,v 1.4 2015/05/09 08:13:34 snj Exp $
 .
 .It
-This product includes software developed by Advanced Risc Machines Ltd.
-.It
 This product includes software developed by the RiscBSD kernel team.
 .It
 This product includes software developed by Scott Stevens.

distrib/notes/common/legal.common

@@ -1,4 +1,4 @@
-.\"	$NetBSD: legal.common,v 1.92 2012/01/21 04:43:54 isaki Exp $
+.\"	$NetBSD: legal.common,v 1.93 2015/05/09 08:13:34 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -52,7 +52,7 @@ This product includes software developed by The NetBSD
 Foundation, Inc. and its contributors.
 .It
 This product includes software developed for the
-NetBSD Project.  See http://www.netbsd.org/ for
+NetBSD Project.  See http://www.NetBSD.org/ for
 information about NetBSD.
 .It
 This product includes software developed by Intel Corporation and
@@ -99,14 +99,13 @@ Hannum.
 .It
 This product includes software developed by Adam Glass.
 .It
-This product includes software developed by Advanced Risc Machines
-Ltd.
-.It
 This product includes software developed by Alex Zepeda, and
 Colin Wood for the NetBSD Projet.
 .It
 This product includes software developed by Alex Zepeda.
 .It
+This product includes software developed by Allen Briggs
+.It
 This product includes software developed by Amancio Hasty and
 Roger Hardiman
 .It
@@ -164,22 +163,20 @@ and Michael L. Hitch.
 This product includes software developed by Daniel Widenfalk
 for the NetBSD Project.
 .It
+This product includes software developed by David Miller.
+.It
 This product includes software developed by Dean Huxley.
 .It
+This product includes software developed by Emmanuel Dreyfus
+.It
 This product includes software developed by Eric S. Hvozda.
 .It
 This product includes software developed by Eric S. Raymond
 .It
-This product includes software developed by Eric Young (eay@@mincom.oz.au)
-.It
 This product includes software developed by Eric Young (eay@cryptsoft.com)
 .It
 This product includes software developed by Eric Young (eay@mincom.oz.au)
 .It
-This product includes software developed by K. Kobayashi.
-.It
-This product includes software developed by K. Kobayashi and H. Shimokawa.
-.It
 This product includes software developed by Ezra Story and  by Kari
 Mettinen.
 .It
@@ -194,8 +191,6 @@ Mettinen, and Michael Teske.
 .It
 This product includes software developed by Ezra Story.
 .It
-This product includes software developed by Florian Stoehr.
-.It
 This product includes software developed by Frank van der Linden for
 the NetBSD Project.
 .It
@@ -218,16 +213,18 @@ This product includes software developed by Herb Peyerl.
 .It
 This product includes software developed by Hidetoshi Shimokawa.
 .It
-This product includes software developed by Ian W. Dall.
+This product includes software developed by Hubert Feyrer for
+the NetBSD Project.
 .It
-This product includes software developed by Ignatios Souvatzis
+This product includes software developed by Ian W. Dall.
-for the NetBSD Project.
 .It
 This product includes software developed by Internet
 Initiative Japan Inc.
 .It
 This product includes software developed by James R. Maynard III.
 .It
+This product includes software developed by Jared D. McNeill.
+.It
 This product includes software developed by Jason L. Wright
 .It
 This product includes software developed by Jason R. Thorpe
@@ -254,8 +251,15 @@ and Jason R. Thorpe for the NetBSD Project.
 .It
 This product includes software developed by Jonathan Stone.
 .It
+This product includes software developed by Jonathan Stone for
+the NetBSD Project.
+.It
 This product includes software developed by Julian Highfield.
 .It
+This product includes software developed by K. Kobayashi.
+.It
+This product includes software developed by K. Kobayashi and H. Shimokawa.
+.It
 This product includes software developed by Kazuhisa Shimizu.
 .It
 This product includes software developed by Kazuki Sakamoto.
@@ -268,9 +272,6 @@ This product includes software developed by Klaus Burkert,by Bernd
 Ernesti, by Michael van Elst, and by the University of California,
 Berkeley and its contributors.
 .It
-This product includes software developed by LAN Media Corporation
-and its contributors.
-.It
 This product includes software developed by Lloyd Parkes.
 .It
 This product includes software developed by Lutz Vieweg.
@@ -291,6 +292,8 @@ This product includes software developed by Mark Tinguely and Jim Lowe
 .It
 This product includes software developed by Markus Wild.
 .It
+This product includes software developed by Marshall M. Midden.
+.It
 This product includes software developed by Masanobu Saitoh.
 .It
 This product includes software developed by Masaru Oki.
@@ -313,6 +316,8 @@ Brandon Creighton and Job de Haas.
 .It
 This product includes software developed by Niklas Hallqvist.
 .It
+This product includes software developed by Paolo Abeni.
+.It
 This product includes software developed by Paul Kranenburg.
 .It
 This product includes software developed by Paul Mackerras.
@@ -325,6 +330,8 @@ This product includes software developed by Phase One, Inc.
 .It
 This product includes software developed by Philip A. Nelson.
 .It
+This product includes software developed by QUALCOMM Incorporated.
+.It
 This product includes software developed by RiscBSD.
 .It
 This product includes software developed by Roar Thronæs.
@@ -362,6 +369,9 @@ for the NetBSD Project.
 .It
 This product includes software developed by Terrence R. Lambert.
 .It
+This product includes software developed by Texas A&M University
+and its contributors.
+.It
 This product includes software developed by TooLs GmbH.
 .It
 This product includes software developed by Trimble Navigation, Ltd.
@@ -371,15 +381,8 @@ its contributors.
 .It
 This product includes software developed by Waldi Ravens.
 .It
-This product includes software developed by Wasabi Systems for
-Zembu Labs, Inc. http://www.zembu.com/
-.It
 This product includes software developed by Winning Strategies, Inc.
 .It
-This product includes software developed by Wolfgang Solfrank.
-.It
-This product includes software developed by Yasushi Yamasaki.
-.It
 This product includes software developed by Yen Yen Lim and
 North Dakota State University.
 .It
@@ -387,13 +390,6 @@ This product includes software developed by Zembu Labs, Inc.
 .It
 This product includes software developed by the Alice Group.
 .It
-This product includes software developed by the Center
-for Software Science at the University of Utah.
-.It
-This product includes software developed by the Charles D. Cranor,
-Washington University, University of California, Berkeley and
-its contributors.
-.It
 This product includes software developed by the Computer Systems
 Engineering Group at Lawrence Berkeley Laboratory.
 .It
@@ -402,6 +398,9 @@ This product includes software developed by the David Muir Sharnoff.
 This product includes software developed by the Harvard
 University and its contributors.
 .It
+This product includes software developed by the Kungliga Tekniska
+H\(:ogskolan and its contributors.
+.It
 This product includes software developed by the Network Research
 Group at Lawrence Berkeley Laboratory.
 .It
@@ -451,15 +450,9 @@ This product includes software developed for the NetBSD Project
 by Christopher G. Demetriou.
 .It
 This product includes software developed for the NetBSD Project
-by Emmanuel Dreyfus.
-.It
-This product includes software developed for the NetBSD Project
 by Frank van der Linden
 .It
 This product includes software developed for the NetBSD Project
-by Ignatios Souvatzis.
-.It
-This product includes software developed for the NetBSD Project
 by Jason R. Thorpe.
 .It
 This product includes software developed for the NetBSD Project
@@ -483,6 +476,9 @@ This product includes software developed for the NetBSD Project by
 Allegro Networks, Inc., and Wasabi Systems, Inc.
 .It
 This product includes software developed for the NetBSD Project by
+Eiji Kawauchi.
+.It
+This product includes software developed for the NetBSD Project by
 Genetec Corporation.
 .It
 This product includes software developed for the NetBSD Project by
@@ -521,8 +517,6 @@ Laboratory at the University of Utah.
 This product includes software developed by Computing Services
 at Carnegie Mellon University (http://www.cmu.edu/computing/).
 .It
-This product includes software developed by Marshall M. Midden.
-.It
 This product includes software developed or owned by Caldera
 International, Inc.
 .It

distrib/notes/common/macros

@@ -1,4 +1,4 @@
-.\"	$NetBSD: macros,v 1.40 2014/03/31 11:25:47 martin Exp $
+.\"	$NetBSD: macros,v 1.41 2015/05/09 08:13:34 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -397,7 +397,7 @@
 .if \n[acorn26]:\n[acorn32]:\n[cats]:\n[evbarm]:\n[hpcarm]:\n[iyonix]:\n[netwinder]:\n[shark]:\n[zaurus] .ds A arm
 .if \n[sun2] .ds A m68000
 .if \n[amiga]:\n[atari]:\n[cesfic]:\n[hp300]:\n[luna68k]:\n[mac68k]:\n[mvme68k]:\n[news68k]:\n[next68k]:\n[sun3]:\n[x68k] .ds A m68k
-.if \n[ews4800mips]:\n[mipsco]:\n[newsmips]:\n[sbmips]:\n[sgimips] .ds A mipseb
+.if \n[emips]:\n[ews4800mips]:\n[mipsco]:\n[newsmips]:\n[sbmips]:\n[sgimips] .ds A mipseb
 .if \n[algor]:\n[arc]:\n[cobalt]:\n[evbmips]:\n[hpcmips]:\n[playstation2]:\n[pmax] .ds A mipsel
 .if \n[amigappc]:\n[bebox]:\n[evbppc]:\n[ibmnws]:\n[macppc]:\n[mvmeppc]:\n[ofppc]:\n[prep]:\n[rs6000]:\n[sandpoint] .ds A powerpc
 .if \n[evbsh3]:\n[mmeye] .ds A sh3eb

distrib/notes/common/main

@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.518 2015/04/27 12:26:35 hikaru Exp $
+.\"	$NetBSD: main,v 1.519 2015/05/09 08:13:35 snj Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -42,15 +42,15 @@
 .nr FOR_RELEASE 1
 .nr DOC_XR 1
 .ds MACHINE_LIST acorn26 acorn32 algor alpha amd64 amiga amigappc arc atari
-.as MACHINE_LIST " bebox cats cesfic cobalt dreamcast evbarm evbmips evbppc
+.as MACHINE_LIST " bebox cats cesfic cobalt dreamcast emips evbarm evbmips
-.as MACHINE_LIST " evbsh3 ews4800mips hp300 hppa hpcarm hpcmips hpcsh i386
+.as MACHINE_LIST " evbppc evbsh3 ews4800mips hp300 hppa hpcarm hpcmips hpcsh
-.as MACHINE_LIST " ibmnws iyonix landisk luna68k mac68k macppc mipsco mmeye
+.as MACHINE_LIST " i386 ibmnws iyonix landisk luna68k mac68k macppc mipsco
-.as MACHINE_LIST " mvme68k mvmeppc netwinder news68k newsmips next68k ofppc
+.as MACHINE_LIST " mmeye mvme68k mvmeppc netwinder news68k newsmips next68k
-.as MACHINE_LIST " playstation2 pmax prep rs6000 sandpoint sbmips
+.as MACHINE_LIST " ofppc playstation2 pmax prep rs6000 sandpoint sbmips
 .as MACHINE_LIST " sgimips shark sparc sparc64 sun2 sun3 vax x68k xen zaurus .
 .so \*[.CURDIR]/../common/macros
 .
-.Dd August 17, 2012
+.Dd May 9, 2015
 .Dt INSTALL 8
 .Os NetBSD
 .Sh NAME
@@ -114,7 +114,7 @@ Fetch files needed to install
 .Nx .
 .if \n[i386]:\n[amd64] \{\
 .Pp
-Option 1: bootable CD-ROM images or USB memstick images containing the
+Option 1: bootable CD-ROM images or USB images containing the
 full distribution.
 .Pp
 These can be found
@@ -215,7 +215,7 @@ When you boot the install
 .if \n[sparc] floppies or CD-ROM,
 .if \n[sparc64] CD-ROM or installation kernel,
 the installation program
-can fetch these files for you (using e.g. ftp)
+can fetch these files for you (using, e.g., ftp)
 if you have a network connection.
 There are several other methods to get the binary sets onto
 your machine.
@@ -241,7 +241,23 @@ Write the boot images
 .Pp
 Many commercial and freeware programs are available to burn CD-ROMs.
 .Pp
-.if \n[i386] \{\
+If installing via USB, you must first uncompress the USB image, which
+is gzipped.
+.Dl $ Ic "gunzip NetBSD-\*V-\*M-install.img.gz"
+Next, write the USB image to a USB stick/drive.
+Note that this will overwrite any existing data on the device that you
+specify, so double check the device before running!
+On
+.Ul
+operating systems, use a command similar to the following,
+replacing
+.Pa /dev/rsd0d
+with the appropriate device for your system:
+.Dl # Ic "dd if=NetBSD-\*V-\*M-install.img of=/dev/rsd0d bs=32k"
+On Windows, you will need to use a program such as Win32 Disk Imager,
+which can be found at
+.Lk http://sourceforge.net/projects/win32diskimager/
+.if \n[amd64]:\n[i386] \{
 If you have problems writing a raw image to a floppy,
 the
 .Ic rawrite.exe
@@ -251,7 +267,7 @@ or the
 Windows32 program (installed by
 .Pa rawr32.exe )
 in the
-.Pa i386/installation/misc/
+.Pa \*M/installation/misc/
 directory may be of help.
 .\}
 .\}
@@ -287,7 +303,7 @@ or
 partition.
 .\}
 .Pp
-The disk(s) you just prepared will be used to boot the installation
+The media you just prepared will be used to boot the installation
 kernel, which contains all the tools required to install
 .Nx .
 .if \n[macppc] \{\
@@ -417,7 +433,8 @@ For third-party programs which are not part of the base
 .Nx
 distribution, you will want to explore the
 .Ic pkgsrc
-system with its many thousands of third party software applications.
+package management system, which contains thousands of third party software
+applications.
 .El
 .\}
 .Ss "What is NetBSD?"
@@ -431,17 +448,16 @@ Operating System is a fully functional
 operating system derived from the University of California, Berkeley
 Networking Release 2 (Net/2), 4.4BSD-Lite, and 4.4BSD-Lite2 sources.
 .Nx
-runs on 57 different system architectures (ports)
+runs on many different different system architectures (ports)
-across 15 distinct CPU families, and is being ported to more.
+across a variety of distinct CPU families, and is being ported to more.
 The
 .Nx
-\*V release contains complete binary releases for many different
+\*V release contains complete binary releases for most of these
-system architectures.
+system architectures, with preliminary support for the others included in
-(A few ports are not fully supported at this time 
+source form.
-and are thus not part of the binary distribution.
 Please see the
 .Nx
-web site at
+website at
 .Lk http://www.NetBSD.org/
 for information on them.)
 .Pp
@@ -459,19 +475,19 @@ and numerous other tools, all accompanied by full source code.
 .Nx
 is a creation of the members of the Internet community.
 Without the unique cooperation and coordination the net makes
-possible, it's likely that
+possible,
 .Nx
-wouldn't exist.
+would not exist.
 .
 .if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 5.0 and 6.0 Releases
+.Ss Changes Between The NetBSD 6.0 and 7.0 Releases
 .Pp
 The
 .Nx
 \*V release
-provides numerous significant functional enhancements, including
+provides many significant changes, including support for many new
-support for many new devices, integration of hundreds of bug fixes,
+devices, hundreds of bug fixes, new and updated kernel subsystems, and
-new and updated kernel subsystems, and many user-land enhancements.
+numerous userland enhancements.
 The result of these improvements is a stable operating system fit for
 production use that rivals most commercially available systems.
 .Pp
@@ -481,11 +497,11 @@ went into the
 \*V release.
 The complete list of changes can be found in the
 CHANGES:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0/CHANGES
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-7.0/CHANGES
 and
-CHANGES-6.0:
+CHANGES-7.0:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0/CHANGES-6.0
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-7.0/CHANGES-7.0
-files in the top level directory of the NetBSD 6.0 release tree.
+files in the top level directory of the NetBSD 7.0 release tree.
 .Pp
 .\" fill in with changes.mdoc
 .
@@ -500,23 +516,13 @@ in the future:
 in favor of
 .Xr dhcpcd 8 .
 .It
-.Xr groff 1
+.Xr groff 1 .
-is being phased out.
+Man pages are now handled with
-Man pages are handled with
 .Xr mandoc 1 ,
 and
 .Xr groff 1
 can still be found in pkgsrc as
 .Pa textproc/groff .
-.It
-.Xr kame_ipsec 4
-has been replaced by
-.Xr fast_ipsec 4 .
-The option to use the old implementation (see
-.Xr options 4 )
-will be removed in the next
-.Nx
-release.
 .bullet)
 .
 .Ss "The NetBSD Foundation"
@@ -556,9 +562,9 @@ The root directory of the
 .Pa .../NetBSD-\*V/
 .(tag README.files
 .It Li CHANGES
-Changes between the 5.0 and 6.0 releases.
+Changes between the 6.0 and 7.0 releases.
-.It Li CHANGES-6.0
+.It Li CHANGES-7.0
-Changes between the initial 6.0 branch and final release of 6.0.
+Changes between the initial 7.0 branch and final release of 7.0.
 .It Li CHANGES.prev
 Changes in previous
 .Nx
@@ -567,6 +573,9 @@ releases.
 Last minute changes and notes about the release.
 .It Li README.files
 README describing the distribution's contents.
+.It Pa images/
+Images (ISO 9660 or USB) for installing NetBSD.
+Depending on your system, these may be bootable.
 .It Pa source/
 Source distribution sets; see below.
 .tag)
@@ -917,11 +926,9 @@ We'd like your input.
 There are various mailing lists available via the mailing list
 server at
 .Mt majordomo@NetBSD.org .
-To get help on using the mailing
+See
-list server, send mail to that address with an empty body, and it will
-reply with instructions.  See
 .Lk http://www.NetBSD.org/mailinglists/
-for a web interface.
+for details.
 .Pp
 There are various mailing lists set up to deal with comments and
 questions about this release.
@@ -951,15 +958,17 @@ port, you probably should contact the
 of that port (listed
 below).
 .Pp
-If you'd like to help with this effort, and have an idea as to how
+If you'd like to help with
-you could be useful, send us mail or subscribe to:
+.Nx ,
+and have an idea as to how you could be useful, send us mail or subscribe to:
 .Mt netbsd-users@NetBSD.org .
 .Pp
 As a favor, please avoid mailing huge documents or files to these
 mailing lists.
 Instead, put the material you would have sent up for FTP or WWW somewhere,
-then mail the appropriate list about it, or, if you'd rather not do that,
+then mail the appropriate list about it. 
-mail the list saying you'll send the data to those who want it.
+If you'd rather not do that, mail the list saying you'll send the data to
+those who want it.
 .
 .Ss Thanks go to
 .
@@ -992,9 +1001,6 @@ services server.
 The Columbia University Computer Science Department for hosting
 the NYC build cluster.
 .It
-The Western Washington University Computer Science Department
-for running the WWU build cluster.
-.It
 The many organizations that provide
 .Nx
 mirror sites.
@@ -1093,11 +1099,9 @@ If you're one of them, and would like to be mentioned, tell us!)
 .It Ta Stephen Borrill Ta Mt sborrill@NetBSD.org
 .It Ta Manuel Bouyer Ta Mt bouyer@NetBSD.org
 .It Ta David Brownlee Ta Mt abs@NetBSD.org
-.It Ta James Chacon Ta Mt jmc@NetBSD.org
 .It Ta Julian Coleman Ta Mt jdc@NetBSD.org
 .It Ta Alistair G. Crooks Ta Mt agc@NetBSD.org
 .It Ta H\(oavard Eidnes Ta Mt he@NetBSD.org
-.It Ta John Heasley Ta Mt heas@NetBSD.org
 .It Ta Martin Husemann Ta Mt martin@NetBSD.org
 .It Ta Soren Jacobsen Ta Mt snj@NetBSD.org
 .It Ta Phil Nelson Ta Mt phil@NetBSD.org

distrib/notes/common/postinstall

@@ -1,4 +1,4 @@
-.\"	$NetBSD: postinstall,v 1.79 2014/04/12 18:30:39 snj Exp $
+.\"	$NetBSD: postinstall,v 1.80 2015/05/09 08:13:35 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -29,6 +29,9 @@ things you need to do in order to bring the system into a properly
 configured state.
 The most important steps are described below.
 .(enum
+Before all else, read
+.Xr postinstall 8 .
+.It
 Configuring
 .Pa /etc/rc.conf
 .Pp
@@ -263,7 +266,7 @@ Logging in
 After reboot, you can log in as
 .Li root
 at the login prompt.
-Unless you've set a password in
+If you didn't set a password in
 .Ic sysinst ,
 there
 is no initial password.
@@ -332,7 +335,7 @@ pkgsrc automatically handles any changes necessary to make the
 software run on
 .Nx .
 This includes the retrieval and installation of any other
-packages on which the software may depend.
+packages the software may depend upon.
 .Pp
 .(bullet
 More information on the package system is available at

distrib/notes/common/sysinst

@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysinst,v 1.104 2014/03/31 11:25:47 martin Exp $
+.\"	$NetBSD: sysinst,v 1.105 2015/05/09 08:13:35 snj Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -76,7 +76,7 @@ Using
 installing
 .Nx
 is a relatively easy process.
-Still, you should read this document and have it in hand when doing the
+Still, you should read this document and have it available during the
 installation process.
 This document tries to be a good guide to the installation, and as such,
 covers many details for the sake of completeness.
@@ -145,14 +145,12 @@ not a problem on the 68020 and 68030 processors.
 .Em General
 .Pp
 The following is a walk-through of the steps you will take while
-getting
+installing
 .Nx
-installed on your hard disk.
+on your hard disk.
 .Ic sysinst
-is a menu driven
+is a menu driven program that guides you through the installation process.
-installation system that allows for some freedom in doing the
+Sometimes questions will be asked, and in many cases
-installation.
-Sometimes, questions will be asked and in many cases
 the default answer will be displayed in brackets
 .Pq Dq \&[\ ]
 after the question.
@@ -171,13 +169,14 @@ First, let's describe a quick install.
 The other sections of this document go into the installation procedure in more
 detail, but you may find that you do not need this.
 If you want detailed instructions, skip to the next section.
-This section describes a basic installation, using a CD-ROM install as
+This section describes a basic installation, using a CD / DVD
-an example.
+.if \n[i386]:\n[amd64] (or USB stick)
+as the install media.
 .Pp
 .(bullet
 What you need.
 .(bullet
-The distribution sets (in this example, they are on CD).
+The distribution sets (in this example, they are on the CD or DVD).
 .if !\n[alpha]:\n[amd64]:\n[i386]:\n[pmax]:\n[sgimips]:\n[sparc64] \{\
 .It
 .ie \n[ews4800mips] Two floppy disks.
@@ -208,12 +207,9 @@ A Macintosh with a 68020 and MMU, 68030 or 68RC040 processor.
 An FPU is not required but will be used if present
 (but see the note above regarding the 68LC040).
 .\}
-.It
-A CD-ROM drive
-.ie \n[acorn26]:\n[atari]:\n[alpha]:\n[amd64]:\n[cats]:\n[evbppc]:\n[i386]:\n[macppc]:\n[sparc64] (SCSI or ATAPI),
-.el (SCSI),
 .ie !\n[amd64] \{\
-a hard disk and a minimum of
+.It
+A minimum of
 .if \n[acorn26] 8 MB
 .if \n[alpha] 32 MB
 .if \n[arc] 16 MB
@@ -233,36 +229,52 @@ a hard disk and a minimum of
 .if \n[sgimips] 16 MB
 of memory installed.
 \}
-.el and a hard disk.
 .It
-The hard disk should have at least
+An optical drive.
-.if \n[acorn26] 200
+.It
-.if \n[alpha] 200
+A hard drive with at least
-.if \n[amd64] 200
+.if \n[acorn26] 500
-.if \n[arc] 200
+.if \n[acorn32] 500
-.if \n[atari] 120
+.if \n[alpha] 700
-.if \n[cats] 200
+.if \n[amd64] 700
-.if \n[ews4800mips] 200
+.if \n[amiga] 500
-.if \n[hppa] 200
+.if \n[arc] 600
-.if \n[i386] 200
+.if \n[atari] 500
-.if \n[mac68k] 120
+.if \n[bebox] 600
-.if \n[macppc] 200
+.if \n[cats] 500
-.if \n[mvme68k] 100
+.if \n[emips] 600
-.if \n[news68k] 100
+.if \n[evbarm] 500
-.if \n[newsmips] 200
+.if \n[evbppc] 600
-.if \n[pmax] 200
+.if \n[ews4800mips] 600
-.if \n[sparc] 200
+.if \n[hp300] 500
-.if \n[sparc64] 200
+.if \n[hpcarm] 500
-.if \n[sgimips] 200
+.if \n[hpcmips] 600
-+
+.if \n[hpcsh] 500
-.Em n
+.if \n[hppa] 600
-megabytes of
+.if \n[i386] 600
-space free, where
+.if \n[landisk] 500
-.Em n
+.if \n[mac68k] 500
-is the number of megabytes of
+.if \n[macppc] 600
-main memory in your system.
+.if \n[mmeye] 500
+.if \n[mvme68k] 500
+.if \n[news68k] 500
+.if \n[newsmips] 600
+.if \n[next68k] 500
+.if \n[ofppc] 600
+.if \n[pmax] 600
+.if \n[prep] 600
+.if \n[rs6000] 600
+.if \n[sandpoint] 600
+.if \n[sgimips] 600
+.if \n[shark] 500
+.if \n[sparc] 500
+.if \n[sparc64] 700
+.if \n[sun3] 500
+.if \n[vax] 500
+.if \n[x68k] 500
+MB of free space for a complete base install, not including room for swap.
 If you wish to install the X Window System as well, you will need at least
-215 MB more.
+225 MB more.
 .bullet)
 .if \n[ews4800mips]:\n[news68k]:\n[newsmips] \{\
 .It
@@ -459,10 +471,11 @@ it may be more convenient.
 Go back to the main menu.
 .It
 Choose
-.if !\n[macppc] .Me install .
+.if !\n[macppc] .Me Install .
 .if \n[macppc] \{\
 .Me "Utility menu" No then Me "Run /bin/sh"
-for Open Firmware 3 systems.  You'll need to create the 
+for Open Firmware 3 systems.
+You'll need to create the 
 .Nx
 filesystem(s) and an
 .Pa fstab .
@@ -470,14 +483,13 @@ Now exit the shell, return to the main menu, and choose
 .Me "Re-install" .
 .Pp
 Choose
-.Me install
+.Me Install
 for Open Firmware 1.0.5, 1.1.22, 2.0.x, and 2.4 systems.
 .\}
 .It
-You will be guided through some steps regarding the
+You will be guided through the setup of your disk.
-setup of your disk, and the selection of distributed components
+.It
-to install.
+You will be asked to choose which distribution sets to install.
-When in doubt, refer to the rest of this document for details.
 .if \n[atari] \{\
 WARNING: If you want your disk to retain an AHDI compatible partitioning,
 make sure to use the 'existing' disk layout.
@@ -486,41 +498,32 @@ make sure to use the 'existing' disk layout.
 .Pp
 WARNING: If you are installing onto a disk which you want to use with 
 .Tn Solaris ,
-stop here.  You will need to perform a manual installation as 
+stop here.
+You will need to perform a manual installation as 
 .Ic sysinst
 overwrites the
 .Tn Solaris
-partition table.  See the section on
+partition table.
+See the section on
 .Sx "Manual Installation of NetBSD using Solaris"
 .\}
 .It
-After your disk has been prepared, choose
+When prompted, choose
-.ie \n[sgimips] \{\
-.Me Unmounted file system
-as the medium.
-The CD-ROM device is usually cd0 and the partition
-.Sq a
-.Pq i.e. cd0a .
-.\}
-.el \{\
 .Me CD-ROM
-as the medium
+as the install medium if booted from CD-ROM.
+The default values for the path and device should be ok
 .if \n[amd64]:\n[i386] \{\
-if booted from CD-ROM, or
+If you booted using a USB image, choose
-.Me Local directory
+.Me Local directory .
-if booted from USB memstick
-.\}
-\&.
-The default values for the path and device should be ok.
 .\}
 .It
-After all the files have been unpacked, go back to
+After the installation process has completed, you will be brought back to
-the main menu and select
+the main menu, where you should select
 .ie \n[alpha]:\n[amd64]:\n[i386]:\n[mac68k]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
-.Me reboot.
+.Me Reboot.
 .\}
 .el \{\
-.Me reboot ,
+.Me Reboot ,
 after you have removed the bootfloppy from the drive.
 .\}
 .It
@@ -539,16 +542,15 @@ OSLoadFilename and OSLoadOptions and then boot the hard drive.
 .\}
 .Nx
 will now boot.
-If you haven't already done so in
+If you didn't set a password for the
-.Ic sysinst ,
-you should log in as
 .Li root
-and set a password for that account.
+user when prompted by
-You are also advised to edit
+.Ic sysinst ,
-.Pa /etc/rc.conf
+logging in as
-to match your needs.
+.Li root
-.It
+and setting a password should be your first task.
-Your installation is now complete.
+You are also advised to read
+.Xr afterboot 8 .
 .bullet)
 .bullet)
 .It
@@ -676,7 +678,7 @@ Boot the system as described in the "Booting the installer" section above.
 .\}
 .el \{\
 Boot your machine.
-The boot loader will start, and will print a countdown and begin booting.
+The boot loader will start, which will print a countdown and begin booting.
 .if !\n[alpha]:\n[amd64]:\n[i386] \{\
 .Pp
 If the boot loader messages do not appear in a reasonable
@@ -718,7 +720,7 @@ The most important thing to know is that
 .Li wd0
 is
 .Nx Ns 's
-name for your first IDE disk,
+name for your first SATA/PATA disk,
 .Li wd1
 the second, etc.
 .Li sd0
@@ -726,7 +728,7 @@ is your first SCSI disk,
 .Li sd1
 the second, etc.
 .Pp
-.if !\n[alpha]:\n[amd64]:\n[atari]:\n[i386]:\n[mac68k] \{\
+.if !\n[alpha]:\n[amd64]:\n[atari]:\n[evbarm]:\n[evbppc]:\n[hpcarm]:\n[i386]:\n[mac68k] \{\
 Note that once the system has finished booting, you need not
 leave the floppy in the disk drive.
 .\}
@@ -813,7 +815,8 @@ with the name of your destination hard drive):
 .Pp
 This will print out the partition info that was generated by 
 .Ic pdisk ,
-Drive Setup, or Disk Utility.  Note that, as discussed above in the
+Drive Setup, or Disk Utility.
+Note that, as discussed above in the
 .Sx Partitioning your hard drive for NetBSD
 section, your
 .Em "A/UX Root"
@@ -960,14 +963,14 @@ or
 .Li rz1
 .\}
 .el \{\
-.if \n[acorn26]:\n[alpha]:\n[cats]:\n[i386]:\n[mac68k]:\n[macppc]:\n[sparc64] \{\
+.if \n[acorn26]:\n[alpha]:\n[amd64]:\n[cats]:\n[i386]:\n[mac68k]:\n[macppc]:\n[sparc64] \{\
 .Li wd0 ,
 .Li wd1 ,
 .\}
 .Li sd0
 or
 .Li sd1 .
-.if \n[i386] \{\
+.if \n[amd64]:\n[i386] \{\
 .Pp
 .Ic sysinst
 next tries to figure out the real and BIOS geometry
@@ -1026,7 +1029,7 @@ on a dedicated drive, just answer 'no' and skip to the next section.
 If you answer 'yes', the
 .Ic ahdilabel
 program is started.
-You can now change the AHDI partition ID's on your root disk.
+You can now change the AHDI partition IDs on your root disk.
 Because NetBSD imposes a special ordering in disk partitions it uses
 for / (root) and swap.
 Also, because it wants to guard you against an unwanted
@@ -1034,7 +1037,7 @@ demolition of partitions used by other systems, you have to tell it what
 partitions it is allowed to use.
 You have to mark the partition you want to use as swap SWP or
 (deprecated!) NBS and the other partitions as NBD.
-Note that all the changes you make to the ID's are reversible as long as
+Note that all the changes you make to the IDs are reversible as long as
 you remember the original value.
 ahdilabel is capable of creating or changing an
 AHDI compatible partitioning on the disk, and
@@ -1042,7 +1045,7 @@ in the partition-ID editor, the partitions are shown in the order that AHDI
 created them.
 When you leave this editor and continue with
 .Ic sysinst,
-your changes to the ID's do have consequences to the partition order!
+your changes to the IDs do have consequences to the partition order!
 They will show up as follows:
 .(tag 13n -offset indent
 .It Li a
@@ -1059,7 +1062,7 @@ the rest of the partitions in AHDI order
 You can skip a few steps, down to
 .Sq Em "Getting the distribution sets" ,
 if you are installing onto a drive with an Apple Partition Map (Open 
-Firmware 3), i.e. you selected
+Firmware 3), i.e., you selected
 .Me "Re-install sets or install additional sets"
 from the main menu.
 .\} \" \n[macppc]
@@ -1070,14 +1073,15 @@ Please note that shared installs of
 and 
 .Nx
 on the same drive have not been tested, and as such may cause problems 
-or may not work.  It is
+or may not work.
+It is
 .Em strongly
 recommended that all data is backed before attempting such installs.
 .bullet)
 .\} \" \n[sgimips]
 .if !\n[atari]:\n[macppc]:\n[sgimips] \{\
 .(bullet
-Which portion of the disk to use.
+Choosing which portion of the disk to use.
 .Pp
 You will be asked if you want to use the entire disk or
 only part of the disk.
@@ -1346,28 +1350,6 @@ uses for normal file storage is called
 A swap partition has a special type called
 .Sy swap .
 .
-.if \n[i386]:\n[amd64] \{\
-You can also specify a partition as type
-.Sy MSDOS .
-This is useful if you share the disk with
-.Tn MS-DOS
-or
-.Tn Windows ;
-.Nx
-is able to access the files on these partitions.
-You can use the values from the MBR for the
-.Tn MS-DOS
-part of the disk to specify the partition of type
-.Sy MSDOS
-(you don't have to do this now, you can always re-edit
-the disklabel to add this once you have installed
-.Nx ,
-or use
-.Xr mbrlabel 8
-to help you update your disklabel with data from the MBR).
-.Pp
-.\}
-.
 Some partitions in the disklabel have a fixed purpose.
 .(tag 6n -offset indent
 .It Li a
@@ -1430,7 +1412,7 @@ your hard drive will be modified.
 If you are sure you want to proceed, select
 .Sy yes .
 .Pp
-The install program will now label your disk and make the file
+The install program will now label your disk and create the file
 systems you specified.
 The file systems will be initialized to contain
 .Nx
@@ -1461,18 +1443,18 @@ The
 .Nx
 distribution consists of a number of
 .Em sets
-that come in the form of gzipped tarfiles.
+that come in the form of gzipped tar files.
 At this point, you will be presented with a menu
 which enables you to choose from one of the following methods
 of installing the sets.
-Some of these methods will first load the sets on your hard disk,
+Some of these methods will first transfer the sets to your hard disk,
 others will extract the sets directly.
 .Pp
-For all these methods, the first step is making the sets
+For all these methods, the first step is to make the sets
-available for extraction, and then do the actual installation.
+available for extraction.
 The sets can be made available in a few different ways.
-The following sections describe each of those methods.
+The following sections describe each of the methods.
-After reading the one about the method you will be using, you
+After reading about the method you will be using, you
 can continue to the section labeled
 .Sq Extracting the distribution sets .
 .It
@@ -1481,18 +1463,17 @@ can continue to the section labeled
 .Pp
 When installing from a CD-ROM, you will be asked to specify
 the device name for your CD-ROM drive
-.Pq usually Li cd0 ,
+.Pq usually Li cd0
 and the directory name on the CD-ROM where the distribution files are.
 .Pp
 .Ic sysinst
-will then check if the files are indeed available
+will then check that the files are actually present in the
-in the specified location, and proceed to the actual
+specified location and proceed to the extraction of the sets.
-extraction of the sets.
 .It
-.To 2 "Installation using ftp"
+.To 2 "Installation using FTP"
-.Em Installation using ftp
+.Em Installation using FTP 
 .Pp
-To be able to install using ftp, you first need to configure
+To install using ftp, you first need to configure
 your network setup if you haven't already done so.
 .Ic sysinst
 will do this for you, asking you
@@ -1513,13 +1494,12 @@ specify an IP address instead of a hostname for the ftp
 server.
 .Pp
 .Ic sysinst
-will proceed to transfer all the default set files
+will then transfer the set files from the remote site to your hard disk.
-from the remote site to your hard disk.
 .It
 .To 2 "Installation using NFS"
 .Em Installation using NFS
 .Pp
-To be able to install using NFS, you first need to configure
+To install using NFS, you first need to configure
 your network setup if you haven't already done so.
 .Ic sysinst
 will do this for you, asking you
@@ -1573,8 +1553,8 @@ therefore can not access the file sets if they are on these filesystems.
 In order to install from a local file system, you will
 need to specify the device that the file system resides
 on
-.ie \n[pmax] .Pq for example Li rz1e
+.ie \n[pmax] .Pq for example Li rz1e ,
-.el .Pq for example Li sd1e
+.el .Pq for example Li wd1e ,
 the type of the file system,
 and the directory on the specified file system where the sets are located.
 .Ic sysinst
@@ -1631,9 +1611,9 @@ feel familiar to users of other package tools, such as
 .Ic apt-get
 or
 .Ic yum .
-Or, you can install the
+Alternatively, you can install the
 .Xr pkgsrc 7
-tree for installing third-party software from source.
+tree if you prefer to install third-party software from source.
 .Pp
 Finally, you can enable some daemons such as
 .Xr sshd 8 ,
@@ -1646,9 +1626,9 @@ or
 .Em "Ensure you have the correct kernel installed"
 .Pp
 If you are installing from the 32-bit sparc distribution set, make sure
-that you installed the correct kernel.  The \*M installation tools do not 
+that you installed the correct kernel.
-by default copy the correct 32-bit kernel.  Unless you prepared ahead of 
+The \*M installation tools do not by default copy the correct 32-bit kernel.
-time by renaming the
+Unless you prepared ahead of time by renaming the
 .Pa kern-GENERIC_SUN4U.tgz
 to
 .Pa kern-GENERIC.tgz

distrib/notes/common/upgrade

@@ -1,4 +1,4 @@
-.\"	$NetBSD: upgrade,v 1.29 2014/11/14 07:06:40 snj Exp $
+.\"	$NetBSD: upgrade,v 1.30 2015/05/09 08:13:35 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -71,11 +71,6 @@ new binaries.
 Since files already installed on the system are overwritten in place,
 you only need additional free space for files which weren't previously
 installed or to account for growth of the sets between releases.
-If you have a few megabytes free on each of your root
-.Pq Pa /
-and
-.Pa /usr
-partitions, you should have enough space.
 .Pp
 Since upgrading involves replacing the kernel, boot blocks,
 and most of the system binaries, it has the

distrib/notes/common/xfer

@@ -1,4 +1,4 @@
-.\"	$NetBSD: xfer,v 1.73 2012/01/10 01:57:27 snj Exp $
+.\"	$NetBSD: xfer,v 1.74 2015/05/09 08:13:35 snj Exp $
 .\"
 .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -247,29 +247,27 @@ If you're making the tape on a
 system, the easiest way
 to do so is probably something like:
 .Pp
-.Dl # Ic "tar -cf" Ar "tape_device dist_directories"
+.Dl # Ic "tar -cf" Ar "tape_device dist_sets"
 .Pp
 where
 .Ar tape_device
 is the name of the tape device that
-describes the tape drive you're using; possibly
+represents the tape drive you're using.
+This might be
 .Pa /dev/rst0 ,
 or something similar, but it will vary from system to system.
-(If you can't figure it out, ask your system administrator.)
 In the above example,
-.Ar dist_directories
+.Ar dist_sets
-are the
+is a list of filenames corresponding to the distribution sets that you
-distribution sets' directories, for the distribution sets you
 wish to place on the tape.
 For instance, to put the
 .Sy kern-GENERIC, base, No and Sy etc
-distributions on tape (in
+distributions on tape (the absolute minimum required for installation),
-order to do the absolute minimum installation to a new disk),
 you would do the following:
 .Pp
 .Dl # Ic "cd \&.../NetBSD-\*V"
 .Dl # Ic "cd \*M/binary"
-.Dl # Ic "tar -cf" Ar tape_device Ic "kern-GENERIC base etc"
+.Dl # Ic "tar -cf" Ar tape_device Ic "kern-GENERIC.tgz base.tgz etc.tgz"
 .Pp
 .(Note
 You still need to fill in

distrib/notes/evbarm/legal

@@ -1,8 +1,6 @@
-.\"	$NetBSD: legal,v 1.4 2009/10/23 04:51:37 snj Exp $
+.\"	$NetBSD: legal,v 1.5 2015/05/09 08:13:35 snj Exp $
 .
 .It
-This product includes software developed by Advanced Risc Machines Ltd.
-.It
 This product includes software developed by Microsoft.
 .It
 This product includes software developed by the RiscBSD kernel team.

distrib/notes/macppc/prep.OPENFIRMWARE

@@ -1,4 +1,4 @@
-.\"	$NetBSD: prep.OPENFIRMWARE,v 1.17 2014/11/13 08:16:42 snj Exp $
+.\"	$NetBSD: prep.OPENFIRMWARE,v 1.18 2015/05/09 08:13:35 snj Exp $
 .if \*[OF_VERSION_3] \{\
 .
 .Ss2 Updating your BootROM
@@ -16,7 +16,7 @@ The BootROM then loads Open Firmware, which boots your operating system.
 .Pp
 Go to the
 .Sq "Apple Support Downloads"
-web site at
+website at
 .Lk http://support.apple.com/downloads/
 and search for
 .Sq firmware

distrib/notes/shark/legal

@@ -1,8 +1,6 @@
-.\"	$NetBSD: legal,v 1.3 2009/10/23 04:51:37 snj Exp $
+.\"	$NetBSD: legal,v 1.4 2015/05/09 08:13:35 snj Exp $
 .
 .It
-This product includes software developed by Advanced Risc Machines Ltd.
-.It
 This product includes software developed by the RiscBSD kernel team.
 .It
 This product includes software developed by Scott Stevens.

distrib/notes/x68k/legal

@@ -1,4 +1,4 @@
-.\"	$NetBSD: legal,v 1.6 2002/05/20 23:48:50 itojun Exp $
+.\"	$NetBSD: legal,v 1.7 2015/05/09 08:13:35 snj Exp $
 .
 .It
 This product includes software developed by Masaru Oki.
@@ -13,6 +13,4 @@ This product includes software developed by Takuya HARAKAWA.
 .It
 This product includes software developed by MINOURA Makoto.
 .It
-This product includes software developed by Yasushi YAMASAKI.
-.It
 This product includes software developed by ITOH Yasufumi.