Move lp.4 to man4. It is not i386 dependent.

Fix ppbus and lpt declaration ('0' forgotten). Add info about retrieving
printer status with 'cat /dev/lpt0'.

4 files changed, 16 insertions, 10 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 39dd5a2..c64d71a 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -4,7 +4,7 @@ MAN4=	bpf.4 bridge.4 ccd.4 cd.4 ch.4 da.4 ddb.4 divert.4 drum.4 \
 	dummynet.4 fd.4 fpa.4 \
 	icmp.4 ifmib.4 iic.4 iicbb.4 iicbus.4 iicsmb.4 \
 	inet.4 intpm.4 intro.4 ip.4 ipfirewall.4 \
-	lkm.4 lo.4 lpbb.4 lpt.4 natm.4 netintro.4 \
+	lkm.4 lo.4 lp.4 lpbb.4 lpt.4 natm.4 netintro.4 \
 	null.4 od.4 pass.4 ppbus.4 ppi.4 ppp.4 pt.4 pty.4 \
 	route.4 sa.4 scsi.4 \
 	sd.4 sl.4 smb.4 smbus.4 smp.4 snp.4 sppp.4 ssc.4 st.4 su.4 tcp.4 \
@@ -14,6 +14,7 @@ MAN4=	bpf.4 bridge.4 ccd.4 cd.4 ch.4 da.4 ddb.4 divert.4 drum.4 \
 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
 MLINKS+=netintro.4 networking.4
 MLINKS+=ipfirewall.4 ipacct.4 ipfirewall.4 ipfw.4 ipfirewall.4 ipaccounting.4
+MLINKS+=lp.4 plip.4
 MLINKS+=fpa.4 fea.4
 MLINKS+=yp.4 YP.4 yp.4 nis.4 yp.4 NIS.4
 MLINKS+=smp.4 SMP.4
diff --git a/share/man/man4/man4.i386/lp.4 b/share/man/man4/lp.4
index 6f7a1cd..f8be0f6 100644
--- a/share/man/man4/man4.i386/lp.4
+++ b/share/man/man4/lp.4
@@ -31,11 +31,12 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: lp.4,v 1.8 1999/02/10 02:45:05 des Exp $
+.\"	Id: man4.i386/lp.4,v 1.9 1999/02/14 12:06:16 nsouch Exp
+.\"	$Id$
 .\"
 .Dd March 4, 1996
 .Os
-.Dt LP 4 i386
+.Dt LP 4
 .Sh NAME
 .Nm lp
 .Nd printer port Internet Protocol driver
diff --git a/share/man/man4/lpt.4 b/share/man/man4/lpt.4
index 5b08cbe..322748c 100644
--- a/share/man/man4/lpt.4
+++ b/share/man/man4/lpt.4
@@ -1,7 +1,7 @@
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" Copyright (c) 1994 Geoffrey M. Rehmet
-.\" Copyright (c) 1998 Nicolas Souchu
+.\" Copyright (c) 1999 Nicolas Souchu
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -34,8 +34,8 @@
 .Nd
 Generic printer device driver
 .Sh SYNOPSIS
-.Cd "controller ppbus"
-.Cd "device lpt at ppbus?"
+.Cd "controller ppbus0"
+.Cd "device lpt0 at ppbus?"
 .Pp
 .Cd "controller	ppc0	at isa? port" \&"IO_LPT1\&" tty irq 7
 .Cd "controller	ppc1	at isa? port" \&"IO_LPT2\&" tty irq 7
@@ -75,8 +75,13 @@ command.
 .Pp
 Depending on your hardware, extended capabilities may be configured with the
 .Xr lptcontrol 8
-command (use the -e option). With an ECP/ISA port, you can take advantage
+command. With an ECP/ISA port, you can take advantage
 of FIFO and DMA.
+.Pp
+In order to retrieve printer info from /dev/lpt0, just apply the
+.Nm cat
+command to the device. If the printer supports IEEE1284 nibble mode and has
+data to send to the host, you'll get it.
 .Sh SEE ALSO
 .Xr ppbus 4 ,
 .Xr lptcontrol 8
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index 1eff012..804c37b 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,9 +1,9 @@
-#	$Id: Makefile,v 1.97 1999/02/10 02:45:05 des Exp $
+#	$Id: Makefile,v 1.98 1999/02/13 17:48:41 nsouch Exp $
 
 MAN4=	adv.4 adw.4 aha.4 ahb.4 ahc.4 aic.4 alpm.4 apm.4 ar.4 asc.4 atkbd.4 \
 	atkbdc.4 ax.4 bktr.4 bt.4 cs.4 cx.4 cy.4 de.4 \
 	dgb.4 dpt.4 ed.4 el.4 en.4 ep.4 ex.4 fdc.4 fe.4 fxp.4 gsc.4 ie.4 \
-	io.4 joy.4 keyboard.4 labpc.4 le.4 lnc.4 lp.4 matcd.4 mcd.4 \
+	io.4 joy.4 keyboard.4 labpc.4 le.4 lnc.4 matcd.4 mcd.4 \
 	mem.4 meteor.4 mouse.4 mse.4 mtio.4 mx.4 ncr.4 npx.4 \
 	pcf.4 pcm.4 pcvt.4 perfmon.4 pn.4 pnp.4 ppc.4 psm.4 \
 	rdp.4 rl.4 sb.4 scd.4 screen.4 si.4 sio.4 \
@@ -46,7 +46,6 @@ MLINKS+=	keyboard.4 ../keyboard.4
 MLINKS+=	labpc.4 ../labpc.4
 MLINKS+=	le.4 ../le.4
 MLINKS+=	lnc.4 ../lnc.4
-MLINKS+=	lp.4 ../lp.4 lp.4 plip.4 lp.4 ../plip.4
 MLINKS+=	matcd.4 ../matcd.4
 MLINKS+=	mcd.4 ../mcd.4
 MLINKS+=	mem.4 kmem.4 mem.4 ../mem.4 mem.4 ../kmem.4