cleanup; ok hshoexer@

3 files changed, 24 insertions, 24 deletions

diff --git a/sbin/ipsecctl/ipsec.conf.5 b/sbin/ipsecctl/ipsec.conf.5
index fee4064d4ce..be559abc6ec 100644
--- a/sbin/ipsecctl/ipsec.conf.5
+++ b/sbin/ipsecctl/ipsec.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipsec.conf.5,v 1.2 2005/04/04 22:22:55 hshoexer Exp $
+.\"	$OpenBSD: ipsec.conf.5,v 1.3 2005/04/05 07:14:00 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Mathieu Sauve-Frankel  All rights reserved.
 .\"
@@ -46,18 +46,18 @@ flow-rule	= "flow" [( ah-rule | esp-rule | ipip-rule | ipcomp-rule )]
 
 group-rule	= "group" "{" flow-rule, flow-rule, ... "}"
 
-ah-rule		= "ah" [ "transport" ] [ ( "in" | "out" ) ] [ "log" ] 
-		  [ "on" ifspec ] hosts [ peers ] [ spi ] [ xform ] [ key ] 
+ah-rule		= "ah" [ "transport" ] [ ( "in" | "out" ) ] [ "log" ]
+		  [ "on" ifspec ] hosts [ peers ] [ spi ] [ xform ] [ key ]
 		  [ tag ]
 
 ipip-rule	= "ipip" [ ( "in" | "out" ) ] [ "log" ]
 		  [ "on" ifspec ] hosts [ peers ] [ spi ] [ tag ]
 
-esp-rule	= "esp" [ "transport" ] [ ( "in" | "out" ) ]  [ "log" ] 
-		  [ "on" ifspec ] hosts [ peers ] [ spi ] [ xform ] [ key ] 
+esp-rule	= "esp" [ "transport" ] [ ( "in" | "out" ) ]  [ "log" ]
+		  [ "on" ifspec ] hosts [ peers ] [ spi ] [ xform ] [ key ]
 		  [ tag ]
 
-ipcomp-rule	= "ipcomp" [ ( "in" | "out" ) ]  [ "log" ] [ "on" ifspec ] 
+ipcomp-rule	= "ipcomp" [ ( "in" | "out" ) ]  [ "log" ] [ "on" ifspec ]
 		   hosts [ peers ] [ cpi ]
 
 hosts		= "from" [
@@ -71,7 +71,7 @@ spi		= "spi" spispec
 
 spispec		= ( number | number:number )
 
-peers		= "peer" 
+peers		= "peer"
 
 xform		= "xform" xformspec
 
@@ -81,7 +81,7 @@ transform	= ( enc | enc-auth | auth )
 
 auth 		= ( "md5" | "rmd160" | "sha1" | "sha2-256" | "sha2-384" |
 		    "sha2-512" )
- 
+
 enc 		= ( "aes" | "blowfish" | "cast" | "des" | "3des" | "skipjack" )
 
 key 		= "key" string
@@ -112,6 +112,6 @@ address        = ( interface-name | "(" interface-name ")" | hostname |
 The
 .Nm
 file format first appeared in
-.Ox 3.7
+.Ox 3.7 .
 .\" .Sh CAVEATS
 .\" .Sh BUGS
diff --git a/sbin/ipsecctl/ipsecctl.8 b/sbin/ipsecctl/ipsecctl.8
index 50b5a866687..ee36676732b 100644
--- a/sbin/ipsecctl/ipsecctl.8
+++ b/sbin/ipsecctl/ipsecctl.8
@@ -1,49 +1,49 @@
-.\"	$OpenBSD: ipsecctl.8,v 1.3 2005/04/04 22:43:54 hshoexer Exp $
+.\"	$OpenBSD: ipsecctl.8,v 1.4 2005/04/05 07:14:00 jmc Exp $
 .\"
 .\" The following requests are required for all man pages.
-.Dd April, 5, 2005
-.Dt IPSECCTL 8 
+.Dd April 5, 2005
+.Dt IPSECCTL 8
 .Os
 .Sh NAME
 .Nm ipsecctl
-.Nd "control flows for IPsec
+.Nd control flows for IPsec
 .Sh SYNOPSIS
 .\" For a program:  program [-abc] file ...
 .Nm ipsecctl
-.Op Fl Fhnvs
+.Op Fl Fhnsv
 .Op Fl f Ar file
 .Sh DESCRIPTION
 The
 .Nm
-utility controls flows that determining which packets are to be processed by
+utility controls flows that determine which packets are to be processed by
 IPsec.
 It allows ruleset configuration and retrieval of status information from the
-kernels SPD (Security Policy Database).
+kernel's SPD (Security Policy Database).
 .Pp
 The ruleset grammar is described in
 .Xr ipsec.conf 5 .
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl f Ar file
-Load the rules contained in
-.Ar file .
 .It Fl F
 The
 .Fl F
 option flushes the SPD.
+.It Fl f Ar file
+Load the rules contained in
+.Ar file .
 .It Fl h
 Help.
 .It Fl n
 Do not actually load rules, just parse them.
+.It Fl s
+Show the ruleset loaded into the SPD.
 .It Fl v
 Produce more verbose output.
 A second use of
 .Fl v
 will produce even more verbose output.
-.It Fl s
-Show the ruleset loaded into the SPD.
-
+.El
 .\" The following requests should be uncommented and used where appropriate.
 .\" This next request is for sections 2, 3, and 9 function return values only.
 .\" .Sh RETURN VALUES
diff --git a/sbin/ipsecctl/ipsecctl.c b/sbin/ipsecctl/ipsecctl.c
index a87b919217c..e8fbab5af79 100644
--- a/sbin/ipsecctl/ipsecctl.c
+++ b/sbin/ipsecctl/ipsecctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsecctl.c,v 1.2 2005/04/04 22:22:55 hshoexer Exp $	*/
+/*	$OpenBSD: ipsecctl.c,v 1.3 2005/04/05 07:14:00 jmc Exp $	*/
 /*
  * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org>
  *
@@ -347,7 +347,7 @@ usage(void)
 {
 	extern char	*__progname;
 
-	fprintf(stderr, "usage: %s [-Fhnvs] [-f file]\n", __progname);
+	fprintf(stderr, "usage: %s [-Fhnsv] [-f file]\n", __progname);
 	exit(1);
 }