Clean up man page sections.

Instead of pointing to an "ethers" file-format man page for the format
of MAC addresses, just give the formats we support in the man page -
it's our code, so we, not the OS vendor, control the formats.

Default the section with usermod to section 8, as Solaris 2.12 isn't out
yet.

diff --git a/configure b/configure
index 625fe20dfceceef485140b17aab99efe565fdc47..2b2aefde21c467244da8acc8c45b979c884b87ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -634,7 +634,6 @@ NETFILTER_SRC
 PCAP_SUPPORT_NETFILTER
 USB_SRC
 PCAP_SUPPORT_USB
-MAN_ETHERS_SECTION
 MAN_USERMOD_SECTION
 MAN_MISC_INFO
 MAN_FILE_FORMATS
@@ -7251,8 +7250,7 @@ fi
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7
-MAN_USERMOD_SECTION=1M
-MAN_ETHERS_SECTION=3N
+MAN_USERMOD_SECTION=8
 case "$host_os" in
 
 aix*)
@@ -7511,25 +7509,21 @@ solaris*)
 $as_echo "#define HAVE_SOLARIS 1" >>confdefs.h
 
 
+       DYEXT="so"
+
        case "`uname -r`" in
-           5.12)
-               MAN_USERMOD_SECTION=8
-               MAN_ETHERS_SECTION=5
-               MAN_FILE_FORMATS=5
-               MAN_MISC_INFO=7
+
+       5.12)
                ;;
-           *)
+
+       *)
                #
                # Use System V conventions for man pages.
                #
-
                MAN_USERMOD_SECTION=1m
-               MAN_ETHERS_SECTION=4
                MAN_FILE_FORMATS=4
                MAN_MISC_INFO=5
        esac
-
-       DYEXT="so"
        ;;
 esac
 
@@ -8424,7 +8418,6 @@ ln -s ${srcdir}/bpf/net net
 
 
 
-
 
 # Check whether --enable-usb was given.
 if test "${enable_usb+set}" = set; then :

diff --git a/configure.ac b/configure.ac
index cb908f778e69f4d3a99cadf6d77b6be44cfbf20e..02f4110d115f5bd87c454c5c969f9e8f2cbcd3f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1195,8 +1195,7 @@ fi
 DYEXT="none"
 MAN_FILE_FORMATS=5
 MAN_MISC_INFO=7
-MAN_USERMOD_SECTION=1M
-MAN_ETHERS_SECTION=3N
+MAN_USERMOD_SECTION=8
 case "$host_os" in
 
 aix*)
@@ -1429,25 +1428,21 @@ sinix*)
 solaris*)
        AC_DEFINE(HAVE_SOLARIS,1,[On solaris])
 
+       DYEXT="so"
+
        case "`uname -r`" in
-           5.12)
-               MAN_USERMOD_SECTION=8
-               MAN_ETHERS_SECTION=5
-               MAN_FILE_FORMATS=5
-               MAN_MISC_INFO=7
+
+       5.12)
                ;;
-           *)
+
+       *)
                #
                # Use System V conventions for man pages.
                #
-
                MAN_USERMOD_SECTION=1m
-               MAN_ETHERS_SECTION=4
                MAN_FILE_FORMATS=4
                MAN_MISC_INFO=5
        esac
-
-       DYEXT="so"
        ;;
 esac
 
@@ -1492,7 +1487,6 @@ AC_SUBST(DYEXT)
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)
 AC_SUBST(MAN_USERMOD_SECTION)
-AC_SUBST(MAN_ETHERS_SECTION)
 
 AC_ARG_ENABLE([usb],
 [AC_HELP_STRING([--enable-usb],[enable nusb support @<:@default=yes, if support available@:>@])],

diff --git a/pcap-filter.manmisc.in b/pcap-filter.manmisc.in
index f10560ea821280b6d066b3a6038240d0c659f56c..87e1cd1cf871d173f119be7d74dcdaed8a623c05 100644 (file)
--- a/pcap-filter.manmisc.in
+++ b/pcap-filter.manmisc.in
@@ -181,9 +181,10 @@ be checked for a match.
 .IP "\fBether dst \fIehost\fP"
 True if the Ethernet destination address is \fIehost\fP.
 \fIEhost\fP
-may be either a name from /etc/ethers or a number (see
-.IR ethers (@MAN_ETHERS_SECTION@)
-for numeric format).
+may be either a name from /etc/ethers or a numerical MAC address of the
+form "xx:xx:xx:xx:xx:xx", "xx.xx.xx.xx.xx.xx", "xx-xx-xx-xx-xx-xx",
+"xxxx.xxxx.xxxx", "xxxxxxxxxxxx", or various mixes of ':', '.', and '-',
+where each "x" is a hex digit (0-9, a-f, or A-F).
 .IP "\fBether src \fIehost\fP"
 True if the Ethernet source address is \fIehost\fP.
 .IP "\fBether host \fIehost\fP"