summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/man/man7/hier.79
-rw-r--r--share/man/man8/man8.amd64/boot_amd64.88
-rw-r--r--share/man/man8/man8.i386/boot_i386.88
-rw-r--r--sys/arch/amd64/stand/biosboot/biosboot.89
-rw-r--r--sys/arch/amd64/stand/boot/boot.86
-rw-r--r--sys/arch/i386/stand/biosboot/biosboot.89
-rw-r--r--sys/arch/i386/stand/boot/boot.86
-rw-r--r--usr.bin/top/top.16
8 files changed, 39 insertions, 22 deletions
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index daa4968eb99..4153159c7f5 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hier.7,v 1.85 2010/07/05 22:26:20 tedu Exp $
+.\" $OpenBSD: hier.7,v 1.86 2010/08/10 20:34:15 sobrado Exp $
.\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)hier.7 8.1 (Berkeley) 6/5/93
.\"
-.Dd $Mdocdate: July 5 2010 $
+.Dd $Mdocdate: August 10 2010 $
.Dt HIER 7
.Os
.Sh NAME
@@ -56,12 +56,15 @@ Pure kernel executable
(the operating system loaded into memory at boot-time).
.It /bsd.mp
Pure kernel executable
-for multi-processor machines.
+for multiprocessor machines.
.It /bsd.rd
Installation kernel.
The built-in RAM disk contains utilities which can be run
without an external file system, so this kernel is useful
for limited system maintenance too.
+.It /bsd.sp
+Pure kernel executable
+for single processor machines.
.It /dev/
Block and character device files.
.Pp
diff --git a/share/man/man8/man8.amd64/boot_amd64.8 b/share/man/man8/man8.amd64/boot_amd64.8
index b2abbb1adbb..580f81c3698 100644
--- a/share/man/man8/man8.amd64/boot_amd64.8
+++ b/share/man/man8/man8.amd64/boot_amd64.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot_amd64.8,v 1.6 2007/05/31 19:19:59 jmc Exp $
+.\" $OpenBSD: boot_amd64.8,v 1.7 2010/08/10 20:34:15 sobrado Exp $
.\"
.\" Copyright (c) 1997 Tobias Weingartner
.\"
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 10 2010 $
.Dt BOOT_AMD64 8 amd64
.Os
.Sh NAME
@@ -153,8 +153,10 @@ It is also possible to force other behaviours from ddb.
.Bl -tag -width /usr/mdec/biosboot -compact
.It Pa /bsd
default system kernel
+.It Pa /bsd.sp
+single processor capable kernel
.It Pa /bsd.mp
-multi-processor capable kernel
+multiprocessor capable kernel
.It Pa /bsd.rd
standalone installation kernel, suitable for disaster recovery
.It Pa /usr/mdec/mbr
diff --git a/share/man/man8/man8.i386/boot_i386.8 b/share/man/man8/man8.i386/boot_i386.8
index c82942ab22f..2fb3676aab6 100644
--- a/share/man/man8/man8.i386/boot_i386.8
+++ b/share/man/man8/man8.i386/boot_i386.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot_i386.8,v 1.14 2007/05/31 19:19:59 jmc Exp $
+.\" $OpenBSD: boot_i386.8,v 1.15 2010/08/10 20:34:15 sobrado Exp $
.\"
.\" Copyright (c) 1997 Tobias Weingartner
.\"
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 10 2010 $
.Dt BOOT_I386 8 i386
.Os
.Sh NAME
@@ -158,8 +158,10 @@ It is also possible to force other behaviours from ddb.
.Bl -tag -width /usr/mdec/biosboot -compact
.It Pa /bsd
default system kernel
+.It Pa /bsd.sp
+single processor capable kernel
.It Pa /bsd.mp
-multi-processor capable kernel
+multiprocessor capable kernel
.It Pa /bsd.rd
standalone installation kernel, suitable for disaster recovery
.It Pa /usr/mdec/mbr
diff --git a/sys/arch/amd64/stand/biosboot/biosboot.8 b/sys/arch/amd64/stand/biosboot/biosboot.8
index 5ae7055e685..51c4a82af65 100644
--- a/sys/arch/amd64/stand/biosboot/biosboot.8
+++ b/sys/arch/amd64/stand/biosboot/biosboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biosboot.8,v 1.8 2010/07/09 17:36:38 deraadt Exp $
+.\" $OpenBSD: biosboot.8,v 1.9 2010/08/10 20:34:16 sobrado Exp $
.\"
.\" Copyright (c) 2003 Tom Cosgrove <tom.cosgrove@arches-consulting.com>
.\" Copyright (c) 1997 Michael Shalayeff
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: July 9 2010 $
+.Dd $Mdocdate: August 10 2010 $
.Dt BIOSBOOT 8 amd64
.Os
.Sh NAME
@@ -241,9 +241,12 @@ PXE bootstrap
.It Pa /bsd
.Ox
kernel
+.It Pa /bsd.sp
+.Ox
+kernel for single processor machines
.It Pa /bsd.mp
.Ox
-kernel for multi-processor machines
+kernel for multiprocessor machines
.It Pa /bsd.rd
.Ox
kernel for installation/recovery
diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8
index 9f99b0e77e0..16d811e8964 100644
--- a/sys/arch/amd64/stand/boot/boot.8
+++ b/sys/arch/amd64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot.8,v 1.13 2010/07/02 08:10:54 jmc Exp $
+.\" $OpenBSD: boot.8,v 1.14 2010/08/10 20:34:16 sobrado Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: July 2 2010 $
+.Dd $Mdocdate: August 10 2010 $
.Dt BOOT 8 amd64
.Os
.Sh NAME
@@ -331,6 +331,8 @@ system bootstrap
system bootstrap's startup file
.It Pa /bsd
kernel image
+.It Pa /bsd.sp
+kernel image for single processor machines
.It Pa /bsd.mp
kernel image for multiprocessor machines
.It Pa /bsd.rd
diff --git a/sys/arch/i386/stand/biosboot/biosboot.8 b/sys/arch/i386/stand/biosboot/biosboot.8
index d5800a11eef..0b733874139 100644
--- a/sys/arch/i386/stand/biosboot/biosboot.8
+++ b/sys/arch/i386/stand/biosboot/biosboot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biosboot.8,v 1.22 2007/05/31 19:20:03 jmc Exp $
+.\" $OpenBSD: biosboot.8,v 1.23 2010/08/10 20:34:16 sobrado Exp $
.\"
.\" Copyright (c) 2003 Tom Cosgrove <tom.cosgrove@arches-consulting.com>
.\" Copyright (c) 1997 Michael Shalayeff
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: August 10 2010 $
.Dt BIOSBOOT 8 i386
.Os
.Sh NAME
@@ -241,9 +241,12 @@ PXE bootstrap
.It Pa /bsd
.Ox
kernel
+.It Pa /bsd.sp
+.Ox
+kernel for single processor machines
.It Pa /bsd.mp
.Ox
-kernel for multi-processor machines
+kernel for multiprocessor machines
.It Pa /bsd.rd
.Ox
kernel for installation/recovery
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index 8f2f64a6f50..8e3b74b7cbd 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot.8,v 1.50 2010/07/02 08:10:54 jmc Exp $
+.\" $OpenBSD: boot.8,v 1.51 2010/08/10 20:34:16 sobrado Exp $
.\"
.\" Copyright (c) 1997-2001 Michael Shalayeff
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd $Mdocdate: July 2 2010 $
+.Dd $Mdocdate: August 10 2010 $
.Dt BOOT 8 i386
.Os
.Sh NAME
@@ -328,6 +328,8 @@ system bootstrap
system bootstrap's startup file
.It Pa /bsd
kernel image
+.It Pa /bsd.sp
+kernel image for single processor machines
.It Pa /bsd.mp
kernel image for multiprocessor machines
.It Pa /bsd.rd
diff --git a/usr.bin/top/top.1 b/usr.bin/top/top.1
index a09810e455e..2eeb294bf59 100644
--- a/usr.bin/top/top.1
+++ b/usr.bin/top/top.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: top.1,v 1.56 2010/04/23 09:27:10 otto Exp $
+.\" $OpenBSD: top.1,v 1.57 2010/08/10 20:34:16 sobrado Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: April 23 2010 $
+.Dd $Mdocdate: August 10 2010 $
.Dt TOP 1
.Os
.Sh NAME
@@ -415,7 +415,7 @@ The current state (one of
.Li dead ,
or
.Li onproc ) .
-On multi-processor systems, this is followed by a slash and the CPU
+On multiprocessor systems, this is followed by a slash and the CPU
number on which the process is bound.
.It WAIT
A description of the wait channel the process is sleeping on if it's
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 11:06:47 +0000