tweak man pages.

- add missing copyright
- delete comment lines from the template
- new sentence, new line
- on npppd.8 BUGS section, clarified that what is dropped is L2TP/IPsec
  packets

3 files changed, 19 insertions, 57 deletions

diff --git a/usr.sbin/npppd/npppd/npppd-users.5 b/usr.sbin/npppd/npppd/npppd-users.5
index f02ffb8941f..aac66b1e8d8 100644
--- a/usr.sbin/npppd/npppd/npppd-users.5
+++ b/usr.sbin/npppd/npppd/npppd-users.5
@@ -1,9 +1,21 @@
-.\"	$OpenBSD: npppd-users.5,v 1.2 2012/09/18 13:23:39 yasuoka Exp $
+.\"	$OpenBSD: npppd-users.5,v 1.3 2012/09/19 18:33:56 yasuoka Exp $
 .\"
+.\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" The following requests are required for all man pages.
 .\"
-.\" Remove `\&' from the line below.
-.Dd $Mdocdate: September 18 2012 $
+.Dd $Mdocdate: September 19 2012 $
 .Dt NPPPD-USERS 5
 .Os
 .Sh NAME
@@ -33,14 +45,6 @@ IPv4 netmask to be used for the user.
 .It calling-number Ta
 Calling phone number to check user's phone number.
 .El
-.\" The following requests should be uncommented and used where appropriate.
-.\" .Sh RETURN VALUES
-.\" For sections 2, 3, and 9 function return values only.
-.\" .Sh ENVIRONMENT
-.\" For sections 1, 6, 7 & 8 only.
-.\" .Sh FILES
-.\" .Sh EXIT STATUS
-.\" For sections 1, 6, & 8 only.
 .Sh EXAMPLES
 .Bd -literal
 taro:\\
@@ -51,17 +55,7 @@ hana:\\
     :password=hana's password:\\
     :framed-ip-address=192.168.0.102:
 .Ed
-.\" .Sh DIAGNOSTICS
-.\" For sections 1, 4, 6, 7, and 8 only.
-.\" .Sh ERRORS
-.\" For sections 2, 3, and 9 error and signal handling only.
 .Sh SEE ALSO
 .Xr npppd 8 ,
 .Xr npppd.conf 5 ,
 .Xr getcap 3
-.\" .Xr foobar 1
-.\" .Sh STANDARDS
-.\" .Sh HISTORY
-.\" .Sh AUTHORS
-.\" .Sh CAVEATS
-.\" .Sh BUGS
diff --git a/usr.sbin/npppd/npppd/npppd.8 b/usr.sbin/npppd/npppd/npppd.8
index 9bf4d9020fc..7a6e87071ce 100644
--- a/usr.sbin/npppd/npppd/npppd.8
+++ b/usr.sbin/npppd/npppd/npppd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: npppd.8,v 1.1 2012/09/18 13:14:08 yasuoka Exp $
+.\"	$OpenBSD: npppd.8,v 1.2 2012/09/19 18:33:56 yasuoka Exp $
 .\"
 .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
 .\"
@@ -15,7 +15,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" The following requests are required for all man pages.
 .\"
-.Dd $Mdocdate: September 18 2012 $
+.Dd $Mdocdate: September 19 2012 $
 .Dt NPPPD 8
 .Os
 .Sh NAME
@@ -69,11 +69,6 @@ to `1' by
 .Xr sysctl 8
 or
 .Xr sysctl.conf 5 .
-.\" The following requests should be uncommented and used where appropriate.
-.\" .Sh RETURN VALUES
-.\" For sections 2, 3, and 9 function return values only.
-.\" .Sh ENVIRONMENT
-.\" For sections 1, 6, 7 & 8 only.
 .Sh FILES
 .Bl -tag -width "/etc/npppd/npppd.conf" -compact
 .It Pa /etc/npppd/npppd.conf
@@ -81,13 +76,6 @@ default
 .Xr npppd 8
 configuration file
 .El
-.\" .Sh EXIT STATUS
-.\" For sections 1, 6, & 8 only.
-.\" .Sh EXAMPLES
-.\" .Sh DIAGNOSTICS
-.\" For sections 1, 4, 6, 7, and 8 only.
-.\" .Sh ERRORS
-.\" For sections 2, 3, and 9 error and signal handling only.
 .Sh SEE ALSO
 .Xr npppctl 8 ,
 .Xr npppd.conf 5 ,
@@ -97,8 +85,6 @@ configuration file
 .Xr gre 4 ,
 .Xr sysctl 8 ,
 .Xr sysctl.conf 5
-.\" .Xr foobar 1
-.\" .Sh STANDARDS
 .Sh HISTORY
 The
 .Nm
@@ -110,7 +96,6 @@ The
 .Nm
 program was written by Internet Initiative Japan Inc.
 .
-.\" .Sh CAVEATS
 .Sh BUGS
 If
 .Ic l2tp-require-ipsec
diff --git a/usr.sbin/npppd/npppd/npppd.conf.5 b/usr.sbin/npppd/npppd/npppd.conf.5
index 6bc71f1aa0e..bcc84577717 100644
--- a/usr.sbin/npppd/npppd/npppd.conf.5
+++ b/usr.sbin/npppd/npppd/npppd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: npppd.conf.5,v 1.2 2012/09/18 13:23:39 yasuoka Exp $
+.\"	$OpenBSD: npppd.conf.5,v 1.3 2012/09/19 18:33:56 yasuoka Exp $
 .\"
 .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org>
 .\"
@@ -14,8 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\"
-.Dd $Mdocdate: September 18 2012 $
+.Dd $Mdocdate: September 19 2012 $
 .Dt NPPPD.CONF 5
 .Os
 .Sh NAME
@@ -563,14 +562,6 @@ setting so that they are used together.
 .Ic bind Ic tunnel from Ar tunnel Ic authenticated by Ar authentication
 .Ic to Ar ifname
 .Ed
-.\" The following requests should be uncommented and used where appropriate.
-.\" .Sh RETURN VALUES
-.\" For sections 2, 3, and 9 function return values only.
-.\" .Sh ENVIRONMENT
-.\" For sections 1, 6, 7 & 8 only.
-.\" .Sh FILES
-.\" .Sh EXIT STATUS
-.\" For sections 1, 6, & 8 only.
 .Sh EXAMPLES
 Very simple configuration example is below:
 .Bd -literal -offset indent
@@ -615,20 +606,12 @@ authentication LOCAL type local {
 bind tunnel from L2TP authenticated by RADIUS to tun0
 bind tunnel from L2TP authenticated by LOCAL to tun1
 .Ed
-.\" .Sh DIAGNOSTICS
-.\" For sections 1, 4, 6, 7, and 8 only.
-.\" .Sh ERRORS
-.\" For sections 2, 3, and 9 error and signal handling only.
 .Sh SEE ALSO
 .Xr npppctl 8 ,
 .Xr npppd 8 ,
 .Xr pipex 4 ,
 .Xr tun 4 ,
 .Xr pppx 4
-.\" .Sh STANDARDS
-.\" .Sh HISTORY
-.\" .Sh AUTHORS
-.\" .Sh CAVEATS
 .Sh BUGS
 Current version of
 .Xr npppd 8