summaryrefslogtreecommitdiff
path: root/distrib/notes/i386
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2004-03-17 09:25:11 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2004-03-17 09:25:11 +0000
commit992866d50243e49ac5d348aefb9e13c04303aee0 (patch)
tree7735cd7f8507b6d965eb5f71961b757cf18ece13 /distrib/notes/i386
parent7846de0caa516d0a12a6dcd92f07eb2a31f023e1 (diff)
grammar, consistency fixes, and typos;
ok miod@
Diffstat (limited to 'distrib/notes/i386')
-rw-r--r--distrib/notes/i386/contents10
-rw-r--r--distrib/notes/i386/hardware24
-rw-r--r--distrib/notes/i386/install4
-rw-r--r--distrib/notes/i386/prep2
-rw-r--r--distrib/notes/i386/upgrade8
5 files changed, 24 insertions, 24 deletions
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index 2fce8d66ee4..f0678a1b137 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,16 +1,16 @@
-dnl $OpenBSD: contents,v 1.45 2003/09/09 22:29:04 miod Exp $
+dnl $OpenBSD: contents,v 1.46 2004/03/17 09:25:09 jmc Exp $
TopPart
OpenBSDfloppy
floppyB{:--:}OSrev.fs Another MACHINE boot and installation floppy;
this one features all the drivers not available
- in floppy{:--:}OSrev.fs, such as SCSI, RAID, gigabit
- ethernet, and such; see below.
+ in floppy{:--:}OSrev.fs, such as SCSI, RAID, Gigabit
+ Ethernet, and such; see below.
floppyC{:--:}OSrev.fs Another MACHINE boot and installation floppy;
this one features most of the cardbus and
- pcmcia drivers; see below.
+ PCMCIA drivers; see below.
cdrom{:--:}OSrev.fs The MACHINE boot and installation
2.88MB floppy image that contains almost all
@@ -24,7 +24,7 @@ OpenBSDrd
OpenBSDcd
-As well you may be interested in
+Additionally, you may be interested in
.../OSREV/tools/
miscellaneous MACHINE installation utilities like
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 8caa82c2726..ed61f7111c4 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,9 +1,9 @@
-dnl $OpenBSD: hardware,v 1.145 2004/03/16 08:25:00 jmc Exp $
-OpenBSD/MACHINE OSREV works across a broad range of standard PC's and
+dnl $OpenBSD: hardware,v 1.146 2004/03/17 09:25:09 jmc Exp $
+OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
clones, with a wide variety of processors and I/O bus architectures. It
can be expected to install and run with minimal difficulties on most
current products. The cases where problems may be encountered are
-typically older proprietary PC's, laptops or specialized server boxes
+typically older proprietary PCs, laptops, or specialized server boxes
that rely on a custom BIOS to paper over implementation differences.
OpenBSD does not currently support multiple processors (SMP), but will
@@ -58,7 +58,7 @@ Supported hardware {:-include-:}:
Entropy Sources
Interrupt latency collection from many devices
Intel 82802 random number generator found on i810, i815,
- i820, i840, i850 and i860 based systems.
+ i820, i840, i850, and i860 based systems.
Disk Controllers
Floppy controllers.
ISA MFM, ESDI, IDE, and RLL hard disk controllers.
@@ -100,11 +100,11 @@ Supported hardware {:-include-:}:
Adaptec AIC-7770-based boards, including the Adaptec
AHA-274x and AHA-284x families) [C]
Adaptec AHA-[23]94x[W] cards and some on-board PCI designs
- using the AIC7870 and AIC7880 chips. [C]
+ using the AIC7870 and AIC7880 chips [C]
Adaptec AHA-[23]94xU[2W] cards and some on-board PCI designs
using the AIC789[01], AIC7895, AIC789[67] chips [C]
Adaptec AIC-789[29] chips and products like the
- AHA-29160 based upon it which do 160MB/sec SCSI. [C]
+ AHA-29160 based upon it which do 160MB/sec SCSI [C]
(However, the 7899G card is currently not supported with
more than one device attached)
AdvanSys 'U', 'UW', 'U2W' and 'U160' PCI SCSI
@@ -882,7 +882,7 @@ IsoLan, NE2100, and DEPCA
Intel EtherExpress PRO/10
ex0 0x320 5
-PCI ethernet boards need to have an interrupt, either assigned in your
+PCI Ethernet boards need to have an interrupt, either assigned in your
PCI BIOS, or autoconfigured.
Hardware not listed in the above table doesn't need any specific
@@ -947,8 +947,8 @@ Special care for PCI BIOS:
Sometimes specifications are unclear about interfaces and/or data
validation.
These all cause our driver for PCI BIOS to misbehave in more or
- less fatal ways, such as panics on pcibios0 configuration or pci
- device attachments, or unconfigured pci devices due to irq and/or
+ less fatal ways, such as panics on pcibios0 configuration or PCI
+ device attachments, or unconfigured PCI devices due to IRQ and/or
I/O address misconfiguration.
Fast workaround
@@ -970,12 +970,12 @@ Special care for PCI BIOS:
UKC> quit
This will disable the pcibios0 attachment.
- Sometimes, especially when hangs occur on particular pci device
- attachments, moving pci cards into a different slot helps.
+ Sometimes, especially when hangs occur on particular PCI device
+ attachments, moving PCI cards into a different slot helps.
Fixing for good
Try to gather dmesg output from the failing configuration, for
- example by using a serial console (see boot(8)) and send it to
+ example by using a serial console (see boot(8)), and send it to
<mickey@OpenBSD.org> along with descriptions of your hardware setup.
Alternatively, dig in the code and fix problems.
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index 64859e17d49..c7b2d80f711 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -1,4 +1,4 @@
-dnl $OpenBSD: install,v 1.35 2003/03/24 11:33:56 miod Exp $
+dnl $OpenBSD: install,v 1.36 2004/03/17 09:25:09 jmc Exp $
OpenBSDInstallPrelude
If OpenBSD will be sharing the disk with DOS or another operating
@@ -51,7 +51,7 @@ OpenBSDInstallPart3({:- or "wd0" for IDE/RLL/ESDI/ST506 drives-:})
If fdisk is being invoked on your behalf, it will start by
displaying the current partitions defined and then allow you
- to modify this information, add new partitions and change
+ to modify this information, add new partitions, and change
which partition to boot from by default. If you make a mistake,
you will be allowed to repeat this procedure as necessary to
correct this. Note that you should make OpenBSD be the active
diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep
index db0c9f1ed9e..35113c766d5 100644
--- a/distrib/notes/i386/prep
+++ b/distrib/notes/i386/prep
@@ -41,7 +41,7 @@ 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-
+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.
diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index 89c6e0b6ecd..9dcedb3da5b 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -1,16 +1,16 @@
-dnl $OpenBSD: upgrade,v 1.22 2003/11/10 22:11:35 espie Exp $
+dnl $OpenBSD: upgrade,v 1.23 2004/03/17 09:25:09 jmc Exp $
dnl OpenBSDUpgrade({:-the CD-ROM or an installation floppy as you would do for
dnl a new installation-:})
Due to the change from a.out to ELF binary format in OpenBSD OSREV,
upgrades can be a complex, delicate process. The best solution, whenever
-possible, is to backup your data and reinstall from scratch.
+possible, is to back up your data and reinstall from scratch.
The second best solution is to remove all ports, third party programs and
libraries installed on your system; upgrade; and then add ELF versions of
the removed files.
In all cases, once you start the upgrade you MUST complete it. If the
-upgrade process fails or is abandoned before it completes you will almost
+upgrade process fails, or is abandoned before it completes, you will almost
certainly be left with a non-functional system.
Finally, you cannot use the bsd.rd kernel to upgrade the system. The
@@ -29,7 +29,7 @@ OSREV system while preserving the functioning of a.out binaries are:
for proper operation of older binaries.
Before you start the upgrade process, the a.out emulation area needs to be
-set up. It needs to be put inside a /emul/a.out hierarchy. This directory can,
+set up. It needs to be put inside an /emul/a.out hierarchy. This directory can,
however, be a symbolic link, should the available space in the root partition
not be enough.