Move man pages out of man4.i386. Most of them are applicable to amd64

too, so, instead of descending to the i386 directory, we add some magic to
the parent Makefile.
These man pages refer to drivers that I'm aware that work on amd64. Most
likely there are more, but I'll deal with them later.

Approved by:	brueffer, philip, takawata

12 files changed, 23 insertions, 12 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 83f7cd5..4054b70 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -3,8 +3,15 @@
 
 MAN=	aac.4 \
 	acpi.4 \
+	${_acpi_aiboost.4} \
+	${_acpi_asus.4} \
 	${_acpi_dock.4} \
+	${_acpi_fujitsu.4} \
+	${_acpi_ibm.4} \
+	${_acpi_panasonic.4} \
+	${_acpi_sony.4} \
 	acpi_thermal.4 \
+	${_acpi_toshiba.4} \
 	acpi_video.4 \
 	adv.4 \
 	adw.4 \
@@ -127,6 +134,7 @@ MAN=	aac.4 \
 	inet6.4 \
 	intpm.4 \
 	intro.4 \
+	${_io.4} \
 	ip.4 \
 	ip6.4 \
 	ipfirewall.4 \
@@ -152,6 +160,7 @@ MAN=	aac.4 \
 	le.4 \
 	led.4 \
 	lge.4 \
+	${_linux.4} \
 	lmc.4 \
 	lo.4 \
 	lp.4 \
@@ -191,6 +200,7 @@ MAN=	aac.4 \
 	natmip.4 \
 	ncr.4 \
 	ncv.4 \
+	${_ndis.4} \
 	netgraph.4 \
 	netintro.4 \
 	${_nfe.4} \
@@ -492,6 +502,7 @@ MLINKS+=mem.4 kmem.4
 MLINKS+=mn.4 if_mn.4
 MLINKS+=mxge.4 if_mxge.4
 MLINKS+=my.4 if_my.4
+MLINKS+=${_ndis.4} ${_if_ndis.4}
 MLINKS+=netintro.4 net.4 \
 	netintro.4 networking.4
 MLINKS+=${_nfe.4} ${_if_nfe.4}
@@ -550,7 +561,14 @@ MLINKS+=xe.4 if_xe.4
 MLINKS+=xl.4 if_xl.4
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+_acpi_aiboost.4=acpi_aiboost.4
+_acpi_asus.4=	acpi_asus.4
 _acpi_dock.4=	acpi_dock.4
+_acpi_fujitsu.4=acpi_fujitsu.4
+_acpi_ibm.4=	acpi_ibm.4
+_acpi_panasonic.4=acpi_panasonic.4
+_acpi_sony.4=	acpi_sony.4
+_acpi_toshiba.4=acpi_toshiba.4
 _amdsmb.4=	amdsmb.4
 _asmc.4=	asmc.4
 _coretemp.4=	coretemp.4
@@ -559,11 +577,15 @@ _hptiop.4=	hptiop.4
 _hptmv.4=	hptmv.4
 _hptrr.4=	hptrr.4
 _ichwd.4=	ichwd.4
+_if_ndis.4=	if_ndis.4
 _if_nfe.4=	if_nfe.4
 _if_nve.4=	if_nve.4
 _if_nxge.4=	if_nxge.4
 _if_wpi.4=	if_wpi.4
 _ipmi.4=	ipmi.4
+_io.4=		io.4
+_linux.4=	linux.4
+_ndis.4=	ndis.4
 _k8temp.4=	k8temp.4
 _nfe.4=		nfe.4
 _nfsmb.4=	nfsmb.4
diff --git a/share/man/man4/man4.i386/acpi_aiboost.4 b/share/man/man4/acpi_aiboost.4
index c5d918b..c5d918b 100644
--- a/share/man/man4/man4.i386/acpi_aiboost.4
+++ b/share/man/man4/acpi_aiboost.4
diff --git a/share/man/man4/man4.i386/acpi_asus.4 b/share/man/man4/acpi_asus.4
index 8216add..8216add 100644
--- a/share/man/man4/man4.i386/acpi_asus.4
+++ b/share/man/man4/acpi_asus.4
diff --git a/share/man/man4/man4.i386/acpi_fujitsu.4 b/share/man/man4/acpi_fujitsu.4
index 1959bf6..1959bf6 100644
--- a/share/man/man4/man4.i386/acpi_fujitsu.4
+++ b/share/man/man4/acpi_fujitsu.4
diff --git a/share/man/man4/man4.i386/acpi_ibm.4 b/share/man/man4/acpi_ibm.4
index f0c165d..f0c165d 100644
--- a/share/man/man4/man4.i386/acpi_ibm.4
+++ b/share/man/man4/acpi_ibm.4
diff --git a/share/man/man4/man4.i386/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4
index 8a8851e..8a8851e 100644
--- a/share/man/man4/man4.i386/acpi_panasonic.4
+++ b/share/man/man4/acpi_panasonic.4
diff --git a/share/man/man4/man4.i386/acpi_sony.4 b/share/man/man4/acpi_sony.4
index 52a7fbe..52a7fbe 100644
--- a/share/man/man4/man4.i386/acpi_sony.4
+++ b/share/man/man4/acpi_sony.4
diff --git a/share/man/man4/man4.i386/acpi_toshiba.4 b/share/man/man4/acpi_toshiba.4
index cb26842..cb26842 100644
--- a/share/man/man4/man4.i386/acpi_toshiba.4
+++ b/share/man/man4/acpi_toshiba.4
diff --git a/share/man/man4/man4.i386/io.4 b/share/man/man4/io.4
index 15c0c4d..15c0c4d 100644
--- a/share/man/man4/man4.i386/io.4
+++ b/share/man/man4/io.4
diff --git a/share/man/man4/man4.i386/linux.4 b/share/man/man4/linux.4
index 8c368b3..8c368b3 100644
--- a/share/man/man4/man4.i386/linux.4
+++ b/share/man/man4/linux.4
diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile
index dd6a763..001a196 100644
--- a/share/man/man4/man4.i386/Makefile
+++ b/share/man/man4/man4.i386/Makefile
@@ -1,13 +1,6 @@
 # $FreeBSD$
 
-MAN=	acpi_aiboost.4 \
-	acpi_asus.4 \
-	acpi_fujitsu.4 \
-	acpi_ibm.4 \
-	acpi_panasonic.4 \
-	acpi_sony.4 \
-	acpi_toshiba.4 \
-	aic.4 \
+MAN=	aic.4 \
 	alpm.4 \
 	amdpm.4 \
 	apm.4 \
@@ -25,12 +18,9 @@ MAN=	acpi_aiboost.4 \
 	glxsb.4 \
 	ichwd.4 \
 	ie.4 \
-	io.4 \
-	linux.4 \
 	longrun.4 \
 	mcd.4 \
 	mse.4 \
-	ndis.4 \
 	npx.4 \
 	padlock.4 \
 	pae.4 \
@@ -52,7 +42,6 @@ MAN=	acpi_aiboost.4 \
 	wl.4
 
 MLINKS=	CPU_ELAN.4 CPU_SOEKRIS.4
-MLINKS+=ndis.4 if_ndis.4
 MLINKS+=pae.4 PAE.4
 
 MANSUBDIR=/i386
diff --git a/share/man/man4/man4.i386/ndis.4 b/share/man/man4/ndis.4
index 7f723d0..7f723d0 100644
--- a/share/man/man4/man4.i386/ndis.4
+++ b/share/man/man4/ndis.4