section reorder;

7 files changed, 81 insertions, 76 deletions

diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 6110bc9fdd4..42e15011b1d 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.2,v 1.15 2003/03/17 09:52:21 jmc Exp $
+.\"	$OpenBSD: stat.2,v 1.16 2003/06/02 09:21:32 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -190,17 +190,6 @@ Upon successful completion a value of 0 is returned.
 Otherwise, a value of \-1 is returned and
 .Va errno
 is set to indicate the error.
-.Sh COMPATIBILITY
-Previous versions of the system used different types for the
-.Fa st_dev ,
-.Fa st_uid ,
-.Fa st_gid ,
-.Fa st_rdev ,
-.Fa st_size ,
-.Fa st_blksize ,
-and
-.Fa st_blocks
-fields.
 .Sh ERRORS
 .Fn stat
 and
@@ -242,33 +231,23 @@ points to an invalid address.
 .It Bq Er EIO
 An I/O error occurred while reading from or writing to the file system.
 .El
-.Sh CAVEATS
-The file generation number,
-.Fa st_gen ,
-is only available to the superuser.
-.Pp
-The fields in the stat structure currently marked
-.Fa st_spare1 ,
-.Fa st_spare2 ,
-and
-.Fa st_spare3
-are present in preparation for inode time stamps expanding to 64 bits.
-This, however, can break certain programs that
-depend on the time stamps being contiguous (in calls to
-.Xr utimes 2 ) .
 .Sh SEE ALSO
 .Xr chmod 2 ,
 .Xr chown 2 ,
 .Xr utimes 2 ,
 .Xr symlink 7
-.Sh BUGS
-Applying
-.Fn fstat
-to a socket (and thus to a pipe)
-returns a zeroed buffer,
-except for the blocksize field,
-and a unique device and inode number.
 .Sh STANDARDS
+Previous versions of the system used different types for the
+.Fa st_dev ,
+.Fa st_uid ,
+.Fa st_gid ,
+.Fa st_rdev ,
+.Fa st_size ,
+.Fa st_blksize ,
+and
+.Fa st_blocks
+fields.
+.Pp
 The
 .Fn stat
 and
@@ -284,3 +263,24 @@ An
 .Fn lstat
 function call appeared in
 .Bx 4.2 .
+.Sh CAVEATS
+The file generation number,
+.Fa st_gen ,
+is only available to the superuser.
+.Pp
+The fields in the stat structure currently marked
+.Fa st_spare1 ,
+.Fa st_spare2 ,
+and
+.Fa st_spare3
+are present in preparation for inode time stamps expanding to 64 bits.
+This, however, can break certain programs that
+depend on the time stamps being contiguous (in calls to
+.Xr utimes 2 ) .
+.Sh BUGS
+Applying
+.Fn fstat
+to a socket (and thus to a pipe)
+returns a zeroed buffer,
+except for the blocksize field,
+and a unique device and inode number.
diff --git a/lib/libc/sys/swapctl.2 b/lib/libc/sys/swapctl.2
index 82b4ac09974..0bb87ec05ef 100644
--- a/lib/libc/sys/swapctl.2
+++ b/lib/libc/sys/swapctl.2
@@ -1,3 +1,4 @@
+.\"	$OpenBSD: swapctl.2,v 1.13 2003/06/02 09:21:32 jmc Exp $
 .\"	$NetBSD: swapctl.2,v 1.10 1998/08/29 17:11:09 mrg Exp $
 .\"
 .\" Copyright (c) 1997 Matthew R. Green
@@ -209,11 +210,6 @@ points outside the process' allocated address space.
 .Sh SEE ALSO
 .Xr config 8 ,
 .Xr swapctl 8
-.Sh AUTHORS
-The current swap system was designed and implemented by Matthew Green
-<mrg@eterna.com.au>, with help from Paul Kranenburg <pk@NetBSD.ORG>
-and Leo Weppelman <leo@NetBSD.ORG>, and insights from Jason R. Thorpe
-<thorpej@NetBSD.ORG>.
 .Sh HISTORY
 The
 .Fn swapctl
@@ -227,3 +223,12 @@ in
 .Nx 1.4 ,
 when the header file was also moved from
 .Aq Pa vm/vm_swap.h .
+.Sh AUTHORS
+The current swap system was designed and implemented by
+.An Matthew Green Aq mrg@eterna.com.au ,
+with help from Paul Kranenburg
+.Aq pk@NetBSD.ORG
+and Leo Weppelman
+.Aq leo@NetBSD.ORG ,
+and insights from Jason R. Thorpe
+.Aq thorpej@NetBSD.ORG .
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 5b79e9be08d..8c6472a8160 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: swapon.2,v 1.9 2000/10/18 05:12:12 aaron Exp $
+.\"	$OpenBSD: swapon.2,v 1.10 2003/06/02 09:21:32 jmc Exp $
 .\"	$NetBSD: swapon.2,v 1.7 1995/02/27 12:38:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -103,13 +103,13 @@ points outside the process's allocated address space.
 .Sh SEE ALSO
 .Xr config 8 ,
 .Xr swapon 8
-.Sh BUGS
-There is no way to stop swapping on a disk so that the pack may be
-dismounted.
-.Pp
-This call will be upgraded in future versions of the system.
 .Sh HISTORY
 The
 .Fn swapon
 function call appeared in
 .Bx 4.0 .
+.Sh BUGS
+There is no way to stop swapping on a disk so that the pack may be
+dismounted.
+.Pp
+This call will be upgraded in future versions of the system.
diff --git a/lib/libc/sys/sync.2 b/lib/libc/sys/sync.2
index f8494de0b5d..d8a70eae24f 100644
--- a/lib/libc/sys/sync.2
+++ b/lib/libc/sys/sync.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sync.2,v 1.7 2002/01/24 21:18:36 mickey Exp $
+.\"	$OpenBSD: sync.2,v 1.8 2003/06/02 09:21:32 jmc Exp $
 .\"	$NetBSD: sync.2,v 1.4 1995/02/27 12:38:41 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -64,11 +64,11 @@ may be used to synchronize individual file descriptor attributes.
 .Xr fsync 2 ,
 .Xr sync 8 ,
 .Xr update 8
-.Sh BUGS
-.Fn sync
-may return before the buffers are completely flushed.
 .Sh HISTORY
 A
 .Fn sync
 function call appeared in
 .At v2 .
+.Sh BUGS
+.Fn sync
+may return before the buffers are completely flushed.
diff --git a/lib/libc/sys/syscall.2 b/lib/libc/sys/syscall.2
index a5c3a32a90d..7dba9e1279b 100644
--- a/lib/libc/sys/syscall.2
+++ b/lib/libc/sys/syscall.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: syscall.2,v 1.5 1999/06/29 14:10:26 aaron Exp $
+.\"	$OpenBSD: syscall.2,v 1.6 2003/06/02 09:21:32 jmc Exp $
 .\"	$NetBSD: syscall.2,v 1.4 1995/02/27 12:38:53 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -68,12 +68,12 @@ In general, a 0 return value indicates success.
 A \-1 return value indicates an error,
 and an error code is stored in
 .Va errno .
-.Sh BUGS
-There is no way to simulate system calls that have multiple return values
-such as
-.Xr pipe 2 .
 .Sh HISTORY
 The
 .Fn syscall
 function call appeared in
 .Bx 4.0 .
+.Sh BUGS
+There is no way to simulate system calls that have multiple return values
+such as
+.Xr pipe 2 .
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index 1feaa5e51d5..6ad8504f1ca 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wait.2,v 1.13 2003/04/12 21:00:46 jmc Exp $
+.\"	$OpenBSD: wait.2,v 1.14 2003/06/02 09:21:32 jmc Exp $
 .\"	$NetBSD: wait.2,v 1.6 1995/02/27 12:39:37 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -260,6 +260,10 @@ Invalid or undefined flags were passed in the
 .Fa options
 argument.
 .El
+.Sh SEE ALSO
+.Xr _exit 2 ,
+.Xr sigaction 2 ,
+.Xr exit 3
 .Sh STANDARDS
 The
 .Fn wait
@@ -275,10 +279,6 @@ The
 macro and the ability to restart a pending
 .Fn wait
 call are extensions to the POSIX interface.
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr sigaction 2 ,
-.Xr exit 3
 .Sh HISTORY
 A
 .Fn wait
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index 8bc3104c455..1253e1c9f04 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: write.2,v 1.25 2003/04/03 23:12:01 jmc Exp $
+.\"	$OpenBSD: write.2,v 1.26 2003/06/02 09:21:32 jmc Exp $
 .\"	$NetBSD: write.2,v 1.6 1995/02/27 12:39:43 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -247,6 +247,23 @@ and
 .Fn pwrite
 functions conform to
 .St -xpg4.2 .
+.Sh HISTORY
+The
+.Fn pwritev
+function call appeared in
+.Ox 2.7 .
+The
+.Fn pwrite
+function call appeared in
+.At V.4 .
+The
+.Fn writev
+function call appeared in
+.Bx 4.2 .
+The
+.Fn write
+function call appeared in
+.At v2 .
 .Sh CAVEATS
 Error checks should explicitly test for \-1.
 Code such as
@@ -267,20 +284,3 @@ Proper loops should use
 .Bd -literal
 	while ((nr = write(fd, buf, sizeof(buf))) != -1 && nr != 0)
 .Ed
-.Sh HISTORY
-The
-.Fn pwritev
-function call appeared in
-.Ox 2.7 .
-The
-.Fn pwrite
-function call appeared in
-.At V.4 .
-The
-.Fn writev
-function call appeared in
-.Bx 4.2 .
-The
-.Fn write
-function call appeared in
-.At v2 .