delete old notes and long sections about old problems to reflect what

a new user is likely to need to know today

6 files changed, 34 insertions, 160 deletions

diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index febc2195b43..9cc5357a6a5 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: INSTALL,v 1.45 2011/08/08 20:03:03 miod Exp $
+dnl	$OpenBSD: INSTALL,v 1.46 2014/02/27 18:04:28 tedu Exp $
 include(INCLUDE/../m4.common)dnl
 includeit(features)dnl
 INSTALLATION NOTES for OpenBSD/MACHINE OSREV
@@ -168,9 +168,7 @@ Administrivia:
 There are various mailing lists available via the mailing list
 server at <majordomo@OpenBSD.org>.  To get help on using the mailing
 list server, send mail to that address with an empty body, and it will
-reply with instructions.  There are also two OpenBSD Usenet newsgroups,
-comp.unix.bsd.openbsd.announce for important announcements and
-comp.unix.bsd.openbsd.misc for general OpenBSD discussion.
+reply with instructions.
 
 More information about the various OpenBSD mailing list and proper
 netiquette is available at
@@ -191,8 +189,8 @@ dnl are entered into the OpenBSD bugs database, and thus can't slip through
 dnl the cracks.
 dnl 
 As a favor, please avoid mailing huge documents or files to the
-mailing lists.  Instead, put the material you would have sent up
-for FTP somewhere, then mail the appropriate list about it, or, if
+mailing lists.  Instead, put the material you would have sent on
+a web server, then mail the appropriate list about it, or if
 you'd rather not do that, mail the list saying you'll send the data
 to those who want it.
 
diff --git a/distrib/notes/amd64/install b/distrib/notes/amd64/install
index fd1fef161c0..b63d5cf69db 100644
--- a/distrib/notes/amd64/install
+++ b/distrib/notes/amd64/install
@@ -1,13 +1,6 @@
-dnl	$OpenBSD: install,v 1.15 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.16 2014/02/27 18:04:28 tedu Exp $
 OpenBSDInstallPrelude
 
-If OpenBSD will be sharing the disk with another operating system,
-you should have already completed the section of these notes that
-instructed you on how to prepare your hard disk.  You should know
-the size of the OpenBSD area of the disk and its offset from the
-beginning of the disk.  You will need this information when setting up
-your OpenBSD partitions.
-
 There are several ways to install OpenBSD onto a disk.  The easiest way,
 should your computer support it, is to boot off the OpenBSD CD-ROM, or
 off the bootable CD-ROM mini image. Otherwise, you can boot from a 3.5"
@@ -64,8 +57,6 @@ OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/amd64/prep b/distrib/notes/amd64/prep
index 3333da70902..4d7b72cf886 100644
--- a/distrib/notes/amd64/prep
+++ b/distrib/notes/amd64/prep
@@ -1,70 +1,16 @@
-dnl	$OpenBSD: prep,v 1.5 2008/08/05 23:05:12 miod Exp $
-NOTE: If you wish to install OpenBSD on your whole disk, i.e. you do not
-want any other operating system to reside on your hard disk, you can skip
-this section and go on to the section that describes installation, below.
-If you're upgrading your system from a previous release of OpenBSD, you
-should have proceeded directly to the section about upgrading; you need
-none of the information presented here.
-
+dnl	$OpenBSD: prep,v 1.6 2014/02/27 18:04:28 tedu Exp $
 First and foremost, before beginning the installation process, MAKE
 SURE YOU HAVE A RELIABLE BACKUP of any data on your hard disk that you
 wish to keep.  Repartitioning your hard disk is an excellent way to
 destroy important data.
 
-dnl
-dnl All this text below is probably completely unapplicable to amd64,
-dnl as they don't have BIOS that old and crappy...
-dnl Second, if you are using a disk controller which supports disk geometry
-dnl translation, be sure to use the same parameters for OpenBSD as for the
-dnl other operating systems installed on your disk.  If you do not, it will
-dnl be much harder to make OpenBSD properly coexist with them.
-dnl
-dnl Utilities exist which will print out the disk geometry which DOS sees;
-dnl some versions of DOS "fdisk" also do this.  If you have an "EIDE" hard
-dnl disk, DOS and OpenBSD probably won't see the same geometry, and you must
-dnl be careful to find out the DOS geometry and tell OpenBSD about it during
-dnl the installation.
-dnl
-dnl Third (but related to the second point above), if you are using a hard
-dnl disk with more sectors than DOS or your controller's BIOS supports without
-dnl some kind of software translation utility or other kludge, you MUST
-dnl BE SURE that all partitions which you want to boot from must start and end
-dnl below cylinder 1024 by the BIOS's idea of the disk, and that all DOS
-dnl partitions MUST EXIST ENTIRELY BELOW cylinder 1024, or you will either not
-dnl be able to boot OpenBSD, not be able to boot DOS, or you may experience
-dnl data loss or filesystem corruption.  Be sure you aren't using geometry
-dnl translation that you don't know about, but that the DOS "fdisk" program
-dnl does!
-dnl
-dnl The OpenBSD root partition must also reside completely within the BIOS
-dnl supported part of the hard disk -- this would typically be 504MB, 2GB or
-dnl 8GB, depending upon the age of the machine and its BIOS.
-
-dnl Fourth, use the other operating system's "fdisk" program or partition
-Second, use the other operating system's "fdisk" program or partition
-editor to create at least one of the partitions to be used for that
-operating system.  If that operating system is already set up to use the
+If you plan to dual boot, use the other operating system's "fdisk" program
+or partition editor to create at least one of the partitions to be used for
+that operating system.  If that operating system is already set up to use the
 entire disk, you will have to back it up, remove and recreate a smaller
-partition for it, and then restore the data from that partition.  You do
-not have to create an OpenBSD partition at this time, the OpenBSD install-
-ation will give you an opportunity to create the partition needed for
-OpenBSD.
-
-Finally, do whatever is necessary to restore order to the partition
-you took space away from. Most operating systems will need to reformat
-the partition, and if it was their "main" partition, will probably need
-to be reinstalled.
+partition for it, and then restore the data from that partition.  You do not
+have to create an OpenBSD partition at this time, the OpenBSD installation
+will give you an opportunity to create the partition needed for OpenBSD.
 
-dnl
-dnl Don't advertize fips on amd64.
-dnl
-dnl Once you've backed all your data up, there is a tool called fips 2.0
-dnl that can shrink your FAT-based DOS/Windows partition to make room for
-dnl OpenBSD.  It is included in the MACHINE tools area of this distribution as
-dnl a convenience.  It is strongly advised that you read its documentation
-dnl and understand the consequences of your actions before using it.  In some
-dnl cases, defragmenting your disk and running fips may be much faster than
-dnl reinstalling your DOS partition from the backup.
-dnl
 Your hard disk is now prepared to have OpenBSD installed on it, and
 you should proceed with the installation instructions.
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 508a72a3378..7b37ae7e0fc 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,16 +1,6 @@
-dnl	$OpenBSD: install,v 1.48 2013/12/04 23:20:19 jmc Exp $
+dnl	$OpenBSD: install,v 1.49 2014/02/27 18:04:28 tedu Exp $
 OpenBSDInstallPrelude
 
-If OpenBSD will be sharing the disk with DOS or another operating
-system, you should have already completed the section of these notes
-that instructed you on how to prepare your hard disk.  You should know
-the size of the OpenBSD area of the disk and its offset from the
-beginning of the disk.  You will need this information when setting up
-your OpenBSD partitions.  If your BIOS uses translated geometry, you
-should use this geometry for the remainder of the install.  This is
-only necessary if you are sharing the disk with other operating systems
-that use the translated geometry.
-
 There are several ways to install OpenBSD onto a disk.  The easiest way,
 should your computer support it, is to boot off the OpenBSD CD-ROM, or
 off one of the bootable CD-ROM mini images.  Otherwise, you can boot
@@ -68,8 +58,6 @@ OpenBSDDISKInstall({:-"wdN" or -:},,{:- or MS-DOS-:})
 
 OpenBSDCommonInstall
 
-OpenBSDTAPEInstall
-
 OpenBSDInstallWrapup
 
 OpenBSDCongratulations
diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep
index b732c005d70..9fcd83a82f6 100644
--- a/distrib/notes/i386/prep
+++ b/distrib/notes/i386/prep
@@ -1,64 +1,27 @@
-NOTE: If you wish to install OpenBSD on your whole disk, i.e. you do
-not want DOS or any other operating system to reside on your hard
-disk, you can skip this section and go on to the section that
-describes installation, below.  If you're upgrading your system from a
-previous release of OpenBSD, you should have proceeded directly to the
-section about upgrading; you need none of the information presented
-here.
-
 First and foremost, before beginning the installation process, MAKE
 SURE YOU HAVE A RELIABLE BACKUP of any data on your hard disk that you
 wish to keep.  Repartitioning your hard disk is an excellent way to
 destroy important data.
 
-Second, if you are using a disk controller which supports disk geometry
-translation, be sure to use the same parameters for OpenBSD as for any
-other operating systems installed on the disk.  If you do not, it
-will be much harder to make OpenBSD properly coexist with them.  Most
-operating systems have utilities that print out the disk geometry they
-use; often "fdisk" (or its equivalent) will do this.
-
-Third (but related to the second point above), if you are using a hard
-disk with more cylinders than are supported by the other operating
-systems or the BIOS, you MUST be sure that all boot partitions start and
-end within the area supported by both the BIOS and the OS in question.
-
-The OpenBSD root partition must also reside completely within the BIOS
+The OpenBSD root partition must reside completely within the BIOS
 supported part of the hard disk -- this could typically be 504MB, 2GB,
 8GB or 128GB, depending upon the age of the machine and its BIOS. The
 rest of the OpenBSD partitions can be anywhere that hardware supports.
 
-Fourth, use the other operating system's "fdisk" program or partition
-editor to create at least one of the partitions to be used for that
-operating system.  If that operating system is already set up to use the
+If you plan to dual boot, use the other operating system's "fdisk" program
+or partition editor to create at least one of the partitions to be used for
+that operating system.  If that operating system is already set up to use the
 entire disk, you will have to back it up, remove and recreate a smaller
-partition for it, and then restore the data from that partition.  You do
-not have to create an OpenBSD partition at this time; the OpenBSD install-
-ation will give you an opportunity to create the partition needed for
-OpenBSD.
-
-Finally, do whatever is necessary to restore order to the partition
-you took space away from.  If it was a DOS partition, you probably
-will need to use "format" to create a new file system on it, and then
-restore your important files from your backups.  Other operating
-systems will have different needs; most will need to reformat the
-partition, and if it was their "main" partition, will probably need
-to be reinstalled.
-
-Once you've backed all your data up, there is a tool called fips 2.0
-that can shrink your FAT-based DOS/Windows partition to make room for
-OpenBSD.  It is included in the MACHINE tools area of this distribution as
-a convenience.  It is strongly advised that you read its documentation
-and understand the consequences of your actions before using it.  In some
-cases, defragmenting your disk and running fips may be much faster than
-reinstalling your DOS partition from the backup.
-
-Windows 7 (and possibly Vista) can resize their own system partition, which
-is usually NTFS. In the control panel, search for "partition": this will lead
-you to the system administration tool. Then right click on the partition you
-wish to shrink.  You may have to fiddle with the swap file, because it's
-unmoveable, and you might not be able to shrink the partition as much as you
-would wish.
+partition for it, and then restore the data from that partition.  You do not
+have to create an OpenBSD partition at this time; the OpenBSD installation
+will give you an opportunity to create the partition needed for OpenBSD.
+
+There is a tool called fips 2.0 that can shrink your FAT-based DOS/Windows
+partition to make room for OpenBSD.  It is included in the MACHINE tools area
+of this distribution as a convenience.  Windows 7 (and possibly Vista) can
+resize their own system partition, which is usually NTFS. In the control
+panel, search for "partition": this will lead you to the system
+administration tool.
 
 Your hard disk is now prepared to have OpenBSD installed on it, and
 you should proceed with the installation instructions.
diff --git a/distrib/notes/m4.common b/distrib/notes/m4.common
index 0874624ecd9..06e0ea7b99e 100644
--- a/distrib/notes/m4.common
+++ b/distrib/notes/m4.common
@@ -1,5 +1,5 @@
 dnl
-dnl	$OpenBSD: m4.common,v 1.102 2014/02/26 18:13:41 rpe Exp $
+dnl	$OpenBSD: m4.common,v 1.103 2014/02/27 18:04:28 tedu Exp $
 dnl
 dnl Copyright (c) 2004 Todd T. Fries <todd@OpenBSD.org>
 dnl
@@ -256,10 +256,9 @@ dnl
 dnl Installation introduction.  Warns about disk geometry hell if argument
 dnl is not empty.
 define({:-OpenBSDInstallPrelude-:},
-{:-Installing OpenBSD is a relatively complex process, but if you have
-this document in hand and are careful to read and remember the
-information which is presented to you by the install program, it
-shouldn't be too much trouble.ifelse(X$1,X,,{:-
+{:-Installing OpenBSD is a relatively simple process. If you take your time
+and are careful to read the information presented by the installer, you
+shouldn't have any trouble.ifelse(X$1,X,,{:-
 
 If the disks connected to your machine are $1,
 it is recommended that you know their geometry, i.e. the sector size (note
@@ -298,23 +297,12 @@ though).-:})dnl
 dnl
 dnl OpenBSDInstallPart3(warn geometry, disk type, disk type, disk type)
 dnl
-dnl Describes the boot of the ramdisk, the expected disk devices
-dnl names, and warns bore the reader with geometry concerns if the
-dnl first argument is not empty.
+dnl Describes the boot of the ramdisk.
 dnl Describes the serial terminal setup.
 define({:-OpenBSDInstallPart3-:},
 {:-	Once the kernel has loaded, you will be presented with the
-	OpenBSD kernel boot messages.  You will want to read them
-	to determine your disks name and geometry.  Its name will
-	be something like ifelse(X$2,X,{:-"sd0" for SCSI drives, or "wd0" for IDE
-	drives-:},$2){:--:}ifelse(X$3,X,,{:-, $3-:}){:--:}ifelse(X$4,X,,{:-, $4-:}){:--:}.{:--:}ifelse(X$1,X,,{:-
-	As mentioned above, you will need your disks geometry (which
-	will be printed on a line beginning with its name) when
-	creating OpenBSD partitions.-:})
-	You will also need to know the device name to tell the
-	install tools what disk to install on.  If you cannot read
-	the messages as they scroll by, do not worry -- you can get
-	at this information later inside the install program.
+	OpenBSD kernel boot messages which contain information about
+	the hardware that was detected and supported by OpenBSD.
 
 dnl dot.profile
 	After the kernel is done initialising, you will be asked whether