summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
Diffstat (limited to 'share')
-rw-r--r--share/man/man4/Makefile4
-rw-r--r--share/man/man4/ppp.412
-rw-r--r--share/man/man4/sl.484
-rw-r--r--share/man/man7/hier.77
4 files changed, 6 insertions, 101 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 1c9bc39dd1e..b67e878e494 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.582 2014/09/27 08:28:12 deraadt Exp $
+# $OpenBSD: Makefile,v 1.583 2014/10/01 10:05:17 mpi Exp $
MAN= aac.4 ac97.4 acphy.4 \
acpi.4 acpiac.4 acpiasus.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \
@@ -50,7 +50,7 @@ MAN= aac.4 ac97.4 acphy.4 \
rtfps.4 rtii.4 rtw.4 safe.4 safte.4 san.4 sbus.4 schsio.4 \
scsi.4 sd.4 \
sdmmc.4 sdhc.4 se.4 ses.4 \
- sf.4 sf2r.4 sfr.4 sili.4 siop.4 sis.4 sk.4 sl.4 sli.4 \
+ sf.4 sf2r.4 sfr.4 sili.4 siop.4 sis.4 sk.4 sli.4 \
sm.4 smsc.4 softraid.4 spdmem.4 sdtemp.4 speaker.4 sppp.4 sqphy.4 \
st.4 ste.4 stge.4 sti.4 \
stp.4 sv.4 sym.4 systrace.4 tcic.4 tcp.4 termios.4 tht.4 ti.4 tl.4 \
diff --git a/share/man/man4/ppp.4 b/share/man/man4/ppp.4
index 8477d875391..12d6d93e9f5 100644
--- a/share/man/man4/ppp.4
+++ b/share/man/man4/ppp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ppp.4,v 1.14 2013/06/02 20:23:33 tedu Exp $
+.\" $OpenBSD: ppp.4,v 1.15 2014/10/01 10:05:17 mpi Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" From: @(#)lo.4 8.1 (Berkeley) 6/5/93
.\"
-.Dd $Mdocdate: June 2 2013 $
+.Dd $Mdocdate: October 1 2014 $
.Dt PPP 4
.Os
.Sh NAME
@@ -52,13 +52,6 @@ command or by setting up a
.Xr hostname.if 5
configuration file for
.Xr netstart 8 .
-.Pp
-The
-.Nm
-interface can use various types of compression and has many advantages
-over the SLIP protocol used by the
-.Xr sl 4
-interface.
.Sh DIAGNOSTICS
.Bl -diag
.It ppp0: afX not supported
@@ -68,7 +61,6 @@ family; the packet was dropped.
.El
.Sh SEE ALSO
.Xr inet 4 ,
-.Xr sl 4 ,
.Xr hostname.if 5 ,
.Xr ifconfig 8 ,
.Xr netstart 8 ,
diff --git a/share/man/man4/sl.4 b/share/man/man4/sl.4
deleted file mode 100644
index 923331047db..00000000000
--- a/share/man/man4/sl.4
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" $OpenBSD: sl.4,v 1.18 2014/04/23 13:16:28 jca Exp $
-.\" $NetBSD: sl.4,v 1.1 1996/08/10 21:26:14 explorer Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 1993
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the University nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" 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.
-.\"
-.\" From: @(#)lo.4 8.1 (Berkeley) 6/5/93
-.\"
-.Dd $Mdocdate: April 23 2014 $
-.Dt SL 4
-.Os
-.Sh NAME
-.Nm sl
-.Nd slip network interface
-.Sh SYNOPSIS
-.Cd "pseudo-device sl"
-.Sh DESCRIPTION
-The
-.Nm
-interface allows serial lines to be used as network interfaces using the
-.Em slip
-protocol.
-.Pp
-An
-.Nm
-interface can be created at runtime using the
-.Ic ifconfig sl Ns Ar N Ic create
-command or by setting up a
-.Xr hostname.if 5
-configuration file for
-.Xr netstart 8 .
-.Pp
-The following link-level options are configurable via
-.Xr ifconfig 8 :
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It link0
-Use Van Jacobson TCP header compression.
-.It link1
-Suppress ICMP traffic.
-.It link2
-Auto-enable Van Jacobson TCP header compression
-(enabled by default).
-.El
-.Sh DIAGNOSTICS
-.Bl -diag
-.It sl0: afX not supported.
-The interface was handed
-a message with addresses formatted in an unsuitable address
-family; the packet was dropped.
-.El
-.Sh SEE ALSO
-.Xr inet 4 ,
-.Xr netintro 4 ,
-.Xr hostname.if 5 ,
-.Xr ifconfig 8 ,
-.Xr ldattach 8 ,
-.Xr netstart 8 ,
-.Xr sliplogin 8 ,
-.Xr slstats 8
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 347add55f72..a733bae6161 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hier.7,v 1.134 2014/09/17 16:39:42 jmc Exp $
+.\" $OpenBSD: hier.7,v 1.135 2014/10/01 10:05:17 mpi 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: September 17 2014 $
+.Dd $Mdocdate: October 1 2014 $
.Dt HIER 7
.Os
.Sh NAME
@@ -140,9 +140,6 @@ Example
.It skey/
One-time password user database for
.Xr skey 1 .
-.It sliphome/
-Configuration files for
-.Xr sliplogin 8 .
.It ssh/
Configuration files for
.Xr ssh 1