[src/netbsd-1-6]: src/distrib/notes pullup-1-6 ticket #511 (rafal).

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/229431246689
branches:  netbsd-1-6
changeset: 528439:229431246689
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Jul 15 17:00:36 2002 +0000

description:
pullup-1-6 ticket #511 (rafal).

Original log message:
Update sgimips portions of release notes to more closely match reality, esp.
after the removal of the kern-GENERIC set from sysinst.  While here, fix up
some minor things (wording, bad markup, typoes) in the non-sgimips specific
common portions.

diffstat:

 distrib/notes/common/contents  |  36 ++++++++++++++++++++++++++----------
 distrib/notes/common/main      |  16 ++++++++--------
 distrib/notes/common/sysinst   |  13 +++++++++++--
 distrib/notes/common/upgrade   |  13 +++++++------
 distrib/notes/sgimips/hardware |  13 +++++++++----
 distrib/notes/sgimips/prep     |   8 ++++----
 6 files changed, 65 insertions(+), 34 deletions(-)

diffs (283 lines):

diff -r 6ab28cd90d2b -r 229431246689 distrib/notes/common/contents
--- a/distrib/notes/common/contents     Mon Jul 15 16:40:49 2002 +0000
+++ b/distrib/notes/common/contents     Mon Jul 15 17:00:36 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: contents,v 1.52.2.12 2002/07/11 18:41:44 thorpej Exp $
+.\"    $NetBSD: contents,v 1.52.2.13 2002/07/15 17:00:36 thorpej Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -53,7 +53,7 @@
 .      (tag kernel/ -compact
 .              It Pa kernel/
 .              (tag netbsd.gz -compact
-.if !\n[atari]:\n[walnut] \{\
+.if !\n[atari]:\n[walnut]:\n[sgimips] \{\
 .                      It Pa netbsd-GENERIC.gz
 A gzipped
 .Nx
@@ -63,10 +63,6 @@
 This kernel runs on Vr41xx and TX3922 CPU only.
 .\}
 .
-.if r_sgimips \{\
-This kernen will boot on O2 and similar machines.
-.\}
-.
 .if r_acorn26 \{\
 .                      It Pa netbsd.FOURMEG.gz
 A somewhat smaller kernel, intended to be usable on systems with
@@ -172,9 +168,10 @@
 .
 .if r_sgimips \{\
 .                      It Pa netbsd-GENERIC_INDY.gz
-A kernel similar to GENERIC, but will boot on an Indy and similar machines.
+A kernel suitable for booting on Indy, Indigo 2 and similar machines.
 .                      It Pa netbsd.ecoff-GENERIC_INDY.gz
-GENERIC targeted for being bootable on Indigo 2 and similar machines.
+GENERIC_INDY targeted for being bootable on older Indigo 2 and possibly 
+Indy machines with PROMs that do not understand the ELF binary format.
 .\}
 .
 .if r_walnut \{\
@@ -531,7 +528,7 @@
 .el .ie r_vax .setsize 3 7
 .el .setsize ??? ???
 .
-.if !\n[atari]:\n[walnut] \{\
+.if !\n[atari]:\n[walnut]:\n[sgimips] \{\
 .It Sy kern-GENERIC
 This set contains a
 .Nx*M
@@ -568,7 +565,6 @@
 .el .ie r_pmax .setsize 2 4
 .el .ie r_prep .setsize 2 4
 .el .ie r_sandpoint .setsize 3 8
-.el .ie r_sgimips .setsize 3 7
 .el .ie r_shark .setsize 2 4
 .el .ie r_sparc .setsize 2 4
 .el .ie r_sparc64 .setsize 3 5
@@ -588,6 +584,21 @@
 .No You Em must
 install the kernel that matches your hardware.
 .\}
+.if r_sgimips \{\
+.It Sy kern-GENERIC_INDY
+This set contains a
+.Nx*M
+\*V
+.Li GENERIC_INDY
+kernel (for Indy, Indigo 2 and Challenge S/M machines), named
+.Pa /netbsd .
+This set also contains an ECOFF kernel named
+.Pa /netbsd.ecoff
+that your system may need to boot.
+.No You Em must
+install this distribution set.
+.setsize 3 7
+.\}
 .if r_walnut \{\
 .It Sy kern-WALNUT
 This set contains a
@@ -648,7 +659,12 @@
 maintains its own set of sources for the X Window System in order to
 assure tight integration and compatibility.
 These sources are based on XFree86, and tightly track XFree86 releases.
+.ie r_i386 \{\
+They are currently equivalent to XFree86 4.2.0.
+.\}
+.el \{\
 They are currently equivalent to XFree86 3.3.6.
+.\}
 Binary sets for the X Window System are distributed with
 .Nx .
 The sets are:
diff -r 6ab28cd90d2b -r 229431246689 distrib/notes/common/main
--- a/distrib/notes/common/main Mon Jul 15 16:40:49 2002 +0000
+++ b/distrib/notes/common/main Mon Jul 15 17:00:36 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: main,v 1.179.2.11 2002/07/11 19:59:33 thorpej Exp $
+.\"    $NetBSD: main,v 1.179.2.12 2002/07/15 17:00:36 thorpej Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -419,12 +419,12 @@
 The development of 1.6 and the subsequent ``point'' releases
 is done on a separate branch in the CVS repository.
 The branch was created when the release cycle for 1.6 was started,
-and during the release cycle of 1.5 and its patch releases,
-selected fixes and enhancements have been imported from the
-main development trunk.
+and during the release cycle of 1.6 and its patch releases selected
+fixes and enhancements have been imported from the main development
+trunk.
 .ig
-So, there are features in 1.6.1 which were not in, e.g. 1.6B, and vice
-versa.
+For example, there may be features in 1.6.1 which were not in 1.6B,
+and vice versa.
 ..
 .if \n[FOR_RELEASE] \{\
 .Ss Changes Between The NetBSD 1.5 and 1.6 Releases
@@ -1057,7 +1057,7 @@
 checksums for the various files in that directory, in the format produced by
 the command:
 .br
-.Ic cksum Fl o 2 Ar file .
+.Ic cksum -o 2 Ar file .
 .tag)
 .Pp
 The MD5 digest is the safest checksum, followed by the POSIX
@@ -1176,7 +1176,7 @@
 .It
 The following
 .Xr rc.conf 5
-are now obsolete:
+entries are now obsolete:
 .Li amd_master ,
 .Li ip6forwarding ,
 .Li defcorename ,
diff -r 6ab28cd90d2b -r 229431246689 distrib/notes/common/sysinst
--- a/distrib/notes/common/sysinst      Mon Jul 15 16:40:49 2002 +0000
+++ b/distrib/notes/common/sysinst      Mon Jul 15 17:00:36 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: sysinst,v 1.32.2.10 2002/07/11 18:41:45 thorpej Exp $
+.\"    $NetBSD: sysinst,v 1.32.2.11 2002/07/15 17:00:37 thorpej Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1114,6 +1114,9 @@
 .el .ie r_macppc \{\
 .ds usrpart g
 .\}
+.el .ie r_sgimips \{\
+.ds usrpart e
+.\}
 .el \{\
 .ds usrpart d
 .\}
@@ -1131,7 +1134,13 @@
 portion of the disk.
 .It Li d
 .\}
-The entire disk.
+.ie r_sgimips \{\
+The
+.Nx
+portion of the disk.
+.It Li d
+The SGI volume header (boot partition)
+.\}
 .ie r_macppc \{\
 .It Li d-h
 .\}
diff -r 6ab28cd90d2b -r 229431246689 distrib/notes/common/upgrade
--- a/distrib/notes/common/upgrade      Mon Jul 15 16:40:49 2002 +0000
+++ b/distrib/notes/common/upgrade      Mon Jul 15 17:00:36 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: upgrade,v 1.13.2.3 2002/07/09 14:49:56 lukem Exp $
+.\"    $NetBSD: upgrade,v 1.13.2.4 2002/07/15 17:00:37 thorpej Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -36,9 +36,9 @@
 .Pp
 The upgrade to
 .Nx \*V
-is a binary upgrade; it can be quite difficult
-to advance to a later version by recompiling from source due primarily
-to interdependencies in the various components.
+is a binary upgrade; it can be quite difficult to update the system
+from an earlier version by recompiling from source, primarily due to
+interdependencies in the various components.
 .Pp
 .ie r_atari \{\
 To do the upgrade, you must first boot the system as described in the
@@ -91,8 +91,9 @@
 .Nx
 partition, the kernel, and most of the system binaries, it has the
 potential to cause data loss.
-You are strongly advised to .Em back up any important data on your disk,
-whether on the
+You are strongly advised to 
+.Em back up 
+any important data on your disk, whether on the
 .Nx
 partition or on
 another operating system's partition, before beginning the upgrade
diff -r 6ab28cd90d2b -r 229431246689 distrib/notes/sgimips/hardware
--- a/distrib/notes/sgimips/hardware    Mon Jul 15 16:40:49 2002 +0000
+++ b/distrib/notes/sgimips/hardware    Mon Jul 15 17:00:36 2002 +0000
@@ -1,11 +1,11 @@
-.\"    $NetBSD: hardware,v 1.1.2.2 2002/07/02 04:20:16 lukem Exp $
+.\"    $NetBSD: hardware,v 1.1.2.3 2002/07/15 17:00:38 thorpej Exp $
 .
 .Nx*M
 is aimed to run on MIPS-based computers manufactured by SGI.
 .Ss2 Supported machines
 .(bullet -offset indent
 .Tn SGI
-IP22 R4000/R4400/R4600 \- Challenge S, Indigo 2 and Indy
+IP22 R4000/R4400/R4600 \- Challenge M, Challenge S, Indigo 2 and Indy
 .It
 IP22 R5000 \- Indy
 .bullet)
@@ -40,6 +40,7 @@
 Serial ports
 .(bullet -compact
 On-board Zilog Z8530 Dual Uart
+.Pq Em ttyz ,
 .bullet)
 .It
 Ethernet
@@ -52,15 +53,19 @@
 .(bullet -compact
 On-board
 .Tn Western Digital
-.Em wdsc
-WD33C93 SCSI controller
+WD33C93 SCSI controller(s)
+.Pq Em wdsc ,
 .bullet)
 .bullet)
 .Ss2 Unsupported devices
 .(bullet -offset indent
+Keyboard and mouse devices
+.It
 Graphics adapters
 .It
 Audio hardware
 .It
 Video hardware
+.It
+Parallel ports
 .bullet)
diff -r 6ab28cd90d2b -r 229431246689 distrib/notes/sgimips/prep
--- a/distrib/notes/sgimips/prep        Mon Jul 15 16:40:49 2002 +0000
+++ b/distrib/notes/sgimips/prep        Mon Jul 15 17:00:36 2002 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: prep,v 1.1.2.2 2002/07/02 04:20:16 lukem Exp $
+.\"    $NetBSD: prep,v 1.1.2.3 2002/07/15 17:00:38 thorpej Exp $
 .
 First and foremost, before beginning the installation process,
 .Em make sure you have a reliable backup
@@ -7,8 +7,8 @@
 Booting
 .Nx*M
 for the first time is most commonly done from the network.
-You must set up DHCP, TFTP, and NFS for the installation procedure to be
-successful.
+You must set up DHCP, TFTP, and possibly NFS for the installation
+procedure to be successful.
 Some SGI bootproms, such as the ones found on O2s, can read
 ELF kernels directly from the network, others require that you boot
 an ECOFF version of the kernel.
@@ -26,7 +26,7 @@
 You must decide which image your system is capable of loading.
 The current options are:
 .(bullet
-Indigo2, Indy, Challenge S
+Indigo2, Indy, Challenge M, Challenge S
 .It
 O2
 .bullet)