From e798a806ce264c12611e0573c1ce4fc1a0998556 Mon Sep 17 00:00:00 2001
From: Philippe Charnier <charnier@FreeBSD.org>
Date: Mon, 3 Aug 1998 06:35:01 +0000
Subject: [PATCH] .Nm swapon -> .Nm. Sort #includes. Add rcsid.

---
 sbin/swapon/swapon.8 |  6 +++---
 sbin/swapon/swapon.c | 21 ++++++++++-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 77d89b91a99b..953796d773df 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: swapon.8,v 1.8 1998/01/25 17:28:52 steve Exp $
+.\"	$Id: swapon.8,v 1.9 1998/02/01 06:46:37 steve Exp $
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
@@ -50,14 +50,14 @@ are to take place.
 The system begins by swapping and paging on only a single device
 so that only one disk is required at bootstrap time.
 Calls to
-.Nm swapon
+.Nm
 normally occur in the system multi-user initialization file
 .Pa /etc/rc
 making all swap devices available, so that the paging and swapping
 activity is interleaved across several devices.
 .Pp
 Normally, the first form is used:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a
 All devices marked as ``sw''
 swap devices in
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index eb7e643d39fc..0480b1777f71 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -29,27 +29,28 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)swapon.c	8.1 (Berkeley) 6/5/93";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
-#include <fstab.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
 #include <err.h>
+#include <errno.h>
+#include <fstab.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 static void usage __P((void));
 int	add __P((char *name, int ignoreebusy));
@@ -57,8 +58,6 @@ int	add __P((char *name, int ignoreebusy));
 int
 main(int argc, char **argv)
 {
-	extern char *optarg;
-	extern int optind;
 	register struct fstab *fsp;
 	register int stat;
 	int ch, doall;