On Sun, Jul 07, 2019 at 10:44:42PM -0700, Evan Silberman wrote: > I noticed one thing that bothered me and decided to look for other > things that bothered me. Changes were made without reference to the code > of the installation program and without checking that the installer > behaves as documented. I believe the included changes are harmless in > that respect. I'm happy to provide explanations of any given line edit > on request, but I hope they are self-explanatory. `make allarchs` ran > without issues and I don't seem to have broken any formatting. > > Regards, > Evan Silberman > > > Index: m4.common > =================================================================== > RCS file: /cvs/src/distrib/notes/m4.common,v > retrieving revision 1.127 > diff -u -p -r1.127 m4.common > --- m4.common 23 Aug 2017 02:59:45 -0000 1.127 > +++ m4.common 8 Jul 2019 05:36:28 -0000 > @@ -284,8 +284,8 @@ 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 which contain information about > - the hardware that was detected and supported by OpenBSD. > + OpenBSD kernel boot messages, which contain information about > + the supported hardware that was detected by OpenBSD.
This is not true. OpenBSD does print information about hardware detected but not supported. e.g.: "usb3_phy0" at mainbus0 not configured -Otto > > dnl dot.profile > After the kernel is done initializing, you will be asked whether > @@ -327,9 +327,9 @@ dnl install.sub (install) hostname > dnl install.sub (install) donetconfig > You will now be given an opportunity to configure the network. > The network configuration you enter (if any) can then be used to > - do the install from another system using HTTP, and will also be > - the configuration used by the system after the installation is > - complete. > + obtain installation sets from another system using HTTP, and > + will also be the configuration used by the system after the > + installation is complete. > > dnl XXX add a MDVLAN feature and document vlan setup > The install program will give you a list of network interfaces you > @@ -409,10 +409,10 @@ dnl install.sub (install) user_setup() > with a lowercase letter. If the login name matches this > criteria, and doesn't conflict with any of the administrative > user accounts (such as `root', `daemon' or `ftp'), you > - will be prompted with the users descriptive name, as well > - as its password, twice. > + will be prompted for the user's descriptive name, then twice > + for its password. > > - As for the root password earlier, the install program will only > + As with the root password earlier, the install program will only > check that the two passwords match, but you should make sure to > use a strong password here as well. > > @@ -422,13 +422,11 @@ dnl install.sub (install) user_setup() > dnl install.sub (install) set_timezone > ifelse(MDTZ,,, > {:- > - You may now be given the opportunity to configure the time zone > - your system will be using (this depends on the installation > - media you are using). > - > - If the installation program skips this question, do not be > - alarmed, the time zone will be configured at the end > - of the installation. > + Depending on the installation media you are using, you may now > + be given the opportunity to configure the time zone your system > + will use. If the installation program skips this question, do > + not be alarmed: the time zone will be configured at the end of > + the installation. > -:})dnl > dnl install.sh ask whether to use DUIDs before the md_prep_disklabel loop > The installation program will now tell you which disks it can > @@ -512,7 +510,7 @@ define({:-OpenBSDInstallPart5-:}, > partition layout) and the `n' command (to change mount points) > are of particular interest. > > - Although the partitions position and size are written in exact > + Although the partitions' position and size are written in exact > sector values, you do not need a calculator to create your > partitions! Human-friendly units can be specified by adding `k', > `m' or `g' after any numbers to have them converted to kilobytes, > @@ -652,10 +650,10 @@ define({:-OpenBSDCommonInstall-:}, > A list of available distribution sets found on the > given location will be listed. > > - You may individually select distribution sets to install, > - by entering their name, or wildcards (e.g. `*.tgz' or > - `base*|comp*', or `all' to select all the sets (which > - is what most users will want to do). > + You may individually select distribution sets to install > + by entering their names or wildcards (e.g. `*.tgz' or > + `base*|comp*'), or you may enter `all' to select all the > + sets (which is what most users will want to do). > You may also enter `abort' to deselect everything and > restart the selection from scratch, or unselect sets > by entering their name prefixed with `-' (e.g. `-x*'). > @@ -710,8 +708,8 @@ dnl > define({:-OpenBSDCongratulations-:},{:- > Congratulations, you have successfully installed OpenBSD OSREV. When you > reboot into OpenBSD, you should log in as "root" at the login prompt. > -You should create yourself an account and protect it and the "root" > -account with good passwords. > +You should create yourself an account, if you skipped this step during > +installation, and protect it and the "root" account with good passwords. > > The install program leaves root an initial mail message. We recommend > you read it, as it contains answers to basic questions you might have > @@ -730,7 +728,7 @@ tailored for your site. We recommend yo > man afterboot > > which will tell you about a bunch of the files needing to be reviewed. > -If you are unfamiliar with UN*X-like system administration, it's > +If you are unfamiliar with Unix-like system administration, it's > recommended that you buy a book that discusses it.-:})dnl > dnl > dnl > @@ -751,8 +749,8 @@ installation. > The installer runs dhclient(8) on the network interface the system > booted from, or in case of multiple interfaces it will ask which one > to use. Upon success it retrieves a response file via HTTP. If that > -fails, the installer asks for the response file location which can be > -either an url or a local path and retrieves the response file from > +fails, the installer asks for the response file location, which can be > +either a URL or a local path, and retrieves the response file from > there. > > The "next-server" DHCP option specifies the hostname part of the URL, > @@ -906,7 +904,7 @@ define({:-OpenBSDXferFloppyFromDOS-:}, > (i.e. read-only).-:})dnl > dnl > define({:-OpenBSDXferFloppyFromUNIX-:}, > -{:-Creating a bootable floppy disk using a Un*x-like system: > +{:-Creating a bootable floppy disk using a Unix-like system: > > First, you will need to obtain a local copy of the bootable filesystem > image as described above. You should use the signify(1) and sha256(1) > @@ -936,7 +934,7 @@ define({:-OpenBSDXferFloppyFromUNIX-:}, > (i.e. read-only).-:})dnl > dnl > define({:-OpenBSDXferUSBFromUNIX-:}, > -{:-Creating a bootable USB key using a Un*x-like system: > +{:-Creating a bootable USB key using a Unix-like system: > > Some older systems may not be able to boot from USB keys or require > changing boot priority. Check your BIOS settings if you run into > Index: amd64/xfer > =================================================================== > RCS file: /cvs/src/distrib/notes/amd64/xfer,v > retrieving revision 1.15 > diff -u -p -r1.15 xfer > --- amd64/xfer 10 Jun 2015 06:38:39 -0000 1.15 > +++ amd64/xfer 8 Jul 2019 05:36:28 -0000 > @@ -21,7 +21,7 @@ OpenBSDXferFloppyFromUNIX > > OpenBSDXferUSBFromUNIX > > -Creating a PXE network bootable setup using OpenBSD or other Un*x-like > system: > +Creating a PXE network bootable setup using OpenBSD or other Unix-like > system: > > In order to start the install via PXE, you will need to set up a > DHCP server and a TFTP server. The details of how to do this > Index: i386/xfer > =================================================================== > RCS file: /cvs/src/distrib/notes/i386/xfer,v > retrieving revision 1.34 > diff -u -p -r1.34 xfer > --- i386/xfer 10 Jun 2015 06:38:39 -0000 1.34 > +++ i386/xfer 8 Jul 2019 05:36:28 -0000 > @@ -21,7 +21,7 @@ OpenBSDXferFloppyFromUNIX > > OpenBSDXferUSBFromUNIX > > -Creating a PXE network bootable setup using OpenBSD or other Un*x-like > system: > +Creating a PXE network bootable setup using OpenBSD or other Unix-like > system: > > In order to start the install via PXE, you will need to set up a > DHCP server and a TFTP server. The details of how to do this > Index: sparc64/xfer > =================================================================== > RCS file: /cvs/src/distrib/notes/sparc64/xfer,v > retrieving revision 1.33 > diff -u -p -r1.33 xfer > --- sparc64/xfer 4 Mar 2017 22:46:20 -0000 1.33 > +++ sparc64/xfer 8 Jul 2019 05:36:28 -0000 > @@ -26,7 +26,7 @@ OpenBSDXferFloppyFromDOS > > OpenBSDXferFloppyFromUNIX > > -Creating a bootable hard disk using SunOS, Solaris or other Un*x-like system: > +Creating a bootable hard disk using SunOS, Solaris or other Unix-like system: > > If you don't have a floppy drive you can copy the miniroot > "miniroot{:--:}OSrev.fs" onto the hard disk you intend to boot on. > @@ -63,7 +63,7 @@ Creating a bootable hard disk using SunO > which can wipe out any pre-existing disklabels or partitioning for > the drive. > > -Creating a network bootable setup using SunOS or other Un*x-like system: > +Creating a network bootable setup using SunOS or other Unix-like system: > > The details of setting up a network bootable environment vary > considerably, depending on the network's host. Extract the >