From a346bb64fa7542ef8803e52e697d8937620472de Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 23 Oct 2007 23:43:25 +0000 Subject: ISA cards can also happen non-i386 machines --- share/man/man4/Makefile | 4 +-- share/man/man4/ex.4 | 52 +++++++++++++++++++++++++++++++++++++++ share/man/man4/man4.i386/Makefile | 4 +-- share/man/man4/man4.i386/ex.4 | 52 --------------------------------------- 4 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 share/man/man4/ex.4 delete mode 100644 share/man/man4/man4.i386/ex.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b5b74f28ca3..eb15f4bb54c 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.431 2007/10/14 15:37:44 cnst Exp $ +# $OpenBSD: Makefile,v 1.432 2007/10/23 23:43:24 deraadt Exp $ MAN= aac.4 ac97.4 acphy.4 \ acpi.4 acpiac.4 acpibat.4 acpibtn.4 acpicpu.4 acpidock.4 \ @@ -16,7 +16,7 @@ MAN= aac.4 ac97.4 acphy.4 \ ch.4 ciphy.4 ciss.4 clcs.4 clct.4 cmpci.4 cnw.4 \ com.4 crypto.4 cue.4 cy.4 cz.4 dc.4 dcphy.4 ddb.4 de.4 dpt.4 \ drum.4 eap.4 ec.4 eephy.4 ef.4 eg.4 ehci.4 eisa.4 el.4 em.4 \ - emu.4 enc.4 ep.4 epic.4 esa.4 eso.4 ess.4 exphy.4 \ + emu.4 enc.4 ep.4 epic.4 esa.4 eso.4 ess.4 ex.4 exphy.4 \ faith.4 fd.4 fdc.4 fintek.4 fms.4 fpa.4 fxp.4 gdt.4 \ gentbi.4 gem.4 gif.4 \ glenv.4 gpio.4 gpioiic.4 gpioow.4 gpr.4 gre.4 gscsio.4 gtp.4 \ diff --git a/share/man/man4/ex.4 b/share/man/man4/ex.4 new file mode 100644 index 00000000000..444091092d5 --- /dev/null +++ b/share/man/man4/ex.4 @@ -0,0 +1,52 @@ +.\" $OpenBSD: ex.4,v 1.1 2007/10/23 23:43:24 deraadt Exp $ +.\" +.\" Copyright (c) 1997 David E. O'Brien +.\" +.\" 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. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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. +.Dd $Mdocdate: October 23 2007 $ +.Dt EX 4 +.Os +.Sh NAME +.Nm ex +.Nd Intel EtherExpress Pro/10 and Pro/10+ Ethernet device +.Sh SYNOPSIS +.Cd "ex0 at isa? port 0x320 irq 5" +.Sh DESCRIPTION +The +.Nm +interface provides access to a 10 Mb/s Ethernet network via the +Intel i82595 Ethernet chips. +This includes the following models: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Intel EtherExpress Pro/10 ISA +.It Intel EtherExpress Pro/10+ ISA +.El +.Sh SEE ALSO +.Xr arp 4 , +.Xr ifmedia 4 , +.Xr intro 4 , +.Xr isa 4 , +.Xr netintro 4 , +.Xr hostname.if 5 , +.Xr ifconfig 8 diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile index 719016d2980..f445a087127 100644 --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.64 2007/10/23 07:25:45 brad Exp $ +# $OpenBSD: Makefile,v 1.65 2007/10/23 23:43:24 deraadt Exp $ # from: @(#)Makefile 5.1 (Berkeley) 2/12/91 # Id: Makefile,v 1.4 1995/12/14 05:41:38 deraadt Exp $ -MAN= amdpcib.4 apm.4 autoconf.4 bios.4 cpu.4 elansc.4 esm.4 ex.4 \ +MAN= amdpcib.4 apm.4 autoconf.4 bios.4 cpu.4 elansc.4 esm.4 \ geodesc.4 glxpcib.4 glxsb.4 gscpcib.4 gscpm.4 gus.4 ie.4 \ ichpcib.4 intro.4 ioapic.4 \ joy.4 le.4 lms.4 mcd.4 mem.4 mms.4 mtrr.4 npx.4 nvram.4 pas.4 \ diff --git a/share/man/man4/man4.i386/ex.4 b/share/man/man4/man4.i386/ex.4 deleted file mode 100644 index 3a60be8b1df..00000000000 --- a/share/man/man4/man4.i386/ex.4 +++ /dev/null @@ -1,52 +0,0 @@ -.\" $OpenBSD: ex.4,v 1.1 2007/10/23 07:25:45 brad Exp $ -.\" -.\" Copyright (c) 1997 David E. O'Brien -.\" -.\" 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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. -.Dd $Mdocdate: October 23 2007 $ -.Dt EX 4 i386 -.Os -.Sh NAME -.Nm ex -.Nd Intel EtherExpress Pro/10 and Pro/10+ Ethernet device -.Sh SYNOPSIS -.Cd "ex0 at isa? port 0x320 irq 5" -.Sh DESCRIPTION -The -.Nm -interface provides access to a 10 Mb/s Ethernet network via the -Intel i82595 Ethernet chips. -This includes the following models: -.Pp -.Bl -tag -width Ds -offset indent -compact -.It Intel EtherExpress Pro/10 ISA -.It Intel EtherExpress Pro/10+ ISA -.El -.Sh SEE ALSO -.Xr arp 4 , -.Xr ifmedia 4 , -.Xr intro 4 , -.Xr isa 4 , -.Xr netintro 4 , -.Xr hostname.if 5 , -.Xr ifconfig 8 -- cgit v1.2.3