This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Misc documentation things


This brings together some previously unreferenced doc pages into the new (albeit imperfect) doc system. It also fixes up all the "doc" directives in CDL, including adding new ones where they didn't already exist but should have. The ecos reference guide is now known as ecos-ref.*, not just ecos.*. And I reordered the docs a little to a functional grouping that made a little more sense (to me).

There's a bunch of other doc fixes thrown in for good measure, but the only one worth commenting on is that I've removed all references to EL/IX from the POSIX docs now, including changing the title of the docs. EL/IX has passed on, it is no more, it has ceased to be, kicked the bucket, shuffled off its mortal coil. EL/IX is an ex-standard.

This is going into trunk and v2 branch.

Jifl
--
eCosCentric    http://www.eCosCentric.com/    The eCos and RedBoot experts
--[ "You can complain because roses have thorns, or you ]--
--[  can rejoice because thorns have roses." -Lincoln   ]-- Opinions==mine
? doc.diff
Index: doc/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/doc/ChangeLog,v
retrieving revision 1.13
diff -u -5 -p -r1.13 ChangeLog
--- doc/ChangeLog	3 Feb 2003 16:35:33 -0000	1.13
+++ doc/ChangeLog	24 Feb 2003 06:46:05 -0000
@@ -1,5 +1,22 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* sgml/doclist: Reorder in a slightly more logical order with
+	related bits grouped together.
+	Add docs for power management, USB (slave, eth slave, and SA11x0
+	and NEC uPD8985xx drivers), and synthetic target HAL, eth and
+	watchdog drivers.
+
+	* sgml/.cvsignore: Add gifs and rename ecos.* to ecos-ref.*
+
+	* sgml/makemakefile: Rename ecos.sgml/html/etc. to ecos-ref.
+	Copy over GIFs where they exist.
+	Don't treat porting guide specially at the top... treat it only as
+	specially as the other special cases.
+	Update (C) holders.
+	Update licence/warranty blurb.
+
 2003-01-30  Andrew Lunn  <andrew dot lunn at ascom dot ch>
 
 	* sgml/doclist: Added snmp-manpages.sgml 
 	* sgml/makemakefile: Extend the kludge to include snmp-manpages.sgml
 	
Index: doc/sgml/.cvsignore
===================================================================
RCS file: /cvs/ecos/ecos/doc/sgml/.cvsignore,v
retrieving revision 1.2
diff -u -5 -p -r1.2 .cvsignore
--- doc/sgml/.cvsignore	22 Dec 2002 11:18:55 -0000	1.2
+++ doc/sgml/.cvsignore	24 Feb 2003 06:46:05 -0000
@@ -1,8 +1,9 @@
-ecos.sgml
-ecos.tex
-ecos.log
-ecos.aux
-ecos.out
-ecos.pdf
+ecos-ref.sgml
+ecos-ref.tex
+ecos-ref.log
+ecos-ref.aux
+ecos-ref.out
+ecos-ref.pdf
 makefile
-*.html
\ No newline at end of file
+*.html
+*.gif
Index: doc/sgml/doclist
===================================================================
RCS file: /cvs/ecos/ecos/doc/sgml/doclist,v
retrieving revision 1.7
diff -u -5 -p -r1.7 doclist
--- doc/sgml/doclist	3 Feb 2003 16:35:33 -0000	1.7
+++ doc/sgml/doclist	24 Feb 2003 06:46:05 -0000
@@ -1,26 +1,35 @@
 kernel/current/doc/kernel.sgml
-compat/uitron/current/doc/uitron.sgml
-hal/common/current/doc/hal.sgml
-io/common/current/doc/io.sgml
-io/pci/current/doc/pci.sgml
-language/c/libc/common/current/doc/libc.sgml
-compat/posix/current/doc/posix.sgml
-io/fileio/current/doc/fileio.sgml
 redboot/current/doc/redboot.sgml
 redboot/current/doc/redboot_cmds.sgml
 redboot/current/doc/redboot_rebuilding.sgml
 redboot/current/doc/redboot_installing.sgml
 redboot/current/doc/redboot_epilogue.sgml
+hal/common/current/doc/hal.sgml
+hal/common/current/doc/porting.sgml
+language/c/libc/common/current/doc/libc.sgml
+io/common/current/doc/io.sgml
+io/fileio/current/doc/fileio.sgml
+io/pci/current/doc/pci.sgml
+compat/posix/current/doc/posix.sgml
+compat/uitron/current/doc/uitron.sgml
 net/common/current/doc/tcpip.sgml
 net/common/current/doc/tcpip-manpages.sgml
-net/tcpip/current/doc/openbsd.sgml
 net/bsd_tcpip/current/doc/freebsd.sgml
+net/tcpip/current/doc/openbsd.sgml
+net/ns/dns/current/doc/dns.sgml
 io/eth/current/doc/ethdrv.sgml
 net/snmp/agent/current/doc/snmp.sgml
 net/snmp/agent/current/doc/snmp-manpages.sgml
-net/ns/dns/current/doc/dns.sgml
 net/httpd/current/doc/httpd.sgml
 net/ftpclient/current/doc/ftpclient.sgml
 services/crc/current/doc/crc.sgml
 services/cpuload/current/doc/cpuload.sgml
 services/profile/gprof/current/doc/profile.sgml
+services/power/common/current/doc/power.sgml
+io/usb/slave/current/doc/usbs.sgml
+io/usb/eth/slave/current/doc/usbseth.sgml
+hal/synth/arch/current/doc/synth.sgml
+devs/usb/sa11x0/current/doc/usbs_sa11x0.sgml
+devs/usb/nec_upd985xx/current/doc/usbs_upd985xx.sgml
+devs/eth/synth/ecosynth/current/doc/syntheth.sgml
+devs/watchdog/synth/current/doc/synth_watchdog.sgml
Index: doc/sgml/makemakefile
===================================================================
RCS file: /cvs/ecos/ecos/doc/sgml/makemakefile,v
retrieving revision 1.9
diff -u -5 -p -r1.9 makemakefile
--- doc/sgml/makemakefile	3 Feb 2003 16:35:33 -0000	1.9
+++ doc/sgml/makemakefile	24 Feb 2003 06:46:05 -0000
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-touch ecos.sgml
+touch ecos-ref.sgml
 touch makefile
-chmod +w ecos.sgml 
+chmod +w ecos-ref.sgml 
 chmod +w makefile
 
 cat > makefile <<EOF
 #=============================================================================
 #
@@ -15,10 +15,11 @@ cat > makefile <<EOF
 #=============================================================================
 #####ECOSGPLCOPYRIGHTBEGIN####
 # -------------------------------------------
 # This file is part of eCos, the Embedded Configurable Operating System.
 # Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+# Copyright (C) 2003 Jonathan Larmour
 #
 # eCos is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation; either version 2 or (at your option) any later version.
 #
@@ -53,14 +54,14 @@ cat > makefile <<EOF
 #####DESCRIPTIONEND####
 #=============================================================================
 
 TOPLEVEL   := ../../packages
 EOF
-/bin/echo MAIN_SGML   := ecos.sgml >> makefile
+/bin/echo MAIN_SGML   := ecos-ref.sgml >> makefile
 /bin/echo -n OTHER_SGML   :=  >> makefile
 
-cat >ecos.sgml <<EOF
+cat >ecos-ref.sgml <<EOF
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
 
 <!-- Begin Document Specific Declarations -->
 <!ENTITY ui "&micro;ITRON">
 <!ENTITY versiondir CDATA "v2_0">
@@ -73,39 +74,54 @@ PACKAGEVER=${1:-'current'}
 for i in `cat doclist`; do
   line="`echo $i | sed 's/#.*//;'`"
   if (test ! -z $line); then
    /bin/echo -n " ../../packages/$i" | sed "s@/current/@/${PACKAGEVER}/@g" >> makefile
    entityi="`echo $i | sed 's@/@- at g; s at \ dot @- at g; s at _@- at g; s at -current-doc@@g; s at -current@@g'`"
-   echo "<!ENTITY $entityi SYSTEM \"../../packages/$i\">" | sed "s@/current/@/${PACKAGEVER}/@g" >> ecos.sgml
+   echo "<!ENTITY $entityi SYSTEM \"../../packages/$i\">" | sed "s@/current/@/${PACKAGEVER}/@g" >> ecos-ref.sgml
+  fi
+done
+
+# Go through again but find GIFs to copy
+for i in `for j in \`cat doclist\` ; do dirname $j ; done | sort | uniq` ; do
+  diri=`echo ../../packages/$i | sed "s@/current/@/${PACKAGEVER}/@g"`
+  dirigifs=`ls $diri/*.gif 2>/dev/null | tr '\n' ' '`
+  if [ x"$dirigifs" != x ]; then
+        copyfiles="$copyfiles $dirigifs"
   fi
 done
-echo "<!ENTITY hal-common-current-doc-porting-sgml SYSTEM \"../../packages/hal/common/${PACKAGEVER}/doc/porting.sgml\">" >> ecos.sgml
 
 cat >> makefile <<EOF
 
-MAIN_HTML  := ecos.html
-MAIN_PDF   := ecos.pdf
+MAIN_HTML  := ecos-ref.html
+MAIN_PDF   := ecos-ref.pdf
 PICTURES   :=
+COPYFILES  := $copyfiles
 
 include \$(TOPLEVEL)/pkgconf/rules.doc
 EOF
 
-cat >> ecos.sgml <<EOF
+cat >> ecos-ref.sgml <<EOF
 <!-- End Document Specific Declarations -->
 ]>
 
-<BOOK ID="ECOS">
+<BOOK ID="ECOS-REF">
   <bookinfo>
-    <TITLE>eCos</TITLE>
+    <TITLE>eCos Reference Manual</TITLE>
 
     <copyright>
       <year>1998</year>
       <year>1999</year>
       <year>2000</year>
       <year>2001</year>
       <year>2002</year>
+      <year>2003</year>
       <holder>Red Hat, Inc.</holder>
+      <holder>Nick Garnett (eCosCentric)</holder>
+      <holder>Jonathan Larmour (eCosCentric)</holder>
+      <holder>Andrew Lunn (Ascom)</holder>
+      <holder>Gary Thomas (MLB Associates)</holder>
+      <holder>Bart Veer (eCosCentric)</holder>
     </copyright>
 
     <legalnotice>
 	<title>Documentation licensing terms</title>
 <para>This material may be distributed only subject to the terms
@@ -151,16 +167,18 @@ of Microsoft Corporation, Inc. </para>
 <para>All other brand and product names, trademarks, and copyrights are the
 property of their respective owners. </para>
       </legalnotice>
       <legalnotice>
 <title>Warranty</title>
-<para>eCos and RedBoot are open source software, covered by the Red Hat eCos Public License,
+<para>eCos and RedBoot are open source software, covered by a
+modified version of the <ulink url="http://www.gnu.org/copyleft/gpl.html";>GNU
+General Public Licence</ulink>,
 and you are welcome to change it and/or distribute copies of it under certain
-conditions. The supplied version of eCos and/or RedBoot is supported for customers of Red Hat. See <ulink
+conditions. See <ulink
 url="http://sources.redhat.com/ecos/license-overview.html";>http://sources.redhat.com/ecos/license-overview.html
-</ulink></para>
-<para>For non-customers, eCos and RedBoot software has NO WARRANTY. </para>
+</ulink> for more information about the license.</para>
+<para>eCos and RedBoot software have NO WARRANTY. </para>
 <para>Because this software is licensed free of charge, there are no warranties
 for it, to the extent permitted by applicable law. Except when otherwise stated
 in writing, the copyright holders and/or other parties provide the software
 &ldquo;as is&rdquo; without warranty of any kind, either expressed or implied,
 including, but not limited to, the implied warranties of merchantability and
@@ -184,14 +202,12 @@ EOF
 for i in `cat doclist`; do
   line="`echo $i | sed 's/#.*//;'`"
   if (test ! -z $line); then
    entityi="`echo $i | sed 's@/@- at g; s at \ dot @- at g; s at _@- at g; s at -current-doc@@g; s at -current@@g'`"
    # special kludge
-   if [ "`basename $i`" != "tcpip-manpages.sgml" -a "`basename $i`" != "snmp-manpages.sgml" ]; then
-     echo "&$entityi;" >> ecos.sgml
+   if [ "`basename $i`" != "tcpip-manpages.sgml" -a "`basename $i`" != "snmp-manpages.sgml" -a "`basename $i`" != "porting.sgml" ]; then
+     echo "&$entityi;" >> ecos-ref.sgml
    fi
   fi
 done
 
-echo '</book>' >> ecos.sgml
-
-
+echo '</book>' >> ecos-ref.sgml
Index: packages/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/ChangeLog,v
retrieving revision 1.99
diff -u -5 -p -r1.99 ChangeLog
--- packages/ChangeLog	21 Feb 2003 18:17:32 -0000	1.99
+++ packages/ChangeLog	24 Feb 2003 06:46:07 -0000
@@ -1,5 +1,11 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* pkgconf/rules.doc: Allow support for copying files directly from
+	source doc dir to build dir. Primarily intended for copying over
+	pre-built GIFs for the moment.
+
 2003-02-20  Gary Thomas  <gary at mind dot be>
 
 	* ecos.db: New platform - NMI uE250 (ARM Xscale PXA250)
 
 2003-02-14  Tim Michals  <t dot michals at attbi dot com>
Index: packages/compat/posix/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/posix/current/ChangeLog,v
retrieving revision 1.37
diff -u -5 -p -r1.37 ChangeLog
--- packages/compat/posix/current/ChangeLog	13 Feb 2003 14:34:04 -0000	1.37
+++ packages/compat/posix/current/ChangeLog	24 Feb 2003 06:46:07 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* doc/posix.sgml: Expunge EL/IX. Dead standard.
+
 2003-02-13  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* src/mutex.cxx: Include sched.hxx for scheduler lock/unlock primitives.
 	Reported by Jani Monoses.
 
Index: packages/compat/posix/current/cdl/posix.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/posix/current/cdl/posix.cdl,v
retrieving revision 1.10
diff -u -5 -p -r1.10 posix.cdl
--- packages/compat/posix/current/cdl/posix.cdl	31 Jan 2003 11:53:14 -0000	1.10
+++ packages/compat/posix/current/cdl/posix.cdl	24 Feb 2003 06:46:08 -0000
@@ -50,10 +50,11 @@
 
 cdl_package CYGPKG_POSIX {
     display        "POSIX compatibility layer"
     description    "This package enables the POSIX compatibility
                     layer that implements IEEE 1003.1."
+    doc            ref/posix-compatibility.html
     include_dir    cyg/posix
     
     requires       CYGPKG_KERNEL
     requires       CYGPKG_ISOINFRA
     requires       CYGPKG_ERROR
Index: packages/compat/posix/current/doc/posix.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/posix/current/doc/posix.sgml,v
retrieving revision 1.3
diff -u -5 -p -r1.3 posix.sgml
--- packages/compat/posix/current/doc/posix.sgml	13 Jan 2003 05:49:43 -0000	1.3
+++ packages/compat/posix/current/doc/posix.sgml	24 Feb 2003 06:46:09 -0000
@@ -27,22 +27,21 @@
 <!-- ####DESCRIPTIONEND####                                          -->
 <!-- =============================================================== -->
 
 <!-- }}} -->
 
-<part id="elix-compatibility">
-<title>eCos EL/IX compatibility layer</title>
+<part id="posix-compatibility">
+<title>eCos POSIX compatibility layer</title>
 
 <chapter id="posix-standard-support">
 <title>POSIX Standard Support</title>
 
 <!-- {{{ Intro  -->
 
     <para>
       eCos contains support for the POSIX Specification (ISO&sol;IEC
-      9945-1)&lsqb;POSIX&rsqb;. This support follows EL&sol;IX level 1
-      in the functionality supplied &lsqb;ELIX&rsqb;.
+      9945-1)&lsqb;POSIX&rsqb;.
     </para>
     <para>
       POSIX support is divided between the POSIX and the FILEIO
       packages. The POSIX package provides support for threads,
       signals, synchronization, timers and message queues. The FILEIO
@@ -1461,17 +1460,10 @@ int shutdown( int s, int how);
 <!-- {{{ Bibliography -->
 
 <bibliography id="posix-references-and-bibliography">
 <title>References and Bibliography</title>
 
-    <bibliomixed>
-      <bibliomisc>[ELIX]</bibliomisc>
-      <title>Embedded Linux API Specification</title>
-      <bibliomisc><ulink
-	  url="http://sources.redhat.com/elix/";>http://sources.redhat.com/elix/
-	</ulink></bibliomisc>
-    </bibliomixed>
     <bibliomixed>
       <bibliomisc>&lsqb;Lewine&rsqb;</bibliomisc>
       <author>
 	<firstname>Donald</firstname>
 	<othername>A.</othername>
Index: packages/compat/uitron/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -p -r1.23 ChangeLog
--- packages/compat/uitron/current/ChangeLog	29 May 2002 18:28:04 -0000	1.23
+++ packages/compat/uitron/current/ChangeLog	24 Feb 2003 06:46:09 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/uitron.cdl: Update doc link.
+
 2002-05-27  Jesper Skov  <jskov at redhat dot com>
 
 	* cdl/uitron.cdl: Don't build C tests when C++ options selected.
 
 2002-05-22  Nick Garnett  <nickg at redhat dot com>
Index: packages/compat/uitron/current/cdl/uitron.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/compat/uitron/current/cdl/uitron.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 uitron.cdl
--- packages/compat/uitron/current/cdl/uitron.cdl	29 May 2002 18:28:05 -0000	1.6
+++ packages/compat/uitron/current/cdl/uitron.cdl	24 Feb 2003 06:46:09 -0000
@@ -50,11 +50,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_UITRON {
     display       "uITRON compatibility layer"
     include_dir   cyg/compat/uitron
-    doc           redirect/micro-itron-api.html
+    doc           ref/compat-uitron.html
     requires      CYGPKG_KERNEL
     description   "
         eCos supports a uITRON Compatibility Layer, providing
         full Level S (Standard) compliance with Version 3.02 of
         the uITRON Standard, plus many Level E (Extended) features.
Index: packages/devs/eth/synth/ecosynth/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/eth/synth/ecosynth/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/devs/eth/synth/ecosynth/current/ChangeLog	13 Feb 2003 22:22:03 -0000	1.6
+++ packages/devs/eth/synth/ecosynth/current/ChangeLog	24 Feb 2003 06:46:11 -0000
@@ -1,5 +1,14 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/syntheth.cdl: Add doc link.
+
+	* doc/syntheth.sgml: Comment out DOCTYPE for now to allow building
+	with standard doc build.
+	Add an enclosing <reference> so it's structured better with standard
+	doc build.
+
 2003-02-13  Bart Veer  <bartv at ecoscentric dot com>
 
 	* src/syntheth.c, cdl/syntheth.cdl: add dependency on errno.h for
 	error codes, and avoid memset() warning
 
Index: packages/devs/eth/synth/ecosynth/current/cdl/syntheth.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/eth/synth/ecosynth/current/cdl/syntheth.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 syntheth.cdl
--- packages/devs/eth/synth/ecosynth/current/cdl/syntheth.cdl	13 Feb 2003 22:24:14 -0000	1.3
+++ packages/devs/eth/synth/ecosynth/current/cdl/syntheth.cdl	24 Feb 2003 06:46:11 -0000
@@ -57,10 +57,11 @@ cdl_package CYGPKG_DEVS_ETH_ECOSYNTH {
         ethernet device as provided by the Linux kernel's tunnel/tap
         support. The eCos code interacts with a suitable Linux application
         through the I/O auxiliary. Up to four ethernet devices are
         supported, and the host-side target definition file controls how
         each device will perform its I/O."
+    doc         ref/devs-eth-synth-ecosynth.html
     
     parent      CYGPKG_IO_ETH_DRIVERS
     active_if   CYGPKG_IO_ETH_DRIVERS
     active_if   CYGPKG_HAL_SYNTH
 
Index: packages/devs/eth/synth/ecosynth/current/doc/syntheth.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/eth/synth/ecosynth/current/doc/syntheth.sgml,v
retrieving revision 1.2
diff -u -5 -p -r1.2 syntheth.sgml
--- packages/devs/eth/synth/ecosynth/current/doc/syntheth.sgml	25 Sep 2002 19:54:42 -0000	1.2
+++ packages/devs/eth/synth/ecosynth/current/doc/syntheth.sgml	24 Feb 2003 06:46:11 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
@@ -31,10 +31,13 @@
 <!-- ####DESCRIPTIONEND####                                          -->
 <!-- =============================================================== -->
 
 <!-- }}} -->
 
+<reference id="devs-eth-synth-ecosynth-ref">
+  <title>Synthetic Target Ethernet Driver</title>
+
 <refentry id="devs-eth-synth-ecosynth">
   <refmeta>
     <refentrytitle>Synthetic Target Ethernet Driver</refentrytitle>
   </refmeta>
   <refnamediv>
@@ -510,5 +513,6 @@ This procedure returns a list of the eth
 instantiated, for example <literal>{eth0 eth1}</literal>.
     </para>
   </refsect1>
 
 </refentry>
+</reference>
Index: packages/devs/serial/arm/aaed2000/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/aaed2000/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/arm/aaed2000/current/ChangeLog	23 May 2002 23:01:08 -0000	1.2
+++ packages/devs/serial/arm/aaed2000/current/ChangeLog	24 Feb 2003 06:46:16 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_aaed2000.cdl: Remove irrelevant doc link.
+
 2001-11-14  Jesper Skov  <jskov at redhat dot com>
 
 	* src/aaed2000_serial.c	(aaed2000_serial_DSR): Reworked a little
 	to fill/empty FIFO.
 
Index: packages/devs/serial/arm/aaed2000/current/cdl/ser_arm_aaed2000.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/aaed2000/current/cdl/ser_arm_aaed2000.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_arm_aaed2000.cdl
--- packages/devs/serial/arm/aaed2000/current/cdl/ser_arm_aaed2000.cdl	23 May 2002 23:01:08 -0000	1.2
+++ packages/devs/serial/arm/aaed2000/current/cdl/ser_arm_aaed2000.cdl	24 Feb 2003 06:46:16 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_AAED200
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            Agilent AAED2000."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   aaed2000_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/aeb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/aeb/current/ChangeLog,v
retrieving revision 1.8
diff -u -5 -p -r1.8 ChangeLog
--- packages/devs/serial/arm/aeb/current/ChangeLog	23 May 2002 23:01:08 -0000	1.8
+++ packages/devs/serial/arm/aeb/current/ChangeLog	24 Feb 2003 06:46:17 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_aeb.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_arm_aeb.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/arm/aeb/current/cdl/ser_arm_aeb.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/aeb/current/cdl/ser_arm_aeb.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_arm_aeb.cdl
--- packages/devs/serial/arm/aeb/current/cdl/ser_arm_aeb.cdl	23 May 2002 23:01:08 -0000	1.6
+++ packages/devs/serial/arm/aeb/current/cdl/ser_arm_aeb.cdl	24 Feb 2003 06:46:17 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_AEB {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            ARM AEB-1."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   aeb_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/at91/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/at91/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/devs/serial/arm/at91/current/ChangeLog	23 May 2002 23:01:08 -0000	1.6
+++ packages/devs/serial/arm/at91/current/ChangeLog	24 Feb 2003 06:46:17 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_at91.cdl: Remove irrelevant doc link.
+
 2001-09-20  Jesper Skov  <jskov at redhat dot com>
 
 	* src/at91_serial.c (at91_serial_init): Use valid interrupt priority.
 
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/devs/serial/arm/at91/current/cdl/ser_arm_at91.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/at91/current/cdl/ser_arm_at91.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ser_arm_at91.cdl
--- packages/devs/serial/arm/at91/current/cdl/ser_arm_at91.cdl	23 May 2002 23:01:09 -0000	1.4
+++ packages/devs/serial/arm/at91/current/cdl/ser_arm_at91.cdl	24 Feb 2003 06:46:17 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_AT91 {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            Atmel AT91 (EB40)."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   at91_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/cerfpda/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/cerfpda/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/arm/cerfpda/current/ChangeLog	23 May 2002 23:01:09 -0000	1.2
+++ packages/devs/serial/arm/cerfpda/current/ChangeLog	24 Feb 2003 06:46:17 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_cerfpda.cdl: Remove irrelevant doc link.
+
 2002-02-04  Gary Thomas  <gthomas at redhat dot com>
 
 	* include/arm_sa1110_cerfpda_ser.inl: 
 	* cdl/ser_arm_cerfpda.cdl: New file(s) - port to Intrinsyc CerfPDA.
 
Index: packages/devs/serial/arm/cerfpda/current/cdl/ser_arm_cerfpda.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/cerfpda/current/cdl/ser_arm_cerfpda.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_arm_cerfpda.cdl
--- packages/devs/serial/arm/cerfpda/current/cdl/ser_arm_cerfpda.cdl	23 May 2002 23:01:09 -0000	1.2
+++ packages/devs/serial/arm/cerfpda/current/cdl/ser_arm_cerfpda.cdl	24 Feb 2003 06:46:17 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_CERFPDA
     include_dir   cyg/io
 
     description   "
            This option enables the serial 16x5x device drivers for the
            Cerfpda."
-    doc           redirect/ecos-device-drivers.html
 
     # FIXME: This really belongs in the GENERIC_16X5X package
     cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
         display   "Generic 16x5x serial driver required"
     }
Index: packages/devs/serial/arm/cma230/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/cma230/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/arm/cma230/current/ChangeLog	23 May 2002 23:01:09 -0000	1.7
+++ packages/devs/serial/arm/cma230/current/ChangeLog	24 Feb 2003 06:46:17 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_cma230.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_arm_cma230.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/arm/cma230/current/cdl/ser_arm_cma230.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/cma230/current/cdl/ser_arm_cma230.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_arm_cma230.cdl
--- packages/devs/serial/arm/cma230/current/cdl/ser_arm_cma230.cdl	23 May 2002 23:01:09 -0000	1.6
+++ packages/devs/serial/arm/cma230/current/cdl/ser_arm_cma230.cdl	24 Feb 2003 06:46:18 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_CMA230 
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            Cogent ARM/CMA230."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   cma230_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/e7t/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/e7t/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/serial/arm/e7t/current/ChangeLog	23 May 2002 23:01:10 -0000	1.3
+++ packages/devs/serial/arm/e7t/current/ChangeLog	24 Feb 2003 06:46:18 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_e7t.cdl: Remove irrelevant doc link.
+
 2001-10-19  Lars Lindqvist  <Lars dot Lindqvist at combitechsystems dot com>
 2001-10-19  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* New package.
 
Index: packages/devs/serial/arm/e7t/current/cdl/ser_arm_e7t.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/e7t/current/cdl/ser_arm_e7t.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ser_arm_e7t.cdl
--- packages/devs/serial/arm/e7t/current/cdl/ser_arm_e7t.cdl	23 May 2002 23:01:10 -0000	1.3
+++ packages/devs/serial/arm/e7t/current/cdl/ser_arm_e7t.cdl	24 Feb 2003 06:46:18 -0000
@@ -3,42 +3,42 @@
 #      ser_arm_e7t.cdl
 #
 #      eCos serial ARM/AEB-2 (E7T) configuration data
 #
 # ====================================================================
-#####ECOSGPLCOPYRIGHTBEGIN####
-## -------------------------------------------
-## This file is part of eCos, the Embedded Configurable Operating System.
-## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
-##
-## eCos is free software; you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free
-## Software Foundation; either version 2 or (at your option) any later version.
-##
-## eCos is distributed in the hope that it will be useful, but WITHOUT ANY
-## WARRANTY; without even the implied warranty of MERCHANTABILITY or
-## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-## for more details.
-##
-## You should have received a copy of the GNU General Public License along
-## with eCos; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-##
-## As a special exception, if other files instantiate templates or use macros
-## or inline functions from this file, or you compile this file and link it
-## with other works to produce a work based on this file, this file does not
-## by itself cause the resulting work to be covered by the GNU General Public
-## License. However the source code for this file must still be made available
-## in accordance with section (3) of the GNU General Public License.
-##
-## This exception does not invalidate any other reasons why a work based on
-## this file might be covered by the GNU General Public License.
-##
-## Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
-## at http://sources.redhat.com/ecos/ecos-license/
-## -------------------------------------------
-#####ECOSGPLCOPYRIGHTEND####
+#####ECOSGPLCOPYRIGHTBEGIN####
+## -------------------------------------------
+## This file is part of eCos, the Embedded Configurable Operating System.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+##
+## eCos is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free
+## Software Foundation; either version 2 or (at your option) any later version.
+##
+## eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+## WARRANTY; without even the implied warranty of MERCHANTABILITY or
+## FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+## for more details.
+##
+## You should have received a copy of the GNU General Public License along
+## with eCos; if not, write to the Free Software Foundation, Inc.,
+## 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+##
+## As a special exception, if other files instantiate templates or use macros
+## or inline functions from this file, or you compile this file and link it
+## with other works to produce a work based on this file, this file does not
+## by itself cause the resulting work to be covered by the GNU General Public
+## License. However the source code for this file must still be made available
+## in accordance with section (3) of the GNU General Public License.
+##
+## This exception does not invalidate any other reasons why a work based on
+## this file might be covered by the GNU General Public License.
+##
+## Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+## at http://sources.redhat.com/ecos/ecos-license/
+## -------------------------------------------
+#####ECOSGPLCOPYRIGHTEND####
 # ====================================================================
 ######DESCRIPTIONBEGIN####
 #
 # Author(s):      Lars dot Lindqvist at combitechsystems dot com
 # Contributors:   jlarmour
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_E7T {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This package contains serial device drivers for the
            ARM AEB-2 (E7T)."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   e7t_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/ebsa285/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/ebsa285/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/arm/ebsa285/current/ChangeLog	23 May 2002 23:01:10 -0000	1.7
+++ packages/devs/serial/arm/ebsa285/current/ChangeLog	24 Feb 2003 06:46:18 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_ebsa285.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_arm_ebsa285.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/arm/ebsa285/current/cdl/ser_arm_ebsa285.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/ebsa285/current/cdl/ser_arm_ebsa285.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_arm_ebsa285.cdl
--- packages/devs/serial/arm/ebsa285/current/cdl/ser_arm_ebsa285.cdl	23 May 2002 23:01:10 -0000	1.6
+++ packages/devs/serial/arm/ebsa285/current/cdl/ser_arm_ebsa285.cdl	24 Feb 2003 06:46:18 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_EBSA285
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            StrongARM/EBSA285."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   ebsa285_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/edb7xxx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/edb7xxx/current/ChangeLog,v
retrieving revision 1.8
diff -u -5 -p -r1.8 ChangeLog
--- packages/devs/serial/arm/edb7xxx/current/ChangeLog	23 May 2002 23:01:10 -0000	1.8
+++ packages/devs/serial/arm/edb7xxx/current/ChangeLog	24 Feb 2003 06:46:19 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_edb7xxx.cdl: Remove irrelevant doc link.
+
 2001-10-12  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* cdl/ser_arm_edb7xxx.cdl: Clarify package description strings.
 
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/devs/serial/arm/edb7xxx/current/cdl/ser_arm_edb7xxx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/edb7xxx/current/cdl/ser_arm_edb7xxx.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ser_arm_edb7xxx.cdl
--- packages/devs/serial/arm/edb7xxx/current/cdl/ser_arm_edb7xxx.cdl	23 May 2002 23:01:11 -0000	1.7
+++ packages/devs/serial/arm/edb7xxx/current/cdl/ser_arm_edb7xxx.cdl	24 Feb 2003 06:46:19 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_EDB7XXX
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            Cirrus Logic ARM based development boards."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   edb7xxx_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/integrator/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/integrator/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/serial/arm/integrator/current/ChangeLog	23 May 2002 23:01:11 -0000	1.3
+++ packages/devs/serial/arm/integrator/current/ChangeLog	24 Feb 2003 06:46:19 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_integrator.cdl: Remove irrelevant doc link.
+
 2002-03-06  Nick Garnett  <nickg at redhat dot com>
 
 	* cdl/ser_arm_integrator.cdl:
 	Disable testing of 57600 and 115200 baud rates. The CPUs we are
 	currently using (ARM7TDMI and ARM966E) have no cache and are too
Index: packages/devs/serial/arm/integrator/current/cdl/ser_arm_integrator.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/integrator/current/cdl/ser_arm_integrator.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ser_arm_integrator.cdl
--- packages/devs/serial/arm/integrator/current/cdl/ser_arm_integrator.cdl	23 May 2002 23:01:11 -0000	1.3
+++ packages/devs/serial/arm/integrator/current/cdl/ser_arm_integrator.cdl	24 Feb 2003 06:46:19 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_INTEGRA
     requires      CYGPKG_ERROR
     include_dir   cyg/io
     description   "
            This option enables the serial device drivers for the
            ARM INTEGRATOR."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   integrator_serial_with_ints.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/arm/iop310/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/iop310/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/serial/arm/iop310/current/ChangeLog	12 Nov 2002 17:38:41 -0000	1.1
+++ packages/devs/serial/arm/iop310/current/ChangeLog	24 Feb 2003 06:46:19 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_iop310.cdl: Remove irrelevant doc link.
+
 2002-11-12  Gary Thomas  <gary at mlbassoc dot com>
 
 	* include/arm_iop310_ser.inl: 
 	* cdl/ser_arm_iop310.cdl: New Xscale platforms layout.
 
Index: packages/devs/serial/arm/iop310/current/cdl/ser_arm_iop310.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/iop310/current/cdl/ser_arm_iop310.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ser_arm_iop310.cdl
--- packages/devs/serial/arm/iop310/current/cdl/ser_arm_iop310.cdl	12 Nov 2002 17:38:41 -0000	1.1
+++ packages/devs/serial/arm/iop310/current/cdl/ser_arm_iop310.cdl	24 Feb 2003 06:46:19 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_XSCALE_
     include_dir   cyg/io
 
     description   "
            This option enables the serial device drivers for the
            Xscale board using the IOP310 chipset."
-    doc           redirect/ecos-device-drivers.html
 
     # FIXME: This really belongs in the GENERIC_16X5X package
     cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
         display   "Generic 16x5x serial driver required"
     }
Index: packages/devs/serial/arm/iq80321/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/iq80321/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/arm/iq80321/current/ChangeLog	23 May 2002 23:01:12 -0000	1.2
+++ packages/devs/serial/arm/iq80321/current/ChangeLog	24 Feb 2003 06:46:19 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_iq80321.cdl: Remove irrelevant doc link.
+
 2002-01-25  Nick Garnett  <nickg at redhat dot com>
 
 	* include/arm_iq80321_ser.inl: 
 	* cdl/ser_arm_iq80321.cdl:
 	IQ80321 files created, by copying the IQ80310 versions and editing.
Index: packages/devs/serial/arm/iq80321/current/cdl/ser_arm_iq80321.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/iq80321/current/cdl/ser_arm_iq80321.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_arm_iq80321.cdl
--- packages/devs/serial/arm/iq80321/current/cdl/ser_arm_iq80321.cdl	23 May 2002 23:01:12 -0000	1.2
+++ packages/devs/serial/arm/iq80321/current/cdl/ser_arm_iq80321.cdl	24 Feb 2003 06:46:19 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_IQ80321
     include_dir   cyg/io
 
     description   "
            This option enables the serial device drivers for the
            IQ80321 evaluation board."
-    doc           redirect/ecos-device-drivers.html
 
     # FIXME: This really belongs in the GENERIC_16X5X package
     cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
         display   "Generic 16x5x serial driver required"
     }
Index: packages/devs/serial/arm/pid/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/pid/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/devs/serial/arm/pid/current/ChangeLog	23 May 2002 23:01:12 -0000	1.9
+++ packages/devs/serial/arm/pid/current/ChangeLog	24 Feb 2003 06:46:20 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_pid.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_arm_pid.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/arm/pid/current/cdl/ser_arm_pid.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/pid/current/cdl/ser_arm_pid.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ser_arm_pid.cdl
--- packages/devs/serial/arm/pid/current/cdl/ser_arm_pid.cdl	23 May 2002 23:01:14 -0000	1.7
+++ packages/devs/serial/arm/pid/current/cdl/ser_arm_pid.cdl	24 Feb 2003 06:46:20 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_PID {
     include_dir   cyg/io
 
     description   "
            This option enables the serial device drivers for the
            ARM PID."
-    doc           redirect/ecos-device-drivers.html
 
     # FIXME: This really belongs in the GENERIC_16X5X package
     cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
         display   "Generic 16x5x serial driver required"
     }
Index: packages/devs/serial/arm/sa11x0/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/sa11x0/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/arm/sa11x0/current/ChangeLog	23 May 2002 23:01:18 -0000	1.7
+++ packages/devs/serial/arm/sa11x0/current/ChangeLog	24 Feb 2003 06:46:20 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_arm_sa11x0.cdl: Remove irrelevant doc link.
+
 2001-10-09  Hugo Tyson  <hmt at redhat dot com>
 
 	* src/sa11x0_serial.c (sa11x0_serial_DSR): Acknowledge the
 	interrupts for start or end of a line break, otherwise messing
 	with the wiring can cause an interrupt loop and hang the target.
Index: packages/devs/serial/arm/sa11x0/current/cdl/ser_arm_sa11x0.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/arm/sa11x0/current/cdl/ser_arm_sa11x0.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ser_arm_sa11x0.cdl
--- packages/devs/serial/arm/sa11x0/current/cdl/ser_arm_sa11x0.cdl	23 May 2002 23:01:19 -0000	1.5
+++ packages/devs/serial/arm/sa11x0/current/cdl/ser_arm_sa11x0.cdl	24 Feb 2003 06:46:20 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_ARM_SA11X0 
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            StrongARM SA11X0."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   sa11x0_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/generic/16x5x/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/generic/16x5x/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/devs/serial/generic/16x5x/current/ChangeLog	23 May 2002 23:01:19 -0000	1.9
+++ packages/devs/serial/generic/16x5x/current/ChangeLog	24 Feb 2003 06:46:20 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_generic_16x5x.cdl: Remove irrelevant doc link.
+
 2001-06-19  Jesper Skov  <jskov at redhat dot com>
 
 	* cdl/ser_generic_16x5x.cdl: Only define
 	CYGDAT_IO_SERIAL_DEVICE_HEADER when necessary.
 
Index: packages/devs/serial/generic/16x5x/current/cdl/ser_generic_16x5x.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/generic/16x5x/current/cdl/ser_generic_16x5x.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ser_generic_16x5x.cdl
--- packages/devs/serial/generic/16x5x/current/cdl/ser_generic_16x5x.cdl	23 May 2002 23:01:19 -0000	1.5
+++ packages/devs/serial/generic/16x5x/current/cdl/ser_generic_16x5x.cdl	24 Feb 2003 06:46:20 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_GENERIC_16X
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            16x5x compatiple controllers."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   ser_16x5x.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/h8300/h8300h/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/h8300/h8300h/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/h8300/h8300h/current/ChangeLog	23 May 2002 23:01:19 -0000	1.2
+++ packages/devs/serial/h8300/h8300h/current/ChangeLog	24 Feb 2003 06:46:20 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/serial_h8300.cdl: Remove irrelevant doc link.
+
 2002-04-24  Yoshinori Sato  <qzb04471 at nifty dot ne dot jp>
 
 	* New package.
 
 //===========================================================================
Index: packages/devs/serial/h8300/h8300h/current/cdl/serial_h8300.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/h8300/h8300h/current/cdl/serial_h8300.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 serial_h8300.cdl
--- packages/devs/serial/h8300/h8300h/current/cdl/serial_h8300.cdl	23 May 2002 23:01:19 -0000	1.2
+++ packages/devs/serial/h8300/h8300h/current/cdl/serial_h8300.cdl	24 Feb 2003 06:46:20 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_H8300_SCI {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            SCI module in Hitachi H8/300 CPUs."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a h8300_sci_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/i386/pc/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/i386/pc/current/ChangeLog,v
retrieving revision 1.8
diff -u -5 -p -r1.8 ChangeLog
--- packages/devs/serial/i386/pc/current/ChangeLog	23 May 2002 23:01:19 -0000	1.8
+++ packages/devs/serial/i386/pc/current/ChangeLog	24 Feb 2003 06:46:20 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_i386_pc.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_i386_pc.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/i386/pc/current/cdl/ser_i386_pc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/i386/pc/current/cdl/ser_i386_pc.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ser_i386_pc.cdl
--- packages/devs/serial/i386/pc/current/cdl/ser_i386_pc.cdl	23 May 2002 23:01:20 -0000	1.7
+++ packages/devs/serial/i386/pc/current/cdl/ser_i386_pc.cdl	24 Feb 2003 06:46:21 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_I386_PC {
     requires      CYGPKG_ERROR
     include_dir   cyg/io
     description   "
            This option enables the serial device drivers for the
            PC."
-    doc           redirect/ecos-device-drivers.html
 
     # FIXME: This really belongs in the GENERIC_16X5X package
     cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
         display   "Generic 16x5x serial driver required"
     }
Index: packages/devs/serial/loop/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/loop/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/devs/serial/loop/current/ChangeLog	23 May 2002 23:01:20 -0000	1.5
+++ packages/devs/serial/loop/current/ChangeLog	24 Feb 2003 06:46:21 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_loop.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_loop.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/loop/current/cdl/ser_loop.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/loop/current/cdl/ser_loop.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ser_loop.cdl
--- packages/devs/serial/loop/current/cdl/ser_loop.cdl	23 May 2002 23:01:20 -0000	1.5
+++ packages/devs/serial/loop/current/cdl/ser_loop.cdl	24 Feb 2003 06:46:21 -0000
@@ -55,11 +55,10 @@ cdl_package CYGPKG_IO_SERIAL_LOOP {
     parent        CYGPKG_IO_SERIAL_DEVICES
     active_if     CYGPKG_IO_SERIAL
     requires      CYGPKG_ERROR
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
-    doc           redirect/ecos-device-drivers.html
 
     description   "
        This package contains the loop serial device driver."
 
     compile       -library=libextras.a loop_serial.c
Index: packages/devs/serial/mcf52xx/mcf5272/current/ChangeLog
===================================================================
RCS file: packages/devs/serial/mcf52xx/mcf5272/current/ChangeLog
diff -N packages/devs/serial/mcf52xx/mcf5272/current/ChangeLog
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ packages/devs/serial/mcf52xx/mcf5272/current/ChangeLog	24 Feb 2003 06:46:21 -0000
@@ -0,0 +1,38 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mcf5272_uart.cdl: Remove irrelevant doc link.
+
+//===========================================================================
+//####ECOSGPLCOPYRIGHTBEGIN####
+// -------------------------------------------
+// This file is part of eCos, the Embedded Configurable Operating System.
+// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+//
+// eCos is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 or (at your option) any later version.
+//
+// eCos is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with eCos; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+//
+// As a special exception, if other files instantiate templates or use macros
+// or inline functions from this file, or you compile this file and link it
+// with other works to produce a work based on this file, this file does not
+// by itself cause the resulting work to be covered by the GNU General Public
+// License. However the source code for this file must still be made available
+// in accordance with section (3) of the GNU General Public License.
+//
+// This exception does not invalidate any other reasons why a work based on
+// this file might be covered by the GNU General Public License.
+//
+// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
+// at http://sources.redhat.com/ecos/ecos-license/
+// -------------------------------------------
+//####ECOSGPLCOPYRIGHTEND####
+//===========================================================================
Index: packages/devs/serial/mcf52xx/mcf5272/current/cdl/ser_mcf5272_uart.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mcf52xx/mcf5272/current/cdl/ser_mcf5272_uart.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ser_mcf5272_uart.cdl
--- packages/devs/serial/mcf52xx/mcf5272/current/cdl/ser_mcf5272_uart.cdl	29 May 2002 18:28:06 -0000	1.1
+++ packages/devs/serial/mcf52xx/mcf5272/current/cdl/ser_mcf5272_uart.cdl	24 Feb 2003 06:46:21 -0000
@@ -47,11 +47,10 @@ cdl_package CYGPKG_IO_SERIAL_MCF5272_UAR
     requires      CYGPKG_ERROR
     include_dir   cyg/io
     description   "
            This option enables the serial device drivers for the
            GMPU boards."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   ser_mcf5272_uart.c
 
     #define_proc {
     #    puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/mips/atlas/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/atlas/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- packages/devs/serial/mips/atlas/current/ChangeLog	23 May 2002 23:01:20 -0000	1.4
+++ packages/devs/serial/mips/atlas/current/ChangeLog	24 Feb 2003 06:46:21 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mips_atlas.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_mips_atlas.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/mips/atlas/current/cdl/ser_mips_atlas.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/atlas/current/cdl/ser_mips_atlas.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ser_mips_atlas.cdl
--- packages/devs/serial/mips/atlas/current/cdl/ser_mips_atlas.cdl	23 May 2002 23:01:20 -0000	1.4
+++ packages/devs/serial/mips/atlas/current/cdl/ser_mips_atlas.cdl	24 Feb 2003 06:46:21 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_MIPS_ATLAS 
     include_dir   cyg/io
 #    include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            MIPS ATLAS."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   atlas_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/mips/idt79s334a/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/idt79s334a/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/devs/serial/mips/idt79s334a/current/ChangeLog	14 Feb 2003 01:44:03 -0000	1.1
+++ packages/devs/serial/mips/idt79s334a/current/ChangeLog	24 Feb 2003 06:46:21 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mipsidt_334a.cdl: Remove irrelevant doc link.
+
 2003-02-13  Tim Michals  <t dot michals at attbi dot com>
 2003-02-13  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* New package - support for MIPS IDT 79s334a board.
 
Index: packages/devs/serial/mips/idt79s334a/current/cdl/ser_mipsidt_334a.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/idt79s334a/current/cdl/ser_mipsidt_334a.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ser_mipsidt_334a.cdl
--- packages/devs/serial/mips/idt79s334a/current/cdl/ser_mipsidt_334a.cdl	14 Feb 2003 01:44:03 -0000	1.1
+++ packages/devs/serial/mips/idt79s334a/current/cdl/ser_mipsidt_334a.cdl	24 Feb 2003 06:46:21 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_MIPS_IDT79S
     include_dir   cyg/io
 #    include_files ; # none _exported_ whatsoever
     description   "
            This package contains the serial device drivers for the
            MIPS IDT79RC32334 reference platform."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   mipsidt_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/mips/jmr3904/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/jmr3904/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/mips/jmr3904/current/ChangeLog	23 May 2002 23:01:20 -0000	1.7
+++ packages/devs/serial/mips/jmr3904/current/ChangeLog	24 Feb 2003 06:46:21 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mips_jmr3904.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_mips_jmr3904.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/mips/jmr3904/current/cdl/ser_mips_jmr3904.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/jmr3904/current/cdl/ser_mips_jmr3904.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_mips_jmr3904.cdl
--- packages/devs/serial/mips/jmr3904/current/cdl/ser_mips_jmr3904.cdl	23 May 2002 23:01:21 -0000	1.6
+++ packages/devs/serial/mips/jmr3904/current/cdl/ser_mips_jmr3904.cdl	24 Feb 2003 06:46:21 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_TX39_JMR390
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            TX39 JMR3904."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   tx3904_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/mips/ref4955/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/ref4955/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/serial/mips/ref4955/current/ChangeLog	23 May 2002 23:01:21 -0000	1.3
+++ packages/devs/serial/mips/ref4955/current/ChangeLog	24 Feb 2003 06:46:22 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mips_ref4955.cdl: Remove irrelevant doc link.
+
 2000-09-18  Jesper Skov  <jskov at redhat dot com>
 
 	* cdl/ser_mips_ref4955.cdl: Use CDL to specify testing parameters.
 
 	* include/mips_tx49_ref4955_ser.inl: Follow type naming changes in
Index: packages/devs/serial/mips/ref4955/current/cdl/ser_mips_ref4955.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/ref4955/current/cdl/ser_mips_ref4955.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ser_mips_ref4955.cdl
--- packages/devs/serial/mips/ref4955/current/cdl/ser_mips_ref4955.cdl	23 May 2002 23:01:21 -0000	1.3
+++ packages/devs/serial/mips/ref4955/current/cdl/ser_mips_ref4955.cdl	24 Feb 2003 06:46:22 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_MIPS_REF495
     include_dir   cyg/io
 
     description   "
            This option enables the serial device drivers for the
            REF4955."
-    doc           redirect/ecos-device-drivers.html
 
     # FIXME: This really belongs in the GENERIC_16X5X package
     cdl_interface CYGINT_IO_SERIAL_GENERIC_16X5X_REQUIRED {
         display   "Generic 16x5x serial driver required"
     }
Index: packages/devs/serial/mips/upd985xx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/upd985xx/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/mips/upd985xx/current/ChangeLog	23 May 2002 23:01:21 -0000	1.2
+++ packages/devs/serial/mips/upd985xx/current/ChangeLog	24 Feb 2003 06:46:22 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mips_upd985xx.cdl: Remove irrelevant doc link.
+
 2002-02-11  Jesper Skov  <jskov at redhat dot com>
 
 	* src/upd985xx_serial.c (upd985xx_serial_init): Fix compile error.
 
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/devs/serial/mips/upd985xx/current/cdl/ser_mips_upd985xx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/upd985xx/current/cdl/ser_mips_upd985xx.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_mips_upd985xx.cdl
--- packages/devs/serial/mips/upd985xx/current/cdl/ser_mips_upd985xx.cdl	23 May 2002 23:01:21 -0000	1.2
+++ packages/devs/serial/mips/upd985xx/current/cdl/ser_mips_upd985xx.cdl	24 Feb 2003 06:46:22 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_MIPS_UPD985
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            NEC MIPS uPD985xx system-on-chip device."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   upd985xx_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/mips/vrc437x/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/vrc437x/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- packages/devs/serial/mips/vrc437x/current/ChangeLog	23 May 2002 23:01:21 -0000	1.4
+++ packages/devs/serial/mips/vrc437x/current/ChangeLog	24 Feb 2003 06:46:22 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mips_vrc437x.cdl: Remove irrelevant doc link.
+
 2001-09-18  Nick Garnett  <nickg at redhat dot com>
 
 	* cdl/ser_mips_vrc437x.cdl: 
 	* src/vrc437x_serial.h:
 	* src/vrc437x_serial.c:
Index: packages/devs/serial/mips/vrc437x/current/cdl/ser_mips_vrc437x.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mips/vrc437x/current/cdl/ser_mips_vrc437x.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ser_mips_vrc437x.cdl
--- packages/devs/serial/mips/vrc437x/current/cdl/ser_mips_vrc437x.cdl	23 May 2002 23:01:21 -0000	1.4
+++ packages/devs/serial/mips/vrc437x/current/cdl/ser_mips_vrc437x.cdl	24 Feb 2003 06:46:23 -0000
@@ -61,11 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_MIPS_VRC437
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            VRC437X."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   vrc437x_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/mn10300/mn10300/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mn10300/mn10300/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/devs/serial/mn10300/mn10300/current/ChangeLog	23 May 2002 23:01:22 -0000	1.6
+++ packages/devs/serial/mn10300/mn10300/current/ChangeLog	24 Feb 2003 06:46:23 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_mn10300.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_mn10300.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/mn10300/mn10300/current/cdl/ser_mn10300.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/mn10300/mn10300/current/cdl/ser_mn10300.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ser_mn10300.cdl
--- packages/devs/serial/mn10300/mn10300/current/cdl/ser_mn10300.cdl	23 May 2002 23:01:22 -0000	1.5
+++ packages/devs/serial/mn10300/mn10300/current/cdl/ser_mn10300.cdl	24 Feb 2003 06:46:23 -0000
@@ -64,11 +64,10 @@ cdl_package CYGPKG_IO_SERIAL_MN10300 {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            MN10300."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   mn10300_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/powerpc/cme555/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/cme555/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/powerpc/cme555/current/ChangeLog	23 May 2002 23:01:22 -0000	1.2
+++ packages/devs/serial/powerpc/cme555/current/ChangeLog	24 Feb 2003 06:46:23 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_powerpc_cme555.cdl: Remove irrelevant doc link.
+
 2002-04-24  Bob Koninckx  <bob dot koninckx at mech dot kuleuven dot ac dot be>
 
 	* New package.
 
 //===========================================================================
Index: packages/devs/serial/powerpc/cme555/current/cdl/ser_powerpc_cme555.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/cme555/current/cdl/ser_powerpc_cme555.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_powerpc_cme555.cdl
--- packages/devs/serial/powerpc/cme555/current/cdl/ser_powerpc_cme555.cdl	23 May 2002 23:01:22 -0000	1.2
+++ packages/devs/serial/powerpc/cme555/current/cdl/ser_powerpc_cme555.cdl	24 Feb 2003 06:46:23 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_POWERPC_CME
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            cme555 mpc555 development board."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   cme555_serial_with_ints.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/powerpc/cogent/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/cogent/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/powerpc/cogent/current/ChangeLog	23 May 2002 23:01:22 -0000	1.7
+++ packages/devs/serial/powerpc/cogent/current/ChangeLog	24 Feb 2003 06:46:24 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_powerpc_cogent.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_powerpc_cogent.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/powerpc/cogent/current/cdl/ser_powerpc_cogent.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/cogent/current/cdl/ser_powerpc_cogent.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_powerpc_cogent.cdl
--- packages/devs/serial/powerpc/cogent/current/cdl/ser_powerpc_cogent.cdl	23 May 2002 23:01:22 -0000	1.6
+++ packages/devs/serial/powerpc/cogent/current/cdl/ser_powerpc_cogent.cdl	24 Feb 2003 06:46:24 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_POWERPC_COG
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            Cogent PowerPC."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   cogent_serial_with_ints.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/powerpc/ec555/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/ec555/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/powerpc/ec555/current/ChangeLog	23 May 2002 23:01:22 -0000	1.2
+++ packages/devs/serial/powerpc/ec555/current/ChangeLog	24 Feb 2003 06:46:24 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_powerpc_ec555.cdl: Remove irrelevant doc link.
+
 2002-04-24  Bob Koninckx  <bob dot koninckx at mech dot kuleuven dot ac dot be>
 
 	* New package.
 
 //===========================================================================
Index: packages/devs/serial/powerpc/ec555/current/cdl/ser_powerpc_ec555.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/ec555/current/cdl/ser_powerpc_ec555.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_powerpc_ec555.cdl
--- packages/devs/serial/powerpc/ec555/current/cdl/ser_powerpc_ec555.cdl	23 May 2002 23:01:22 -0000	1.2
+++ packages/devs/serial/powerpc/ec555/current/cdl/ser_powerpc_ec555.cdl	24 Feb 2003 06:46:24 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_POWERPC_EC5
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            ec555 mpc555 development board."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   ec555_serial_with_ints.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/powerpc/quicc/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/quicc/current/ChangeLog,v
retrieving revision 1.12
diff -u -5 -p -r1.12 ChangeLog
--- packages/devs/serial/powerpc/quicc/current/ChangeLog	10 Dec 2002 15:40:20 -0000	1.12
+++ packages/devs/serial/powerpc/quicc/current/ChangeLog	24 Feb 2003 06:46:25 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_quicc_smc.cdl: Remove irrelevant doc link.
+
 2002-12-10  Gary Thomas  <gthomas at ecoscentric dot com>
 
 	* cdl/ser_quicc_smc.cdl: Only enable devices which exist - as described
 	by the HAL/CDL interfaces.
 
Index: packages/devs/serial/powerpc/quicc/current/cdl/ser_quicc_smc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/quicc/current/cdl/ser_quicc_smc.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_quicc_smc.cdl
--- packages/devs/serial/powerpc/quicc/current/cdl/ser_quicc_smc.cdl	10 Dec 2002 15:40:21 -0000	1.6
+++ packages/devs/serial/powerpc/quicc/current/cdl/ser_quicc_smc.cdl	24 Feb 2003 06:46:25 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_POWERPC_QUI
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            PowerPC QUICC/SMC."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   quicc_smc_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/powerpc/quicc2/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/quicc2/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/powerpc/quicc2/current/ChangeLog	24 Jan 2003 15:13:25 -0000	1.2
+++ packages/devs/serial/powerpc/quicc2/current/ChangeLog	24 Feb 2003 06:46:25 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_quicc2_scc.cdl: Remove irrelevant doc link.
+
 2003-01-24  Gary Thomas  <gary at mlbassoc dot com> (inspired by)
 2003-01-24  Christoph Csebits <christoph dot csebits at frequentis dot com>	
 
 	* src/quicc2_scc_serial.h: Remove invalid ";" from #defines
 
Index: packages/devs/serial/powerpc/quicc2/current/cdl/ser_quicc2_scc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/powerpc/quicc2/current/cdl/ser_quicc2_scc.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ser_quicc2_scc.cdl
--- packages/devs/serial/powerpc/quicc2/current/cdl/ser_quicc2_scc.cdl	12 Dec 2002 21:15:30 -0000	1.1
+++ packages/devs/serial/powerpc/quicc2/current/cdl/ser_quicc2_scc.cdl	24 Feb 2003 06:46:25 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_POWERPC_QUI
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            PowerPC QUICC2/SCC."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   quicc2_scc_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/sh/cq7708/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/cq7708/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/devs/serial/sh/cq7708/current/ChangeLog	23 May 2002 23:01:23 -0000	1.6
+++ packages/devs/serial/sh/cq7708/current/ChangeLog	24 Feb 2003 06:46:25 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_sh_cq7708.cdl: Remove irrelevant doc link.
+
 2002-05-08  Jesper Skov  <jskov at redhat dot com>
 
 	* include/sh_sh3_cq7708_sci.inl: Serial register renaming.
 
 2002-04-23  Jesper Skov  <jskov at redhat dot com>
Index: packages/devs/serial/sh/cq7708/current/cdl/ser_sh_cq7708.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/cq7708/current/cdl/ser_sh_cq7708.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ser_sh_cq7708.cdl
--- packages/devs/serial/sh/cq7708/current/cdl/ser_sh_cq7708.cdl	23 May 2002 23:01:23 -0000	1.5
+++ packages/devs/serial/sh/cq7708/current/cdl/ser_sh_cq7708.cdl	24 Feb 2003 06:46:25 -0000
@@ -60,12 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_SH_CQ7708 {
     include_dir   cyg/io
 
     description   "
            This option enables the serial device drivers for the
            CQ SH3 cq7708 board, based on the generic SH SCI driver."
-    doc           redirect/ecos-device-drivers.html
-
 
     # FIXME: This really belongs in the SH_SCI package
     cdl_interface CYGINT_IO_SERIAL_SH_SCI_REQUIRED {
         display   "SH SCI driver required"
     }
Index: packages/devs/serial/sh/edk7708/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/edk7708/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/sh/edk7708/current/ChangeLog	23 May 2002 23:01:23 -0000	1.7
+++ packages/devs/serial/sh/edk7708/current/ChangeLog	24 Feb 2003 06:46:26 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_sh_edk7708.cdl: Remove irrelevant doc link.
+
 2002-05-08  Jesper Skov  <jskov at redhat dot com>
 
 	* include/sh_sh3_edk7708_sci.inl: Serial register renaming.
 
 2002-04-23  Jesper Skov  <jskov at redhat dot com>
Index: packages/devs/serial/sh/edk7708/current/cdl/ser_sh_edk7708.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/edk7708/current/cdl/ser_sh_edk7708.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_sh_edk7708.cdl
--- packages/devs/serial/sh/edk7708/current/cdl/ser_sh_edk7708.cdl	23 May 2002 23:01:23 -0000	1.6
+++ packages/devs/serial/sh/edk7708/current/cdl/ser_sh_edk7708.cdl	24 Feb 2003 06:46:26 -0000
@@ -61,12 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_SH_EDK7708 
 
     description   "
         This option enables the serial device drivers for the
         Hitachi SH3 EDK7708 board, based on the generic SH SCI driver."
 
-    doc           redirect/ecos-device-drivers.html
-
     # FIXME: This really belongs in the SH_SCI package
     cdl_interface CYGINT_IO_SERIAL_SH_SCI_REQUIRED {
         display   "SH SCI driver required"
     }
 
Index: packages/devs/serial/sh/sci/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/sci/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/devs/serial/sh/sci/current/ChangeLog	23 May 2002 23:01:23 -0000	1.5
+++ packages/devs/serial/sh/sci/current/ChangeLog	24 Feb 2003 06:46:26 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_sh_sci.cdl: Remove irrelevant doc link.
+
 2002-05-08  Jesper Skov  <jskov at redhat dot com>
 
 	* src/sh_sci_serial.c: Register renaming.
 
 2002-04-23  Jesper Skov  <jskov at redhat dot com>
Index: packages/devs/serial/sh/sci/current/cdl/ser_sh_sci.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/sci/current/cdl/ser_sh_sci.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ser_sh_sci.cdl
--- packages/devs/serial/sh/sci/current/cdl/ser_sh_sci.cdl	23 May 2002 23:01:23 -0000	1.4
+++ packages/devs/serial/sh/sci/current/cdl/ser_sh_sci.cdl	24 Feb 2003 06:46:26 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_SH_SCI {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            SCI module in Hitachi SH CPUs."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a sh_sci_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/sh/scif/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/scif/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/sh/scif/current/ChangeLog	23 May 2002 23:01:24 -0000	1.7
+++ packages/devs/serial/sh/scif/current/ChangeLog	24 Feb 2003 06:46:26 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_sh_scif.cdl: Remove irrelevant doc link.
+
 2002-05-08  Jesper Skov  <jskov at redhat dot com>
 
 	* src/sh_scif_serial.c: Added SH2 support. Added break interrupt
 	support. Added IrDA support. Added async RX/TX support. Added
 	support for platforms to add config keys and handle flow
Index: packages/devs/serial/sh/scif/current/cdl/ser_sh_scif.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/scif/current/cdl/ser_sh_scif.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ser_sh_scif.cdl
--- packages/devs/serial/sh/scif/current/cdl/ser_sh_scif.cdl	23 May 2002 23:01:24 -0000	1.5
+++ packages/devs/serial/sh/scif/current/cdl/ser_sh_scif.cdl	24 Feb 2003 06:46:26 -0000
@@ -62,11 +62,10 @@ cdl_package CYGPKG_IO_SERIAL_SH_SCIF {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            SCIF module in Hitachi SH CPUs."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a sh_scif_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/sh/se77x9/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/se77x9/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/devs/serial/sh/se77x9/current/ChangeLog	23 May 2002 23:01:24 -0000	1.2
+++ packages/devs/serial/sh/se77x9/current/ChangeLog	24 Feb 2003 06:46:26 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_sh_se77x9.cdl: Remove irrelevant doc link.
+
 2002-05-08  Jesper Skov  <jskov at redhat dot com>
 
 	* include/sh_sh3_se77x9_scif.inl: CYGINT_IO_SERIAL_SH_SCIF_DMA is
 	now booldata. Rename sh3_scif to sh_scif. Register renaming.
 
Index: packages/devs/serial/sh/se77x9/current/cdl/ser_sh_se77x9.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sh/se77x9/current/cdl/ser_sh_se77x9.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ser_sh_se77x9.cdl
--- packages/devs/serial/sh/se77x9/current/cdl/ser_sh_se77x9.cdl	23 May 2002 23:01:24 -0000	1.2
+++ packages/devs/serial/sh/se77x9/current/cdl/ser_sh_se77x9.cdl	24 Feb 2003 06:46:26 -0000
@@ -61,12 +61,10 @@ cdl_package CYGPKG_IO_SERIAL_SH_SE77X9 {
 
     description   "
         This option enables the serial device drivers for the
         Hitachi SH3 SE77X9 board, based on the generic SH SCI driver."
 
-    doc           redirect/ecos-device-drivers.html
-
 
     # FIXME: This really belongs in the SH_SCIF package
     cdl_interface CYGINT_IO_SERIAL_SH_SCIF_REQUIRED {
         display   "SH SCI driver required"
     }
Index: packages/devs/serial/sparclite/sleb/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sparclite/sleb/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/serial/sparclite/sleb/current/ChangeLog	23 May 2002 23:01:24 -0000	1.7
+++ packages/devs/serial/sparclite/sleb/current/ChangeLog	24 Feb 2003 06:46:27 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_sparclite_sleb.cdl: Remove irrelevant doc link.
+
 2001-09-10  Jonathan Larmour  <jlarmour at redhat dot com>
 
         * cdl/ser_sparclite_sleb.cdl:        
         Fix 234000->230400 typo.
 
Index: packages/devs/serial/sparclite/sleb/current/cdl/ser_sparclite_sleb.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/sparclite/sleb/current/cdl/ser_sparclite_sleb.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_sparclite_sleb.cdl
--- packages/devs/serial/sparclite/sleb/current/cdl/ser_sparclite_sleb.cdl	23 May 2002 23:01:25 -0000	1.6
+++ packages/devs/serial/sparclite/sleb/current/cdl/ser_sparclite_sleb.cdl	24 Feb 2003 06:46:27 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_SPARCLITE_S
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            SPARClite SLEB."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   sleb_sdtr.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/serial/v85x/v850/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/v85x/v850/current/ChangeLog,v
retrieving revision 1.10
diff -u -5 -p -r1.10 ChangeLog
--- packages/devs/serial/v85x/v850/current/ChangeLog	23 May 2002 23:01:25 -0000	1.10
+++ packages/devs/serial/v85x/v850/current/ChangeLog	24 Feb 2003 06:46:27 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ser_v85x_v850.cdl: Remove irrelevant doc link.
+
 2001-03-21  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* cdl/ser_v85x_v850.cdl: Default driver on if CYGPKG_IO_SERIAL_DEVICES
 	enabled - like other drivers.
 	Descriptions should not be specific to SA1.
Index: packages/devs/serial/v85x/v850/current/cdl/ser_v85x_v850.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/serial/v85x/v850/current/cdl/ser_v85x_v850.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ser_v85x_v850.cdl
--- packages/devs/serial/v85x/v850/current/cdl/ser_v85x_v850.cdl	23 May 2002 23:01:25 -0000	1.6
+++ packages/devs/serial/v85x/v850/current/cdl/ser_v85x_v850.cdl	24 Feb 2003 06:46:27 -0000
@@ -60,11 +60,10 @@ cdl_package CYGPKG_IO_SERIAL_V85X_V850 {
     include_dir   cyg/io
     include_files ; # none _exported_ whatsoever
     description   "
            This option enables the serial device drivers for the
            NEC V850."
-    doc           redirect/ecos-device-drivers.html
 
     compile       -library=libextras.a   v85x_v850_serial.c
 
     define_proc {
         puts $::cdl_system_header "/***** serial driver proc output start *****/"
Index: packages/devs/usb/nec_upd985xx/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/usb/nec_upd985xx/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/devs/usb/nec_upd985xx/current/ChangeLog	22 Jan 2003 10:52:13 -0000	1.5
+++ packages/devs/usb/nec_upd985xx/current/ChangeLog	24 Feb 2003 06:46:27 -0000
@@ -1,5 +1,14 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/usbs_upd985xx.cdl: Fix doc link.
+
+	* doc/usbs_upd985xx.sgml: Comment out DOCTYPE for now to allow building
+	with standard doc build.
+	Add an enclosing <reference> so it's structured better with standard
+	doc build.
+
 2003-01-22  Anssi Pulkkinen <anssi dot pulkkinen at ascom dot ch>
 
 	* src/usbs_upd985xx.c (ep0_rx_dsr): After sending a stall response
 	on ep0, start a new receive process for the next control message.
 
Index: packages/devs/usb/nec_upd985xx/current/cdl/usbs_upd985xx.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/usb/nec_upd985xx/current/cdl/usbs_upd985xx.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 usbs_upd985xx.cdl
--- packages/devs/usb/nec_upd985xx/current/cdl/usbs_upd985xx.cdl	2 Dec 2002 20:48:25 -0000	1.3
+++ packages/devs/usb/nec_upd985xx/current/cdl/usbs_upd985xx.cdl	24 Feb 2003 06:46:28 -0000
@@ -52,11 +52,11 @@
 cdl_package CYGPKG_DEVS_USB_UPD985XX {
     display     "NEC uPD985xx USB Device Driver"
     include_dir "cyg/io/usb"
     parent      CYGPKG_USB
     implements  CYGHWR_IO_USB_SLAVE
-    doc         devs-usb-nec-upd985xx.html
+    doc         ref/devs-usb-nec-upd985xx.html
     
     # Make sure that we are running on the right hardware.
     requires CYGPKG_HAL_MIPS
     requires CYGPKG_HAL_MIPS_UPD985XX
     
Index: packages/devs/usb/nec_upd985xx/current/doc/usbs_upd985xx.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/usb/nec_upd985xx/current/doc/usbs_upd985xx.sgml,v
retrieving revision 1.3
diff -u -5 -p -r1.3 usbs_upd985xx.sgml
--- packages/devs/usb/nec_upd985xx/current/doc/usbs_upd985xx.sgml	15 Sep 2002 22:09:42 -0000	1.3
+++ packages/devs/usb/nec_upd985xx/current/doc/usbs_upd985xx.sgml	24 Feb 2003 06:46:28 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
@@ -34,10 +34,13 @@
 <!-- ####DESCRIPTIONEND####                                          -->
 <!-- =============================================================== -->
 
 <!-- }}} -->
 
+<reference id="devs-usb-nec-upd985xx-ref">
+  <title>NEC uPD985xx USB Device Driver</title>
+
 <refentry id="devs-usb-nec-upd985xx">
 <refmeta>
 <refentrytitle>NEC uPD985xx USB Device Driver</refentrytitle>
 </refmeta>
 <refnamediv>
@@ -249,5 +252,6 @@ current platform defines such a macro, t
 invoke it during the endpoint 0 start-up operation.
 </para>
 </refsect1>
 
 </refentry>
+</reference>
Index: packages/devs/usb/sa11x0/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/usb/sa11x0/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/devs/usb/sa11x0/current/ChangeLog	23 May 2002 23:01:26 -0000	1.7
+++ packages/devs/usb/sa11x0/current/ChangeLog	24 Feb 2003 06:46:28 -0000
@@ -1,5 +1,14 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/usbs_sa11x0.cdl: Fix doc link.
+
+	* doc/usbs_sa11x0.sgml: Comment out DOCTYPE for now to allow building
+	with standard doc build.
+	Add an enclosing <reference> so it's structured better with standard
+	doc build.
+
 2002-02-11  Bart Veer  <bartv at redhat dot com>
 
 	* src/usbs_sa11x0.c:
 	Add a handler for the SET_INTERFACE standard control message.
 	This should not be needed, but appears to avoid hardware problems
Index: packages/devs/usb/sa11x0/current/cdl/usbs_sa11x0.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/usb/sa11x0/current/cdl/usbs_sa11x0.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 usbs_sa11x0.cdl
--- packages/devs/usb/sa11x0/current/cdl/usbs_sa11x0.cdl	23 May 2002 23:01:26 -0000	1.3
+++ packages/devs/usb/sa11x0/current/cdl/usbs_sa11x0.cdl	24 Feb 2003 06:46:28 -0000
@@ -51,11 +51,11 @@
 cdl_package CYGPKG_DEVS_USB_SA11X0 {
     display     "SA11X0 USB Device Driver"
     include_dir "cyg/io/usb"
     parent      CYGPKG_USB
     implements  CYGHWR_IO_USB_SLAVE
-    doc         devs-usb-sa11x0.html
+    doc         ref/devs-usb-sa11x0.html
 
     # Make sure that we are running on the right hardware.
     requires CYGPKG_HAL_ARM
     requires CYGPKG_HAL_ARM_SA11X0
 
Index: packages/devs/usb/sa11x0/current/doc/usbs_sa11x0.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/usb/sa11x0/current/doc/usbs_sa11x0.sgml,v
retrieving revision 1.4
diff -u -5 -p -r1.4 usbs_sa11x0.sgml
--- packages/devs/usb/sa11x0/current/doc/usbs_sa11x0.sgml	15 Sep 2002 22:09:53 -0000	1.4
+++ packages/devs/usb/sa11x0/current/doc/usbs_sa11x0.sgml	24 Feb 2003 06:46:28 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
@@ -34,10 +34,13 @@
 <!-- ####DESCRIPTIONEND####                                          -->
 <!-- =============================================================== -->
 
 <!-- }}} -->
 
+<reference id="devs-usb-sa11x0-ref">
+  <title>SA11X0 USB Device Driver</title>
+
 <refentry id="devs-usb-sa11x0">
 <refmeta>
 <refentrytitle>SA11X0 USB Device Driver</refentrytitle>
 </refmeta>
 <refnamediv>
@@ -226,5 +229,6 @@ transferred is relatively small, because
 will be raised and performance will suffer accordingly.
 </para>
 </refsect1>
 
 </refentry>
+</reference>
Index: packages/devs/watchdog/synth/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/watchdog/synth/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/devs/watchdog/synth/current/ChangeLog	12 Feb 2003 17:22:57 -0000	1.3
+++ packages/devs/watchdog/synth/current/ChangeLog	24 Feb 2003 06:46:29 -0000
@@ -1,5 +1,14 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/synth_watchdog.cdl: Add doc link.
+
+	* doc/synth_watchdog.sgml: Comment out DOCTYPE for now to allow
+	building with standard doc build.
+	Add an enclosing <reference> so it's structured better with standard
+	doc build.
+
 2003-02-12  Bart Veer  <bartv at ecoscentric dot com>
 
 	* host/Makefile.in:
 	Regenerate after toplevel acinclude.m4 update
 
Index: packages/devs/watchdog/synth/current/cdl/synth_watchdog.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/watchdog/synth/current/cdl/synth_watchdog.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 synth_watchdog.cdl
--- packages/devs/watchdog/synth/current/cdl/synth_watchdog.cdl	16 Sep 2002 21:59:36 -0000	1.2
+++ packages/devs/watchdog/synth/current/cdl/synth_watchdog.cdl	24 Feb 2003 06:46:29 -0000
@@ -54,10 +54,11 @@ cdl_package CYGPKG_DEVS_WATCHDOG_SYNTH {
         The watchdog driver for the eCos synthetic target provides
         emulation of a watchdog device: if the eCos application starts
         the watchdog and fails to reset it regularly then the host-side
         support will detect this and kill the eCos application with a
         SIGPWR signal."
+    doc         ref/devs-watchdog-synth.html
     
     parent      CYGPKG_IO_WATCHDOG
     active_if   CYGPKG_IO_WATCHDOG
     implements  CYGINT_WATCHDOG_HW_IMPLEMENTATIONS
     implements  CYGINT_WATCHDOG_RESETS_ON_TIMEOUT
Index: packages/devs/watchdog/synth/current/doc/synth_watchdog.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/devs/watchdog/synth/current/doc/synth_watchdog.sgml,v
retrieving revision 1.1
diff -u -5 -p -r1.1 synth_watchdog.sgml
--- packages/devs/watchdog/synth/current/doc/synth_watchdog.sgml	15 Sep 2002 17:50:27 -0000	1.1
+++ packages/devs/watchdog/synth/current/doc/synth_watchdog.sgml	24 Feb 2003 06:46:29 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE refentry  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
@@ -31,10 +31,13 @@
 <!-- ####DESCRIPTIONEND####                                          -->
 <!-- =============================================================== -->
 
 <!-- }}} -->
 
+<reference id="devs-watchdog-synth-ref">
+  <title>Synthetic Target Watchdog Device</title>
+
 <refentry id="devs-watchdog-synth">
   <refmeta>
     <refentrytitle>Synthetic Target Watchdog Device</refentrytitle>
   </refmeta>
   <refnamediv>
@@ -332,5 +335,6 @@ The watchdog support does not provide an
 variables for use by other scripts.
     </para>
   </refsect1>
 
 </refentry>
+</reference>
Index: packages/fs/jffs2/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/jffs2/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/fs/jffs2/current/ChangeLog	5 Feb 2003 02:04:54 -0000	1.6
+++ packages/fs/jffs2/current/ChangeLog	24 Feb 2003 06:46:30 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/jffs2.cdl: Fix doc link.
+
 2003-02-05  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* cdl/jffs2.cdl: Remove unused flash geometry CDL options.
 
 2003-02-04  Gary Thomas  <gary at mlbassoc dot com> on behalf of
Index: packages/fs/jffs2/current/cdl/jffs2.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/jffs2/current/cdl/jffs2.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 jffs2.cdl
--- packages/fs/jffs2/current/cdl/jffs2.cdl	5 Feb 2003 02:04:54 -0000	1.6
+++ packages/fs/jffs2/current/cdl/jffs2.cdl	24 Feb 2003 06:46:30 -0000
@@ -49,11 +49,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_FS_JFFS2 {
     display        "JFFS2 filesystem"
-    doc            doc/index.html
+    doc            ref/fileio.html
     include_dir    ""
 
     requires       CYGPKG_IO_FILEIO
     requires       CYGPKG_IO_FLASH
     requires       CYGPKG_COMPRESS_ZLIB
Index: packages/fs/ram/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/ram/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/fs/ram/current/ChangeLog	3 Feb 2003 16:26:04 -0000	1.6
+++ packages/fs/ram/current/ChangeLog	24 Feb 2003 06:46:30 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ramfs.cdl: Fix doc link.
+
 2002-12-06  Andrew Lunn  <andrew dot lunn at ascom dot ch>
 
 	* cdl/ramfs.cdl: Implements the CYGINT_IO_FILEIO_FS interface
 
 2002-01-25  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/fs/ram/current/cdl/ramfs.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/ram/current/cdl/ramfs.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ramfs.cdl
--- packages/fs/ram/current/cdl/ramfs.cdl	3 Feb 2003 16:26:04 -0000	1.4
+++ packages/fs/ram/current/cdl/ramfs.cdl	24 Feb 2003 06:46:30 -0000
@@ -49,11 +49,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_FS_RAM {
     display        "RAM filesystem"
-    doc            doc/index.html
+    doc            ref/fileio.html
     include_dir    cyg/ramfs
 
     requires       CYGPKG_IO_FILEIO
 
     requires       CYGPKG_ISOINFRA
Index: packages/fs/rom/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/rom/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/fs/rom/current/ChangeLog	3 Feb 2003 16:26:04 -0000	1.9
+++ packages/fs/rom/current/ChangeLog	24 Feb 2003 06:46:30 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/romfs.cdl: Fix doc link.
+
 2003-01-30  Andrew Lunn  <andrew dot lunn at ascom dot ch>
 
 	* cdl/romfs.cdl: Implements the CYGINT_IO_FILEIO_FS interface.
 
 2003-01-29  John Dallaway  <jld at ecoscentric dot com>
Index: packages/fs/rom/current/cdl/romfs.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/fs/rom/current/cdl/romfs.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 romfs.cdl
--- packages/fs/rom/current/cdl/romfs.cdl	3 Feb 2003 16:26:04 -0000	1.7
+++ packages/fs/rom/current/cdl/romfs.cdl	24 Feb 2003 06:46:30 -0000
@@ -49,11 +49,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_FS_ROM {
     display        "ROM filesystem"
-    doc            doc/index.html
+    doc            ref/fileio.html
     include_dir    cyg/romfs
 
     requires       CYGPKG_IO_FILEIO
 
     requires       CYGPKG_ISOINFRA
Index: packages/hal/common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/ChangeLog,v
retrieving revision 1.86
diff -u -5 -p -r1.86 ChangeLog
--- packages/hal/common/current/ChangeLog	13 Feb 2003 20:49:57 -0000	1.86
+++ packages/hal/common/current/ChangeLog	24 Feb 2003 06:46:35 -0000
@@ -1,5 +1,12 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/hal.cdl: Fix doc links.
+
+	* doc/hal.sgml: hal-common-current-doc-porting-sgml entity ->
+	hal-common-porting-sgml in line with other docs.
+
 2003-02-13  Mark Salter  <msalter at redhat dot com>
 
 	* src/gdb-fileio.h (FILEIO_O_BINARY): New flag.
 	(FILEIO_O_TEXT): New flag.
 
Index: packages/hal/common/current/cdl/hal.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/cdl/hal.cdl,v
retrieving revision 1.19
diff -u -5 -p -r1.19 hal.cdl
--- packages/hal/common/current/cdl/hal.cdl	4 Dec 2002 14:29:12 -0000	1.19
+++ packages/hal/common/current/cdl/hal.cdl	24 Feb 2003 06:46:35 -0000
@@ -60,11 +60,11 @@ cdl_package CYGPKG_HAL {
         one or more architectures, and for each architecture there
         may be one or more supported platforms. It is necessary to
         select one target architecture and one platform for that
         architecture. There are also a number of configuration
         options that are common to all HAL packages."
-    doc           redirect/the-ecos-hardware-abstraction-layer-hal.html
+    doc           ref/the-ecos-hardware-abstraction-layer.html
 
     compile       drv_api.c
     compile       -library=libextras.a dummy.c
 
     requires      CYGPKG_INFRA
Index: packages/hal/common/current/doc/hal.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/common/current/doc/hal.sgml,v
retrieving revision 1.3
diff -u -5 -p -r1.3 hal.sgml
--- packages/hal/common/current/doc/hal.sgml	1 Oct 2002 02:23:22 -0000	1.3
+++ packages/hal/common/current/doc/hal.sgml	24 Feb 2003 06:46:37 -0000
@@ -2935,11 +2935,11 @@ architecture, in particular where interr
 </CHAPTER>
 
 <!-- }}} -->
 <!-- {{{ Porting Guide -->
 
-&hal-common-current-doc-porting-sgml;
+&hal-common-porting-sgml;
 
 <!-- }}} -->
 <!-- {{{ Future Developments -->
 
 <CHAPTER id="hal-future-developments">
Index: packages/hal/synth/arch/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/synth/arch/current/ChangeLog,v
retrieving revision 1.12
diff -u -5 -p -r1.12 ChangeLog
--- packages/hal/synth/arch/current/ChangeLog	12 Feb 2003 17:23:04 -0000	1.12
+++ packages/hal/synth/arch/current/ChangeLog	24 Feb 2003 06:46:43 -0000
@@ -1,5 +1,13 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* doc/overview.gif, doc/overview.fig: renamed to
+	synth-io-overview.gif and synth-io-overview.fig.
+	* doc/synth.sgml: Add some missing "&gt;"s to header file names.
+	Comment out DOCTYPE for now to allow building with standard doc build.
+	overview.gif renamed as per above.
+
 2003-02-12  Bart Veer  <bartv at ecoscentric dot com>
 
 	* host/Makefile.am, host/Makefile.in, configure:
 	Regenerate after acinclude.m4 update
 
Index: packages/hal/synth/arch/current/doc/overview.fig
===================================================================
RCS file: packages/hal/synth/arch/current/doc/overview.fig
diff -N packages/hal/synth/arch/current/doc/overview.fig
--- packages/hal/synth/arch/current/doc/overview.fig	15 Sep 2002 17:52:19 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter  
-100.00
-Single
--2
-1200 2
-2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
-	 300 300 3300 300 3300 1800 300 1800 300 300
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 2700 300 2700 1800
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 1800 300 1800 1800
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 1800 750 2700 750
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 1800 1350 2700 1350
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 5400 300 5400 1800
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 5400 750 6900 750
-2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
-	 5400 1350 6900 1350
-2 2 0 1 0 7 50 0 -1 4.000 0 0 7 0 0 5
-	 4200 300 6900 300 6900 1800 4200 1800 4200 300
-2 1 0 2 0 7 50 0 -1 6.000 0 0 7 1 1 2
-	1 1 2.00 120.00 240.00
-	1 1 2.00 120.00 240.00
-	 3300 1050 4200 1050
-2 1 0 1 0 7 50 0 -1 4.000 0 0 -1 1 1 2
-	1 1 1.00 60.00 120.00
-	1 1 1.00 60.00 120.00
-	 6900 600 7500 600
-2 1 0 1 0 7 50 0 -1 4.000 0 0 -1 1 1 2
-	1 1 1.00 60.00 120.00
-	1 1 1.00 60.00 120.00
-	 6900 1125 7500 1125
-2 1 0 1 0 7 50 0 -1 4.000 0 0 -1 1 1 2
-	1 1 1.00 60.00 120.00
-	1 1 1.00 60.00 120.00
-	 6900 1650 7500 1650
-4 0 0 50 0 0 12 0.0000 4 135 375 2850 1200 HAL\001
-4 0 0 50 0 0 12 0.0000 4 135 585 1950 1650 console\001
-4 0 0 50 0 0 12 0.0000 4 135 690 1875 1200 /dev/ser0\001
-4 0 0 50 0 0 12 0.0000 4 135 330 2100 600 eth0\001
-4 0 0 50 0 0 12 0.0000 4 135 390 750 825 eCos\001
-4 0 0 50 0 0 12 0.0000 4 180 825 600 1200 application\001
-4 0 0 50 0 0 12 0.0000 4 180 975 4350 1200 I/O Auxiliary\001
-4 0 0 50 0 0 12 0.0000 4 180 690 4500 825 ecosynth\001
-4 0 0 50 0 0 12 0.0000 4 135 870 5775 675 ethernet.tcl\001
-4 0 0 50 0 0 12 0.0000 4 135 660 5775 1200 serial.tcl\001
-4 0 0 50 0 0 12 0.0000 4 135 825 5775 1725 console.tcl\001
-4 0 0 50 0 0 12 0.0000 4 180 795 7575 675 Linux tap3\001
-4 0 0 50 0 0 12 0.0000 4 180 765 7575 1200 /dev/ttyS1\001
-4 0 0 50 0 0 12 0.0000 4 135 135 7575 1725 X\001
Index: packages/hal/synth/arch/current/doc/overview.gif
===================================================================
RCS file: packages/hal/synth/arch/current/doc/overview.gif
diff -N packages/hal/synth/arch/current/doc/overview.gif
Binary files /sourceware/cvs-tmp/cvs1M8ZFL and /dev/null differ
Index: packages/hal/synth/arch/current/doc/synth-io-overview.fig
===================================================================
RCS file: packages/hal/synth/arch/current/doc/synth-io-overview.fig
diff -N packages/hal/synth/arch/current/doc/synth-io-overview.fig
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ packages/hal/synth/arch/current/doc/synth-io-overview.fig	24 Feb 2003 06:46:43 -0000
@@ -0,0 +1,57 @@
+#FIG 3.2
+Landscape
+Center
+Inches
+Letter  
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 7 50 0 -1 0.000 0 0 -1 0 0 5
+	 300 300 3300 300 3300 1800 300 1800 300 300
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 2700 300 2700 1800
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 1800 300 1800 1800
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 1800 750 2700 750
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 1800 1350 2700 1350
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 5400 300 5400 1800
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 5400 750 6900 750
+2 1 1 1 0 7 50 0 -1 4.000 0 0 -1 0 0 2
+	 5400 1350 6900 1350
+2 2 0 1 0 7 50 0 -1 4.000 0 0 7 0 0 5
+	 4200 300 6900 300 6900 1800 4200 1800 4200 300
+2 1 0 2 0 7 50 0 -1 6.000 0 0 7 1 1 2
+	1 1 2.00 120.00 240.00
+	1 1 2.00 120.00 240.00
+	 3300 1050 4200 1050
+2 1 0 1 0 7 50 0 -1 4.000 0 0 -1 1 1 2
+	1 1 1.00 60.00 120.00
+	1 1 1.00 60.00 120.00
+	 6900 600 7500 600
+2 1 0 1 0 7 50 0 -1 4.000 0 0 -1 1 1 2
+	1 1 1.00 60.00 120.00
+	1 1 1.00 60.00 120.00
+	 6900 1125 7500 1125
+2 1 0 1 0 7 50 0 -1 4.000 0 0 -1 1 1 2
+	1 1 1.00 60.00 120.00
+	1 1 1.00 60.00 120.00
+	 6900 1650 7500 1650
+4 0 0 50 0 0 12 0.0000 4 135 375 2850 1200 HAL\001
+4 0 0 50 0 0 12 0.0000 4 135 585 1950 1650 console\001
+4 0 0 50 0 0 12 0.0000 4 135 690 1875 1200 /dev/ser0\001
+4 0 0 50 0 0 12 0.0000 4 135 330 2100 600 eth0\001
+4 0 0 50 0 0 12 0.0000 4 135 390 750 825 eCos\001
+4 0 0 50 0 0 12 0.0000 4 180 825 600 1200 application\001
+4 0 0 50 0 0 12 0.0000 4 180 975 4350 1200 I/O Auxiliary\001
+4 0 0 50 0 0 12 0.0000 4 180 690 4500 825 ecosynth\001
+4 0 0 50 0 0 12 0.0000 4 135 870 5775 675 ethernet.tcl\001
+4 0 0 50 0 0 12 0.0000 4 135 660 5775 1200 serial.tcl\001
+4 0 0 50 0 0 12 0.0000 4 135 825 5775 1725 console.tcl\001
+4 0 0 50 0 0 12 0.0000 4 180 795 7575 675 Linux tap3\001
+4 0 0 50 0 0 12 0.0000 4 180 765 7575 1200 /dev/ttyS1\001
+4 0 0 50 0 0 12 0.0000 4 135 135 7575 1725 X\001
Index: packages/hal/synth/arch/current/doc/synth-io-overview.gif
===================================================================
RCS file: packages/hal/synth/arch/current/doc/synth-io-overview.gif
diff -N packages/hal/synth/arch/current/doc/synth-io-overview.gif
Binary files /dev/null and synth-io-overview.gif differ
Index: packages/hal/synth/arch/current/doc/synth.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/hal/synth/arch/current/doc/synth.sgml,v
retrieving revision 1.3
diff -u -5 -p -r1.3 synth.sgml
--- packages/hal/synth/arch/current/doc/synth.sgml	15 Sep 2002 17:52:19 -0000	1.3
+++ packages/hal/synth/arch/current/doc/synth.sgml	24 Feb 2003 06:46:46 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE part  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE part  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
@@ -133,11 +133,11 @@ functionality is similar to what will be
 hardware for the application being developed.
     </para>
     <informalfigure PgWide=1>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="overview.gif" format="gif" Scalefit=1 Align="Center">
+          <imagedata fileref="synth-io-overview.gif" format="gif" Scalefit=1 Align="Center">
         </imageobject>
       </mediaobject>
     </informalfigure>
     <para>
 A key requirement for synthetic target code is that the embedded
@@ -1281,11 +1281,11 @@ can be used by other scripts.
   </refnamediv>
 
   <refsynopsisdiv>
     <funcsynopsis>
       <funcsynopsisinfo>
-#include &lt;cyg/hal/hal_io.h
+#include &lt;cyg/hal/hal_io.h&gt;
       </funcsynopsisinfo>
       <funcprototype>
         <funcdef>int <function>cyg_hal_sys_xyzzy</function></funcdef>
         <varargs>
       </funcprototype>
@@ -1393,11 +1393,11 @@ GNU C library sources.
   </refnamediv>
 
   <refsynopsisdiv>
     <funcsynopsis>
       <funcsynopsisinfo>
-#include &lt;cyg/hal/hal_io.h
+#include &lt;cyg/hal/hal_io.h&gt;
       </funcsynopsisinfo>
 
       <funcprototype>
         <funcdef>int <function>synth_auxiliary_instantiate</function></funcdef>
         <paramdef>const char* <parameter>package</parameter></paramdef>
Index: packages/io/common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/common/current/ChangeLog,v
retrieving revision 1.16
diff -u -5 -p -r1.16 ChangeLog
--- packages/io/common/current/ChangeLog	23 May 2002 23:05:54 -0000	1.16
+++ packages/io/common/current/ChangeLog	24 Feb 2003 06:46:48 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/io.cdl: Fix doc link.
+
 2002-03-12  Nick Garnett  <nickg at redhat dot com>
 
 	* doc/io.sgml: Generally sorted out, reformetted, folded. SMP
 	considerations added to various parts of the document.
 
Index: packages/io/common/current/cdl/io.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/common/current/cdl/io.cdl,v
retrieving revision 1.6
diff -u -5 -p -r1.6 io.cdl
--- packages/io/common/current/cdl/io.cdl	23 May 2002 23:05:56 -0000	1.6
+++ packages/io/common/current/cdl/io.cdl	24 Feb 2003 06:46:48 -0000
@@ -49,11 +49,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_IO {
     display       "I/O sub-system"
-    doc           redirect/ecos-device-drivers.html
+    doc           ref/io.html
     include_dir   cyg/io
     requires      CYGPKG_ERROR
     description   "
         The eCos system is supplied with a number of different
         device drivers.  This option enables the basic I/O system
Index: packages/io/eth/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/eth/current/ChangeLog,v
retrieving revision 1.39
diff -u -5 -p -r1.39 ChangeLog
--- packages/io/eth/current/ChangeLog	7 Feb 2003 00:27:08 -0000	1.39
+++ packages/io/eth/current/ChangeLog	24 Feb 2003 06:46:48 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/eth_drivers.cdl: Add doc link.
+
 2003-02-07  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* src/net/eth_drv.c: If driver can't set multi-cast, indicate it's
 	only a warning.
 
Index: packages/io/eth/current/cdl/eth_drivers.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/eth/current/cdl/eth_drivers.cdl,v
retrieving revision 1.18
diff -u -5 -p -r1.18 eth_drivers.cdl
--- packages/io/eth/current/cdl/eth_drivers.cdl	14 Aug 2002 13:20:14 -0000	1.18
+++ packages/io/eth/current/cdl/eth_drivers.cdl	24 Feb 2003 06:46:48 -0000
@@ -52,10 +52,11 @@
 cdl_package CYGPKG_IO_ETH_DRIVERS {
     display       "Common ethernet support"
     include_dir   cyg/io/eth
     parent        CYGPKG_IO
     description   "Platform independent ethernet drivers"
+    doc           ref/io-eth-drv-generic.html
 
     implements    CYGPKG_NET_DRIVER_FRAMEWORK
 
     cdl_interface     CYGINT_IO_ETH_MULTICAST {
         display   "Driver supports multicast addressing"
Index: packages/io/fileio/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/ChangeLog,v
retrieving revision 1.27
diff -u -5 -p -r1.27 ChangeLog
--- packages/io/fileio/current/ChangeLog	21 Feb 2003 00:08:08 -0000	1.27
+++ packages/io/fileio/current/ChangeLog	24 Feb 2003 06:46:48 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/fileio.cdl: Add doc link.
+
 2003-02-20  Bart Veer  <bartv at ecoscentric dot com>
 
 	* cdl/fileio.cdl: identify test binaries, not test sources
 
 2003-01-30  Andrew Lunn  <andrew dot lunn at ascom dot ch>
Index: packages/io/fileio/current/cdl/fileio.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/fileio/current/cdl/fileio.cdl,v
retrieving revision 1.11
diff -u -5 -p -r1.11 fileio.cdl
--- packages/io/fileio/current/cdl/fileio.cdl	21 Feb 2003 00:08:11 -0000	1.11
+++ packages/io/fileio/current/cdl/fileio.cdl	24 Feb 2003 06:46:48 -0000
@@ -52,10 +52,11 @@
 cdl_package CYGPKG_IO_FILEIO {
     display        "POSIX File IO compatibility layer"
     description    "This package enables the POSIX compatibility
                     layer that implements IEEE 1003.1 file IO."
     include_dir    cyg/fileio
+    doc            ref/fileio.html
     
     requires       CYGPKG_ISOINFRA
     requires       CYGPKG_ERROR
     requires       CYGINT_ISO_ERRNO
     requires       CYGINT_ISO_ERRNO_CODES
Index: packages/io/flash/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/flash/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -p -r1.23 ChangeLog
--- packages/io/flash/current/ChangeLog	23 May 2002 23:06:13 -0000	1.23
+++ packages/io/flash/current/ChangeLog	24 Feb 2003 06:46:48 -0000
@@ -1,5 +1,10 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/io_flash.cdl: Remove irrelevant doc link - default to top
+	level.
+
 2002-01-31  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* src/flashiodev.c: Fix bounds checking and offsetting.
 
 	* cdl/io_flash.cdl (CYGNUM_IO_FLASH_BLOCK_LENGTH_1): Default to
Index: packages/io/flash/current/cdl/io_flash.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/flash/current/cdl/io_flash.cdl,v
retrieving revision 1.11
diff -u -5 -p -r1.11 io_flash.cdl
--- packages/io/flash/current/cdl/io_flash.cdl	23 May 2002 23:06:14 -0000	1.11
+++ packages/io/flash/current/cdl/io_flash.cdl	24 Feb 2003 06:46:48 -0000
@@ -53,11 +53,10 @@ cdl_package CYGPKG_IO_FLASH {
     display       "FLASH device drivers"
     include_dir   cyg/io
     description   "
         This option enables drivers for basic I/O services on
         flash devices."
-    doc           redirect/ecos-device-drivers.html
     requires CYGPKG_ISOINFRA
     requires CYGINT_ISO_STRING_STRFUNCS
 
     compile       flash.c
  
Index: packages/io/pci/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/pci/current/ChangeLog,v
retrieving revision 1.18
diff -u -5 -p -r1.18 ChangeLog
--- packages/io/pci/current/ChangeLog	21 Feb 2003 18:10:31 -0000	1.18
+++ packages/io/pci/current/ChangeLog	24 Feb 2003 06:46:48 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/io_pci.cdl: Fix doc link.
+
 2003-02-21  Gary Thomas  <gary at mlbassoc dot com>
 
 	* src/pci.c (cyg_pci_get_device_info): While scanning active
 	devices, remember the I/O and memory addresses they use.  This
 	allows for new devices to be added which will not conflict.
Index: packages/io/pci/current/cdl/io_pci.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/pci/current/cdl/io_pci.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 io_pci.cdl
--- packages/io/pci/current/cdl/io_pci.cdl	23 May 2002 23:06:17 -0000	1.4
+++ packages/io/pci/current/cdl/io_pci.cdl	24 Feb 2003 06:46:48 -0000
@@ -48,11 +48,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_IO_PCI {
     display       "PCI configuration library"
-    doc           redirect/ecos-device-drivers.html
+    doc           ref/io-pci.html
     include_dir   cyg/io
     parent        CYGPKG_IO
     description   "
            The PCI configuration library provides initialization of devices
            on the PCI bus. Functions to find and access these devices are
Index: packages/io/pcmcia/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/pcmcia/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/io/pcmcia/current/ChangeLog	23 May 2002 23:06:21 -0000	1.5
+++ packages/io/pcmcia/current/ChangeLog	24 Feb 2003 06:46:48 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/io_pcmcia.cdl: Fix doc link.
+
 2002-04-12  Gary Thomas  <gthomas at redhat dot com>
 
 	* include/pcmcia.h: Add prototype(s) to remove warnings.
 
 2000-09-17  Gary Thomas  <gthomas at redhat dot com>
Index: packages/io/pcmcia/current/cdl/io_pcmcia.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/pcmcia/current/cdl/io_pcmcia.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 io_pcmcia.cdl
--- packages/io/pcmcia/current/cdl/io_pcmcia.cdl	23 May 2002 23:06:22 -0000	1.3
+++ packages/io/pcmcia/current/cdl/io_pcmcia.cdl	24 Feb 2003 06:46:48 -0000
@@ -53,11 +53,11 @@ cdl_package CYGPKG_IO_PCMCIA {
     display       "PCMCIA device drivers"
     include_dir   cyg/io
     description   "
         This option enables drivers for basic I/O services on
         pcmcia devices."
-    doc           redirect/ecos-device-drivers.html
+    doc           ref/io.html
 
     compile       pcmcia.c
  
     define_proc {
 	puts $::cdl_header "#include <pkgconf/system.h>"
Index: packages/io/serial/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/serial/current/ChangeLog,v
retrieving revision 1.48
diff -u -5 -p -r1.48 ChangeLog
--- packages/io/serial/current/ChangeLog	14 Feb 2003 11:50:11 -0000	1.48
+++ packages/io/serial/current/ChangeLog	24 Feb 2003 06:46:49 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/io_serial.cdl: Fix doc link.
+
 2003-02-14  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* src/common/termiostty.c: Support VMIN > 0 properly.
 
 2002-12-10  Gary Thomas  <gthomas at ecoscentric dot com>
Index: packages/io/serial/current/cdl/io_serial.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/serial/current/cdl/io_serial.cdl,v
retrieving revision 1.9
diff -u -5 -p -r1.9 io_serial.cdl
--- packages/io/serial/current/cdl/io_serial.cdl	23 May 2002 23:06:24 -0000	1.9
+++ packages/io/serial/current/cdl/io_serial.cdl	24 Feb 2003 06:46:50 -0000
@@ -55,11 +55,11 @@ cdl_package CYGPKG_IO_SERIAL {
     requires      CYGPKG_ERROR
     include_dir   cyg/io
     description   "
         This option enables drivers for basic I/O services on
         serial devices."
-    doc           redirect/ecos-device-drivers.html
+    doc           ref/io.html
 
     compile       -library=libextras.a common/serial.c
  
     define_proc {
 	puts $::cdl_header "/***** proc output start *****/"
Index: packages/io/usb/eth/slave/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/usb/eth/slave/current/ChangeLog,v
retrieving revision 1.8
diff -u -5 -p -r1.8 ChangeLog
--- packages/io/usb/eth/slave/current/ChangeLog	7 Aug 2002 19:19:11 -0000	1.8
+++ packages/io/usb/eth/slave/current/ChangeLog	24 Feb 2003 06:46:50 -0000
@@ -1,5 +1,12 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/usbs_eth.cdl: Fix doc link.
+
+	* doc/usbseth.sgml: Comment out DOCTYPE for now to allow building
+	with standard doc build.
+
 2002-07-26  David Smith  <dsmith at redhat dot com>
 
 	* host/ecos_usbeth.c (ecos_usbeth_probe):
 	Two changes to the code that checks to see if this is the correct
 	driver for the USB peripheral that was just loaded.  Fixed a bug
Index: packages/io/usb/eth/slave/current/cdl/usbs_eth.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/usb/eth/slave/current/cdl/usbs_eth.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 usbs_eth.cdl
--- packages/io/usb/eth/slave/current/cdl/usbs_eth.cdl	23 May 2002 23:06:31 -0000	1.4
+++ packages/io/usb/eth/slave/current/cdl/usbs_eth.cdl	24 Feb 2003 06:46:50 -0000
@@ -54,11 +54,11 @@ cdl_package CYGPKG_IO_USB_SLAVE_ETH {
     parent      CYGPKG_IO_USB_SLAVE
     requires    { CYGHWR_IO_USB_SLAVE_OUT_ENDPOINTS >= 1 }
     requires    { CYGHWR_IO_USB_SLAVE_IN_ENDPOINTS >= 1 }
     compile     usbseth.c
     implements  CYGINT_IO_USB_SLAVE_CLIENTS
-    doc         io-usb-slave-eth.html
+    doc         ref/io-usb-slave-eth.html
     
     description "
         The USB slave ethernet package supports the development
         of USB peripherals which provide an ethernet service to
         the host machine. Such a peripheral could be a simple
Index: packages/io/usb/eth/slave/current/doc/usbseth.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/usb/eth/slave/current/doc/usbseth.sgml,v
retrieving revision 1.5
diff -u -5 -p -r1.5 usbseth.sgml
--- packages/io/usb/eth/slave/current/doc/usbseth.sgml	15 Sep 2002 22:11:46 -0000	1.5
+++ packages/io/usb/eth/slave/current/doc/usbseth.sgml	24 Feb 2003 06:46:51 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE reference  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
Index: packages/io/usb/slave/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/usb/slave/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/io/usb/slave/current/ChangeLog	12 Feb 2003 17:23:12 -0000	1.9
+++ packages/io/usb/slave/current/ChangeLog	24 Feb 2003 06:46:51 -0000
@@ -1,5 +1,12 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/usbs.cdl: Update doc links.
+
+	* doc/usbs.sgml: Comment out DOCTYPE for now to allow building
+	with standard doc build.
+
 2003-02-12  Bart Veer  <bartv at ecoscentric dot com>
 
 	* host/Makefile.in, host/configure:
 	Regenerate after toplevel acinclude.m4 update
 
Index: packages/io/usb/slave/current/cdl/usbs.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/usb/slave/current/cdl/usbs.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 usbs.cdl
--- packages/io/usb/slave/current/cdl/usbs.cdl	23 May 2002 23:06:34 -0000	1.3
+++ packages/io/usb/slave/current/cdl/usbs.cdl	24 Feb 2003 06:46:51 -0000
@@ -52,11 +52,11 @@
 cdl_package CYGPKG_IO_USB_SLAVE {
     display     "USB slave-side support"
     parent      CYGPKG_IO_USB
     include_dir "cyg/io/usb"
     active_if   CYGHWR_IO_USB_SLAVE
-    doc         io-usb-slave.html
+    doc         ref/io-usb-slave.html
     
     compile usbs.c
 
     cdl_interface CYGINT_IO_USB_SLAVE_CLIENTS {
 	display         "Number of clients of USB devices"
@@ -104,11 +104,11 @@ cdl_package CYGPKG_IO_USB_SLAVE {
 	display "Number of available slave->host endpoints"
     }
 
     cdl_option CYGBLD_IO_USB_SLAVE_USBTEST {
 	display         "Build the main USB test program"
-	doc             usbs-testing.html
+	doc             ref/usbs-testing.html
 	description "
 	    The USB slave-side software is supplied with host-side
             and target-side software that allows a variety of testing
 	    to be performed. The slave-side software is not built
 	    by default since it can only operate in specific environments
Index: packages/io/usb/slave/current/doc/usbs.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/io/usb/slave/current/doc/usbs.sgml,v
retrieving revision 1.5
diff -u -5 -p -r1.5 usbs.sgml
--- packages/io/usb/slave/current/doc/usbs.sgml	15 Sep 2002 22:12:11 -0000	1.5
+++ packages/io/usb/slave/current/doc/usbs.sgml	24 Feb 2003 06:46:54 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE reference  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
Index: packages/kernel/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/ChangeLog,v
retrieving revision 1.95
diff -u -5 -p -r1.95 ChangeLog
--- packages/kernel/current/ChangeLog	19 Feb 2003 19:14:48 -0000	1.95
+++ packages/kernel/current/ChangeLog	24 Feb 2003 06:46:57 -0000
@@ -1,5 +1,11 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/kernel.cdl: Update doc links.
+	* cdl/synch.cdl: Ditto.
+	* cdl/thread.cdl: Ditto.
+
 2003-02-19  Nick Garnett  <nickg at calivar dot com>
 
 	* tests/fptest.c: Changed to run for a constant time rather than a
 	constant number of iterations, with a shorter run time for
 	simulated targets.
Index: packages/kernel/current/cdl/counters.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/cdl/counters.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 counters.cdl
--- packages/kernel/current/cdl/counters.cdl	23 May 2002 23:06:44 -0000	1.5
+++ packages/kernel/current/cdl/counters.cdl	24 Feb 2003 06:46:57 -0000
@@ -246,5 +246,6 @@ cdl_option CYGNUM_KERNEL_COUNTERS_RTC_PE
 	setting the system clock hardware.  For more information, see the
 	option to override default clock settings
 	(CYGPKG_KERNEL_COUNTERS_CLOCK_OVERRIDE) and associated options."
 }
 
+# EOF counters.cdl
Index: packages/kernel/current/cdl/kernel.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/cdl/kernel.cdl,v
retrieving revision 1.17
diff -u -5 -p -r1.17 kernel.cdl
--- packages/kernel/current/cdl/kernel.cdl	31 Jan 2003 11:44:03 -0000	1.17
+++ packages/kernel/current/cdl/kernel.cdl	24 Feb 2003 06:46:57 -0000
@@ -49,11 +49,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_KERNEL {
     display       "eCos kernel"
-    doc           redirect/ecos-kernel-overview.html
+    doc           ref/kernel.html
     include_dir   cyg/kernel
     description   "
         This package contains the core functionality of the eCos
         kernel. It relies on functionality provided by various HAL
         packages and by the eCos infrastructure. In turn the eCos
@@ -75,11 +75,11 @@ cdl_package CYGPKG_KERNEL {
     # The first component within the kernel is related to interrupt
     # handling.
     cdl_component CYGPKG_KERNEL_INTERRUPTS {
         display       "Kernel interrupt handling"
         flavor        none
-        doc           redirect/interrupts.html
+        doc           ref/kernel-interrupts.html
         description   "
             The majority of configuration options related to interrupt
             handling are in the HAL packages, since usually the code has
             to be platform-specific. There are a number of options
             provided within the kernel related to slightly higher-level
@@ -96,11 +96,11 @@ cdl_package CYGPKG_KERNEL {
     # between the HAL and kernel becomes blurred.
     cdl_component CYGPKG_KERNEL_EXCEPTIONS {
         display       "Exception handling"
         requires      CYGPKG_HAL_EXCEPTIONS
         default_value 1
-        doc           redirect/exceptions.html
+        doc           ref/kernel-exceptions.html
         description   "
             In the context of the eCos kernel exceptions are unexpected
             events detected by the hardware, for example an attempt to
             execute an illegal instruction. There is no relation with
             other forms of exception, for example the catch and throw
@@ -139,11 +139,11 @@ cdl_package CYGPKG_KERNEL {
 
     # ---------------------------------------------------------------------
     cdl_component CYGPKG_KERNEL_SCHED {
         display       "Kernel schedulers"
         flavor        none
-        doc           redirect/the-scheduler.html
+        doc           ref/kernel-overview.html#KERNEL-OVERVIEW-SCHEDULERS
         description   "
             The eCos kernel provides a choice of schedulers. In addition
             there are a number of configuration options to control the
             detailed behaviour of these schedulers."
 
@@ -162,11 +162,11 @@ cdl_package CYGPKG_KERNEL {
     
     # ---------------------------------------------------------------------
     cdl_component CYGPKG_KERNEL_COUNTERS {
         display       "Counters and clocks"
         flavor        none
-        doc           redirect/counters-clocks-and-alarms.html
+        doc           ref/kernel-counters.html
         description   "
             The counter objects provided by the kernel provide an
             abstraction of the clock facility that is generally provided.
             Application code can associate alarms with counters, where an
             alarm is identified by the number of ticks until it triggers,
@@ -178,11 +178,10 @@ cdl_package CYGPKG_KERNEL {
 
     # ---------------------------------------------------------------------
     cdl_component CYGPKG_KERNEL_THREADS {
         display       "Thread-related options"
         flavor        none
-        doc           redirect/thread-operations.html
         description   "
             There are a number of configuration options related to the
             implementation of threads, for example whether or not the
             eCos kernel supports per-thread data."
 
@@ -191,11 +190,10 @@ cdl_package CYGPKG_KERNEL {
 
     # ---------------------------------------------------------------------
     cdl_component CYGPKG_KERNEL_SYNCH {
         display       "Synchronization primitives"
         flavor        none
-        doc           redirect/thread-synchronization.html
         description   "
             The eCos kernel supports a number of different
             synchronization primitives such as mutexes, semaphores,
             condition variables, and message boxes. There are
             configuration options to control the exact behaviour of some
@@ -247,11 +245,10 @@ cdl_package CYGPKG_KERNEL {
     # Kernel API's. The C++ one is the default. A C API is optional.
     # Support for other languages is possible.
     cdl_component CYGPKG_KERNEL_API {
         display       "Kernel APIs"
         flavor        none
-        doc           redirect/kernel-apis.html
         description   "
             The eCos kernel is implemented in C++, so a C++ interface
             to the kernel is always available. There is also an optional
             C API. Additional API's may be provided in future versions."
 
@@ -334,5 +331,7 @@ cdl_package CYGPKG_KERNEL {
             description   "
                 This option specifies the set of tests for the eCos kernel."
         }
     }
 }
+
+# EOF kernel.cdl
Index: packages/kernel/current/cdl/scheduler.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/cdl/scheduler.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 scheduler.cdl
--- packages/kernel/current/cdl/scheduler.cdl	23 May 2002 23:06:45 -0000	1.7
+++ packages/kernel/current/cdl/scheduler.cdl	24 Feb 2003 06:46:57 -0000
@@ -251,5 +251,6 @@ cdl_component CYGSEM_KERNEL_SCHED_ASR_SU
 	     it may be useful to pass per-thread data to a shared ASR
 	     function."
     }
 }
 
+# EOF scheduler.cdl
Index: packages/kernel/current/cdl/synch.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/cdl/synch.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 synch.cdl
--- packages/kernel/current/cdl/synch.cdl	23 May 2002 23:06:45 -0000	1.7
+++ packages/kernel/current/cdl/synch.cdl	24 Feb 2003 06:46:58 -0000
@@ -51,10 +51,11 @@
 
 
 cdl_component CYGSEM_KERNEL_SYNCH_MUTEX_PRIORITY_INVERSION_PROTOCOL {
     display      "Priority inversion protection protocols"
     flavor       booldata
+    doc          ref/kernel-mutexes.html
     legal_values { "SIMPLE" }
     default_value { "SIMPLE" }
     active_if    { CYGSEM_KERNEL_SCHED_MLQUEUE }
     requires     { CYGINT_KERNEL_SCHEDULER_UNIQUE_PRIORITIES == 0 }
     description "
@@ -140,10 +141,11 @@ cdl_component CYGSEM_KERNEL_SYNCH_MUTEX_
     
 }
 
 cdl_option CYGMFN_KERNEL_SYNCH_MBOXT_PUT_CAN_WAIT {
     display       "Message box blocking put support"
+    doc           ref/kernel-mail-boxes.html
     default_value 1
     description   "
         Message boxes can support three different versions of the
         put-message operation. The first is tryput(), which will fail
         if the message box is already full. The other two are the
@@ -159,10 +161,11 @@ cdl_option CYGMFN_KERNEL_SYNCH_MBOXT_PUT
         if thread timers are enabled."
 }
 
 cdl_option CYGNUM_KERNEL_SYNCH_MBOX_QUEUE_SIZE {
     display       "Message box queue size"
+    doc           ref/kernel-mail-boxes.html
     flavor        data
     legal_values  1 to 65535
     default_value 10
     description   "
         This configuration option controls the number of messages
@@ -172,19 +175,21 @@ cdl_option CYGNUM_KERNEL_SYNCH_MBOX_QUEU
         each possible message."
 }
 
 cdl_option CYGMFN_KERNEL_SYNCH_CONDVAR_TIMED_WAIT {
     display       "Condition variable timed-wait support"
+    doc           ref/kernel-condition-variables.html
     requires      CYGFUN_KERNEL_THREADS_TIMER
     default_value 1
     description   "
         This option enables the condition variable timed wait
         facility."
 }
 
 cdl_option CYGMFN_KERNEL_SYNCH_CONDVAR_WAIT_MUTEX {
     display       "Condition variable explicit mutex wait support"
+    doc           ref/kernel-condition-variables.html
     default_value 1
     description   "
         This option enables the condition variable explicit mutex wait
         facility. By default condition variables in eCos are created with
         a statically associated mutex. This option permits wait (and timed wait
@@ -202,5 +207,7 @@ cdl_option CYGIMP_KERNEL_SYNCH_MQUEUE_NO
         adversely affect code size in application that make lots of mqueue
         calls from different places, so enabling this option provides
         non-inline versions to be used instead."
     compile       sync/mqueue.cxx
 }
+
+# EOF synch.cdl
Index: packages/kernel/current/cdl/thread.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/kernel/current/cdl/thread.cdl,v
retrieving revision 1.10
diff -u -5 -p -r1.10 thread.cdl
--- packages/kernel/current/cdl/thread.cdl	30 Jan 2003 07:02:53 -0000	1.10
+++ packages/kernel/current/cdl/thread.cdl	24 Feb 2003 06:46:58 -0000
@@ -152,10 +152,11 @@ cdl_component CYGFUN_KERNEL_THREADS_STAC
 }
 
 cdl_component CYGVAR_KERNEL_THREADS_DATA {
     display            "Support for per-thread data"
     requires           CYGFUN_KERNEL_THREADS_STACK_LIMIT
+    doc                ref/kernel-thread-data.html
     default_value      1
     description "
         It is possible for the kernel to support per-thread data, in
         other words an area of memory specific to each thread which
         can be used to store data for that thread. This per-thread
@@ -231,10 +232,11 @@ cdl_component CYGVAR_KERNEL_THREADS_DATA
     }
 }
 
 cdl_component CYGPKG_KERNEL_THREADS_DESTRUCTORS {
     display       "Thread destructors"
+    doc           ref/kernel-thread-destructors.html
     default_value 0
     description   "
         This option enables support for registered destructor functions to
         be called on thread exit."
     
@@ -289,11 +291,11 @@ cdl_option CYGNUM_KERNEL_MAX_SUSPEND_COU
     flavor        data
     default_value 500
     description   "
         This option provides for an assertion that the count value for
         counted thread suspends do not exceed set limits.  This is to help
-        with debugging, to allow a runaaway loop, for example, to be
+        with debugging, to allow a runaway loop, for example, to be
         detected more easily.
     
         If the option is not defined, no assert is included.  Whether asserts
         are themselves included depends on infrastructure configury in
         infra.h"
@@ -325,5 +327,6 @@ cdl_option CYGIMP_IDLE_THREAD_YIELD {
     description   "
         If the scheduler configuration only has a single priority
         level, then the idle thread must yield each time around its loop."
 }
 
+# EOF thread.cdl
Index: packages/language/c/libc/common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/common/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/language/c/libc/common/current/ChangeLog	23 May 2002 23:07:03 -0000	1.3
+++ packages/language/c/libc/common/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/libc.cdl: Fix doc link.
+
 2000-05-02  Jonathan Larmour  <jlarmour at redhat dot co dot uk>
 
 	* New package
 	Separated original libc out into separate packages on functional
 	boundaries.
Index: packages/language/c/libc/common/current/cdl/libc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/common/current/cdl/libc.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 libc.cdl
--- packages/language/c/libc/common/current/cdl/libc.cdl	23 May 2002 23:07:04 -0000	1.3
+++ packages/language/c/libc/common/current/cdl/libc.cdl	24 Feb 2003 06:46:59 -0000
@@ -54,10 +54,10 @@ cdl_package CYGPKG_LIBC {
 The packages under this package enable compatibility with the ISO C
 standard - ISO/IEC 9899:1990. This allows the user application to use
 well known standard C library functions, and in eCos starts a thread
 to invoke the user function main(). This package is a top-level placeholder
 to contain the implementations."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
 }
 
 # ====================================================================
 # EOF libc.cdl
Index: packages/language/c/libc/i18n/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/i18n/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/language/c/libc/i18n/current/ChangeLog	23 May 2002 23:07:04 -0000	1.5
+++ packages/language/c/libc/i18n/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/i18n.cdl: Fix doc link.
+
 2001-06-28  Jesper Skov  <jskov at redhat dot com>
 
 	* tests/i18nmb.c: fix warning.
 
 2001-06-08  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/language/c/libc/i18n/current/cdl/i18n.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/i18n/current/cdl/i18n.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 i18n.cdl
--- packages/language/c/libc/i18n/current/cdl/i18n.cdl	23 May 2002 23:07:05 -0000	1.4
+++ packages/language/c/libc/i18n/current/cdl/i18n.cdl	24 Feb 2003 06:46:59 -0000
@@ -52,11 +52,11 @@ cdl_package CYGPKG_LIBC_I18N {
     display       "ISO C library internationalization functions"
     description   "
         This package provides internationalization functions specified by the
         ISO C standard - ISO/IEC 9899:1990. These include locale-related
         functionality and <ctype.h> functionality."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/i18n
     parent        CYGPKG_LIBC
     implements    CYGINT_ISO_LOCALE
     implements    CYGINT_ISO_CTYPE
     implements    CYGINT_ISO_STDLIB_MULTIBYTE
Index: packages/language/c/libc/setjmp/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/setjmp/current/ChangeLog,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ChangeLog
--- packages/language/c/libc/setjmp/current/ChangeLog	23 May 2002 23:07:07 -0000	1.3
+++ packages/language/c/libc/setjmp/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/setjmp.cdl: Fix doc link.
+
 2002-04-09  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* include/setjmp.h: Use NORET attributes from cyg_type.h.
 
 2000-05-16  Nick Garnett  <nickg at cygnus dot co dot uk>
Index: packages/language/c/libc/setjmp/current/cdl/setjmp.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/setjmp/current/cdl/setjmp.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 setjmp.cdl
--- packages/language/c/libc/setjmp/current/cdl/setjmp.cdl	23 May 2002 23:07:08 -0000	1.3
+++ packages/language/c/libc/setjmp/current/cdl/setjmp.cdl	24 Feb 2003 06:46:59 -0000
@@ -52,11 +52,11 @@ cdl_package CYGPKG_LIBC_SETJMP {
     display       "ISO C library setjmp/longjmp functions"
     description   "
         This package provides non-local jumps based on setjmp() and
         longjmp() in <setjmp.h> as specified by the ISO C
         standard - ISO/IEC 9899:1990."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/setjmp
     parent        CYGPKG_LIBC
     requires      CYGPKG_ISOINFRA
     implements    CYGINT_ISO_SETJMP
     requires      { CYGBLD_ISO_SETJMP_HEADER == "<cyg/libc/setjmp/setjmp.h>" }
Index: packages/language/c/libc/signals/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/signals/current/ChangeLog,v
retrieving revision 1.7
diff -u -5 -p -r1.7 ChangeLog
--- packages/language/c/libc/signals/current/ChangeLog	13 Feb 2003 00:03:00 -0000	1.7
+++ packages/language/c/libc/signals/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/signals.cdl: Fix doc link.
+
 2003-02-13  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* include/signal.inl (raise): Use if/else rather than switch to
 	avoid GCC 3.2 bug.
 
Index: packages/language/c/libc/signals/current/cdl/signals.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/signals/current/cdl/signals.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 signals.cdl
--- packages/language/c/libc/signals/current/cdl/signals.cdl	23 May 2002 23:07:09 -0000	1.4
+++ packages/language/c/libc/signals/current/cdl/signals.cdl	24 Feb 2003 06:46:59 -0000
@@ -55,11 +55,11 @@ cdl_package CYGPKG_LIBC_SIGNALS {
             as implemented in ISO/IEC 9899:1990 chapter 7.7 with
             the signal() and raise() functions. As well as
             allowing a program to send itself signals, it is
             also possible to cause hardware exceptions to
             be signalled to the program in a similar way."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/signals
     parent        CYGPKG_LIBC
     implements    CYGINT_ISO_SIGNAL_NUMBERS
     implements    CYGINT_ISO_SIGNAL_IMPL
     requires      { CYGBLD_ISO_SIGNAL_NUMBERS_HEADER == \
Index: packages/language/c/libc/startup/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/startup/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/language/c/libc/startup/current/ChangeLog	23 May 2002 23:07:10 -0000	1.6
+++ packages/language/c/libc/startup/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/startup.cdl: Fix doc link.
+
 2002-04-09  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* src/_exit.cxx (_exit): Assert on non-zero error.
 
 2001-10-09  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/language/c/libc/startup/current/cdl/startup.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/startup/current/cdl/startup.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 startup.cdl
--- packages/language/c/libc/startup/current/cdl/startup.cdl	23 May 2002 23:07:11 -0000	1.5
+++ packages/language/c/libc/startup/current/cdl/startup.cdl	24 Feb 2003 06:46:59 -0000
@@ -58,11 +58,11 @@ cdl_package CYGPKG_LIBC_STARTUP {
             supplied with arguments and an environment
             (as retrievable by the getenv() function).
             It also includes at the other end of things,
             what happens when main() returns or exit() is
             called."
-    doc           redirect/c-library-startup.html
+    doc           ref/c-library-startup.html
     include_dir   cyg/libc/startup
     parent        CYGPKG_LIBC
     requires      CYGPKG_ISOINFRA
     requires      { CYGINT_LIBC_STARTUP_CONTEXT == 1 }
     implements    CYGINT_ISO_EXIT
Index: packages/language/c/libc/stdio/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/stdio/current/ChangeLog,v
retrieving revision 1.19
diff -u -5 -p -r1.19 ChangeLog
--- packages/language/c/libc/stdio/current/ChangeLog	15 Feb 2003 16:57:03 -0000	1.19
+++ packages/language/c/libc/stdio/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/stdio.cdl: Fix doc link.
+
 2003-02-15  Fabrice Gautier  <Fabrice_Gautier at sdesigns dot com>
 
 	* include/stdio.inl (setbuf): Don't supply size with _IONBF.
 	* src/common/stdioinlines.cxx (setbuf): Ditto.
 
Index: packages/language/c/libc/stdio/current/cdl/stdio.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/stdio/current/cdl/stdio.cdl,v
retrieving revision 1.8
diff -u -5 -p -r1.8 stdio.cdl
--- packages/language/c/libc/stdio/current/cdl/stdio.cdl	23 May 2002 23:07:13 -0000	1.8
+++ packages/language/c/libc/stdio/current/cdl/stdio.cdl	24 Feb 2003 06:46:59 -0000
@@ -52,11 +52,11 @@ cdl_package CYGPKG_LIBC_STDIO {
     display       "ISO C library standard input/output functions"
     description   "
         This package provides standard input/output functions associated
         with the header file <stdio.h> as specified by the
         ISO C standard - ISO/IEC 9899:1990."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/stdio
     parent        CYGPKG_LIBC
     requires      CYGPKG_IO
     requires      CYGPKG_IO_SERIAL_HALDIAG
     requires      CYGPKG_LIBC_I18N
@@ -340,10 +340,11 @@ cdl_package CYGPKG_LIBC_STDIO {
         }
     }
     
     cdl_option CYGSEM_LIBC_STDIO_THREAD_SAFE_STREAMS {
         display       "Thread safe I/O streams"
+        doc           ref/libc-thread-safety.html
         requires      CYGPKG_KERNEL
         default_value { 0 != CYGPKG_KERNEL }
         description   "
             This option controls whether standard I/O streams
             are thread-safe. Having this option set allows
Index: packages/language/c/libc/stdlib/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/stdlib/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/language/c/libc/stdlib/current/ChangeLog	23 May 2002 23:07:20 -0000	1.6
+++ packages/language/c/libc/stdlib/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/stdlib.cdl: Fix doc link.
+
 2001-06-28  Jesper Skov  <jskov at redhat dot com>
 
 	* tests/atoi.c (main): Fix warning.
 
 2001-06-18  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/language/c/libc/stdlib/current/cdl/stdlib.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/stdlib/current/cdl/stdlib.cdl,v
retrieving revision 1.4
diff -u -5 -p -r1.4 stdlib.cdl
--- packages/language/c/libc/stdlib/current/cdl/stdlib.cdl	23 May 2002 23:07:20 -0000	1.4
+++ packages/language/c/libc/stdlib/current/cdl/stdlib.cdl	24 Feb 2003 06:46:59 -0000
@@ -51,11 +51,11 @@
 cdl_package CYGPKG_LIBC_STDLIB {
     display       "ISO C library general utility functions"
     description   "
         This package provides general utility functions in <stdlib.h>
         as specified by the ISO C standard - ISO/IEC 9899:1990."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/stdlib
     parent        CYGPKG_LIBC
     requires      CYGPKG_ISOINFRA
     implements    CYGINT_ISO_STDLIB_STRCONV
     implements    CYGINT_ISO_STDLIB_ENVIRON
@@ -118,10 +118,11 @@ cdl_package CYGPKG_LIBC_STDLIB {
             These options control the behaviour of the
             functions rand(), srand() and rand_r()"
     
         cdl_option CYGSEM_LIBC_PER_THREAD_RAND {
             display       "Per-thread random seed"
+            doc           ref/libc-thread-safety.html
             requires      CYGVAR_KERNEL_THREADS_DATA
             default_value 0
             description   "
                 This option controls whether the pseudo-random
                 number generation functions rand() and srand()
Index: packages/language/c/libc/string/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/ChangeLog,v
retrieving revision 1.6
diff -u -5 -p -r1.6 ChangeLog
--- packages/language/c/libc/string/current/ChangeLog	23 May 2002 23:07:23 -0000	1.6
+++ packages/language/c/libc/string/current/ChangeLog	24 Feb 2003 06:46:59 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/string.cdl: Fix doc link.
+
 2001-11-27  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* cdl/string.cdl (CYGFUN_LIBC_STRING_BSD_FUNCS): New option to indicate
 	provision of BSD-ish string functions.
 	* include/bsdstring.h: New header to export BSD string func prototypes.
Index: packages/language/c/libc/string/current/cdl/string.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/string/current/cdl/string.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 string.cdl
--- packages/language/c/libc/string/current/cdl/string.cdl	23 May 2002 23:07:23 -0000	1.5
+++ packages/language/c/libc/string/current/cdl/string.cdl	24 Feb 2003 06:46:59 -0000
@@ -51,11 +51,11 @@
 cdl_package CYGPKG_LIBC_STRING {
     display       "ISO C library string functions"
     description   "
         This package provides string functions specified by the
         ISO C standard - ISO/IEC 9899:1990."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/string  
     parent        CYGPKG_LIBC
     implements    CYGINT_ISO_STRTOK_R
     implements    CYGINT_ISO_STRING_LOCALE_FUNCS
     implements    CYGINT_ISO_STRING_MEMFUNCS
Index: packages/language/c/libc/time/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/time/current/ChangeLog,v
retrieving revision 1.12
diff -u -5 -p -r1.12 ChangeLog
--- packages/language/c/libc/time/current/ChangeLog	28 Jan 2003 00:43:53 -0000	1.12
+++ packages/language/c/libc/time/current/ChangeLog	24 Feb 2003 06:47:00 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/time.cdl: Fix doc link.
+
 2003-01-28  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* cdl/time.cdl: Correct reference to
 	CYGSEM_LIBC_TIME_POSIX_TIME_ROUTINES in CYGPKG_LIBC_TIME_TESTS to
 	CYGFUN_LIBC_TIME_POSIX.
Index: packages/language/c/libc/time/current/cdl/time.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libc/time/current/cdl/time.cdl,v
retrieving revision 1.7
diff -u -5 -p -r1.7 time.cdl
--- packages/language/c/libc/time/current/cdl/time.cdl	28 Jan 2003 00:43:53 -0000	1.7
+++ packages/language/c/libc/time/current/cdl/time.cdl	24 Feb 2003 06:47:00 -0000
@@ -51,11 +51,11 @@
 cdl_package CYGPKG_LIBC_TIME {
     display       "ISO C library date and time functions"
     description   "
         This package provides time functions specified by the
         ISO C standard - ISO/IEC 9899:1990."
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     include_dir   cyg/libc/time  
     parent        CYGPKG_LIBC
     implements    CYGINT_ISO_C_TIME_TYPES
     implements    CYGINT_ISO_C_CLOCK_FUNCS
     requires      { CYGBLD_ISO_C_TIME_TYPES_HEADER == "<cyg/libc/time/time.h>" }
Index: packages/language/c/libm/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libm/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -p -r1.23 ChangeLog
--- packages/language/c/libm/current/ChangeLog	23 May 2002 23:07:38 -0000	1.23
+++ packages/language/c/libm/current/ChangeLog	24 Feb 2003 06:47:01 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/libm.cdl: Fix doc link.
+
 2001-09-28  Jesper Skov  <jskov at redhat dot com>
 
 	* src/double/portable-api/s_expm1.c (expm1): Init c before it's used.
 
 2001-07-20  Jonathan Larmour  <jlarmour at redhat dot com>
Index: packages/language/c/libm/current/cdl/libm.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/language/c/libm/current/cdl/libm.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 libm.cdl
--- packages/language/c/libm/current/cdl/libm.cdl	23 May 2002 23:07:39 -0000	1.5
+++ packages/language/c/libm/current/cdl/libm.cdl	24 Feb 2003 06:47:01 -0000
@@ -49,11 +49,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_LIBM {
     display       "Math library"
-    doc           redirect/the-iso-standard-c-and-math-libraries.html
+    doc           ref/libc.html
     description   "
         ISO standard floating point mathematical library
         containing many useful functions for mathematical
         calculations."
 
Index: packages/net/bsd_tcpip/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/ChangeLog,v
retrieving revision 1.16
diff -u -5 -p -r1.16 ChangeLog
--- packages/net/bsd_tcpip/current/ChangeLog	18 Feb 2003 17:32:02 -0000	1.16
+++ packages/net/bsd_tcpip/current/ChangeLog	24 Feb 2003 06:47:01 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/freebsd_net.cdl: Fix doc link.
+
 2003-02-18  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* cdl/freebsd_net.cdl: Remove unused NBPFILTER and BRIDGE CDL options.
 
 2003-02-14  Jonathan Larmour  <jifl at eCosCentric dot com>
Index: packages/net/bsd_tcpip/current/cdl/freebsd_net.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/bsd_tcpip/current/cdl/freebsd_net.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 freebsd_net.cdl
--- packages/net/bsd_tcpip/current/cdl/freebsd_net.cdl	18 Feb 2003 17:32:02 -0000	1.2
+++ packages/net/bsd_tcpip/current/cdl/freebsd_net.cdl	24 Feb 2003 06:47:01 -0000
@@ -27,11 +27,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_NET_FREEBSD_STACK {
     display       "FreeBSD networking stack"
     parent        CYGPKG_NET
-    doc           doc/index.html
+    doc           ref/tcpip-freebsd.html
     include_dir   .
     requires      CYGPKG_IO
     requires      CYGPKG_ISOINFRA
     requires      CYGINT_ISO_C_TIME_TYPES
     requires      CYGINT_ISO_STRERROR
Index: packages/net/common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/ChangeLog,v
retrieving revision 1.19
diff -u -5 -p -r1.19 ChangeLog
--- packages/net/common/current/ChangeLog	31 Jan 2003 12:35:07 -0000	1.19
+++ packages/net/common/current/ChangeLog	24 Feb 2003 06:47:02 -0000
@@ -1,5 +1,12 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/net.cdl: Improve doc links.
+
+	* doc/prepare-manpages.sh: Generate namespaced IDs, without shouting.
+	* doc/tcpip-manpages.sgml: Regenerated.
+
 2003-01-31  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* cdl/net.cdl (CYGPKG_NET_BUILD_HW_TESTS): Requires eth hardware
 	devices.
 	(CYGPKG_NET_TESTS): Remove from under CYGPKG_NET_BUILD_TESTS (which
Index: packages/net/common/current/cdl/net.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/cdl/net.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 net.cdl
--- packages/net/common/current/cdl/net.cdl	31 Jan 2003 12:35:07 -0000	1.2
+++ packages/net/common/current/cdl/net.cdl	24 Feb 2003 06:47:02 -0000
@@ -26,11 +26,11 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_NET {
     display       "Basic networking framework"
-    doc           doc/index.html
+    doc           ref/net-common-tcpip.html
     include_dir   .
     requires      CYGPKG_IO
     requires      CYGPKG_ISOINFRA
     requires      CYGINT_ISO_C_TIME_TYPES
     requires      CYGINT_ISO_STRERROR
Index: packages/net/common/current/doc/prepare-manpages.sh
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/doc/prepare-manpages.sh,v
retrieving revision 1.1
diff -u -5 -p -r1.1 prepare-manpages.sh
--- packages/net/common/current/doc/prepare-manpages.sh	20 May 2002 22:25:03 -0000	1.1
+++ packages/net/common/current/doc/prepare-manpages.sh	24 Feb 2003 06:47:02 -0000
@@ -24,15 +24,15 @@ echo >> tcpip-manpages.sgml
 
 for manpage in $MANPAGE_LIST
 do
     echo "processing $manpage"
     # get the title for this section
-    manpage_title=`egrep '^\.Dt' $manpage | awk '{print $2}'`
+    manpage_title=`egrep '^\.Dt' $manpage | awk '{print $2}' | tr 'A-Z' 'a-z'`
     # note that _ is illegal in an id, so we canonicalize it to -
     docbook_section_id=`echo $manpage_title | sed 's/_/-/g'`
     # now prepare out a section and title
-    echo "  <sect1 id=\"$docbook_section_id\">" >> tcpip-manpages.sgml
+    echo "  <sect1 id=\"net-common-tcpip-manpages-$docbook_section_id\">" >> tcpip-manpages.sgml
     echo "    <title>$manpage_title</title>" >> tcpip-manpages.sgml
     # we make it <screen> so that it is a monospaced font
     echo "    <screen>" >> tcpip-manpages.sgml
 
     # now put the contents into this section
Index: packages/net/common/current/doc/tcpip-manpages.sgml
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/common/current/doc/tcpip-manpages.sgml,v
retrieving revision 1.1
diff -u -5 -p -r1.1 tcpip-manpages.sgml
--- packages/net/common/current/doc/tcpip-manpages.sgml	20 May 2002 22:25:03 -0000	1.1
+++ packages/net/common/current/doc/tcpip-manpages.sgml	24 Feb 2003 06:47:05 -0000
@@ -6,55 +6,53 @@
 
 <chapter id="tcpip-library-reference">
   <title>TCP/IP Library Reference</title>
 
 
-  <sect1 id="GETDOMAINNAME">
-    <title>GETDOMAINNAME</title>
+  <sect1 id="net-common-tcpip-manpages-getdomainname">
+    <title>getdomainname</title>
     <screen>
-
-GETDOMAINNAME(3)          System Programmer's Manual          GETDOMAINNAME(3)
+GETDOMAINNAME(3)        System Library Functions Manual       GETDOMAINNAME(3)
 
 NAME
      getdomainname, setdomainname - get/set YP domain name of current host
 
 SYNOPSIS
      #include &lt;unistd.h>
 
      int
-     getdomainname(char *name, size_t namelen)
+     getdomainname(char *name, size_t namelen);
 
      int
-     setdomainname(const char *name, size_t namelen)
+     setdomainname(const char *name, size_t namelen);
 
 DESCRIPTION
      The getdomainname() function returns the YP domain name for the current
      processor, as previously set by setdomainname().  The parameter namelen
      specifies the size of the name array.  If insufficient space is provided,
      the returned name is truncated.  The returned name is always null termi-
      nated.
 
      setdomainname() sets the domain name of the host machine to be name,
-     which has length namelen. This call is restricted to the superuser and is
-     normally used only when the system is bootstrapped.
+     which has length namelen.  This call is restricted to the superuser and
+     is normally used only when the system is bootstrapped.
 
 RETURN VALUES
-     If the call succeeds a value of 0 is returned.  If the call fails, a val-
-     ue of -1 is returned and an error code is placed in the global variable
-     errno.
+     If the call succeeds a value of 0 is returned.  If the call fails, a
+     value of -1 is returned and an error code is placed in the global vari-
+     able errno.
 
 ERRORS
      The following errors may be returned by these calls:
 
-     [EFAULT]      The name or namelen parameter gave an invalid address.
+     [EFAULT]           The name or namelen parameter gave an invalid address.
 
-     [EPERM]       The caller tried to set the domain name and was not the su-
-                   peruser.
+     [EPERM]            The caller tried to set the domain name and was not
+                        the superuser.
 
 SEE ALSO
-     domainname(1),  gethostid(3),  gethostname(3),  sysctl(3),  sysctl(8),
-     yp(8)
+     domainname(1), gethostid(3), gethostname(3), sysctl(3), sysctl(8), yp(8)
 
 BUGS
      Domain names are limited to MAXHOSTNAMELEN (from &lt;sys/param.h>) charac-
      ters, currently 256.  This includes the terminating NUL character.
 
@@ -62,62 +60,61 @@ BUGS
      systems may not guarantee termination with NUL.
 
 HISTORY
      The getdomainname function call appeared in SunOS 3.x.
 
-BSD Experimental                  May 6, 1994                                1
+BSD                               May 6, 1994                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETHOSTNAME">
-    <title>GETHOSTNAME</title>
+  <sect1 id="net-common-tcpip-manpages-gethostname">
+    <title>gethostname</title>
     <screen>
-
-GETHOSTNAME(3)            System Programmer's Manual            GETHOSTNAME(3)
+GETHOSTNAME(3)          System Library Functions Manual         GETHOSTNAME(3)
 
 NAME
      gethostname, sethostname - get/set name of current host
 
 SYNOPSIS
      #include &lt;unistd.h>
 
      int
-     gethostname(char *name, size_t namelen)
+     gethostname(char *name, size_t namelen);
 
      int
-     sethostname(const char *name, size_t namelen)
+     sethostname(const char *name, size_t namelen);
 
 DESCRIPTION
      The gethostname() function returns the standard host name for the current
      processor, as previously set by sethostname().  The parameter namelen
      specifies the size of the name array.  If insufficient space is provided,
      the returned name is truncated.  The returned name is always null termi-
      nated.
 
      sethostname() sets the name of the host machine to be name, which has
-     length namelen. This call is restricted to the superuser and is normally
+     length namelen.  This call is restricted to the superuser and is normally
      used only when the system is bootstrapped.
 
 RETURN VALUES
-     If the call succeeds a value of 0 is returned.  If the call fails, a val-
-     ue of -1 is returned and an error code is placed in the global variable
-     errno.
+     If the call succeeds a value of 0 is returned.  If the call fails, a
+     value of -1 is returned and an error code is placed in the global vari-
+     able errno.
 
 ERRORS
      The following errors may be returned by these calls:
 
-     [EFAULT]      The name or namelen parameter gave an invalid address.
+     [EFAULT]           The name or namelen parameter gave an invalid address.
 
-     [EPERM]       The caller tried to set the hostname and was not the supe-
-                   ruser.
+     [EPERM]            The caller tried to set the hostname and was not the
+                        superuser.
 
 SEE ALSO
-     hostname(1),  getdomainname(3),  gethostid(3),  sysctl(3),  sysctl(8),
-     yp(8)
+     hostname(1), getdomainname(3), gethostid(3), sysctl(3), sysctl(8), yp(8)
 
 STANDARDS
-     The gethostname() function call conforms to .
+     The gethostname() function call conforms to X/Open Portability Guide
+     Issue 4.2 (``XPG4.2'').
 
 HISTORY
      The gethostname() function call appeared in 4.2BSD.
 
 BUGS
@@ -125,19 +122,18 @@ BUGS
      currently 256.  This includes the terminating NUL character.
 
      If the buffer passed to gethostname() is smaller than MAXHOSTNAMELEN,
      other operating systems may not guarantee termination with NUL.
 
-BSD Experimental                 June 4, 1993                                1
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="BYTEORDER">
-    <title>BYTEORDER</title>
+  <sect1 id="net-common-tcpip-manpages-byteorder">
+    <title>byteorder</title>
     <screen>
-
-BYTEORDER(3)              System Programmer's Manual              BYTEORDER(3)
+BYTEORDER(3)            System Library Functions Manual           BYTEORDER(3)
 
 NAME
      htonl, htons, ntohl, ntohs, htobe32, htobe16, betoh32, betoh16, htole32,
      htole16, letoh32, letoh16, swap32, swap16 - convert values between dif-
      ferent byte orderings
@@ -145,50 +141,50 @@ NAME
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;machine/endian.h>
 
      u_int32_t
-     htonl(u_int32_t host32)
+     htonl(u_int32_t host32);
 
      u_int16_t
-     htons(u_int16_t host16)
+     htons(u_int16_t host16);
 
      u_int32_t
-     ntohl(u_int32_t net32)
+     ntohl(u_int32_t net32);
 
      u_int16_t
-     ntohs(u_int16_t net16)
+     ntohs(u_int16_t net16);
 
      u_int32_t
-     htobe32(u_int32_t host32)
+     htobe32(u_int32_t host32);
 
      u_int16_t
-     htobe16(u_int16_t host16)
+     htobe16(u_int16_t host16);
 
      u_int32_t
-     betoh32(u_int32_t big32)
+     betoh32(u_int32_t big32);
 
      u_int16_t
-     betoh16(u_int16_t big16)
+     betoh16(u_int16_t big16);
 
      u_int32_t
-     htole32(u_int32_t host32)
+     htole32(u_int32_t host32);
 
      u_int16_t
-     htole16(u_int16_t host16)
+     htole16(u_int16_t host16);
 
      u_int32_t
-     letoh32(u_int32_t little32)
+     letoh32(u_int32_t little32);
 
      u_int16_t
-     letoh16(u_int16_t little16)
+     letoh16(u_int16_t little16);
 
      u_int32_t
-     swap32(u_int32_t val32)
+     swap32(u_int32_t val32);
 
      u_int16_t
-     swap16(u_int16_t val16)
+     swap16(u_int16_t val16);
 
 DESCRIPTION
      These routines convert 16- and 32-bit quantities between different byte
      orderings.  The ``swap'' functions reverse the byte ordering of the given
      quantity, the others converts either from/to the native byte order used
@@ -196,23 +192,24 @@ DESCRIPTION
 
      Apart from the swap functions, the names can be described by this form:
      {src-order}to{dst-order}{size}.  Both {src-order} and {dst-order} can
      take the following forms:
 
-
-
            h    Host order.
            n    Network order (big-endian).
            be   Big-endian (most significant byte first).
            le   Little-endian (least significant byte first).
 
-     One of the specified orderings must be `h'. {size} will take these forms:
+     One of the specified orderings must be `h'.  {size} will take these
+     forms:
 
-           l    Long (32-bit, used in conjunction with forms involving `n').
-           s    Short (16-bit, used in conjunction with forms involving `n').
-           16   16-bit.
-           32   32-bit.
+           l  Long (32-bit, used in conjunction with forms involving `n').
+           s  Short (16-bit, used in conjunction with forms involving `n').
+           16
+              16-bit.
+           32
+              32-bit.
 
      The swap functions are of the form: swap{size}.
 
      Names involving `n' convert quantities between network byte order and
      host byte order.  The last letter (`s' or `l') is a mnemonic for the tra-
@@ -221,60 +218,59 @@ DESCRIPTION
      ditional misunderstanding.  On machines which have a byte order which is
      the same as the network order, routines are defined as null macros.
 
      The functions involving either ``be'', ``le'', or ``swap'' use the num-
      bers 16 and 32 for specifying the bitwidth of the quantities they operate
-     on.  Currently all supported architectures are either big- or little-en-
-     dian so either the ``be'' or ``le'' variants are implemented as null
+     on.  Currently all supported architectures are either big- or little-
+     endian so either the ``be'' or ``le'' variants are implemented as null
      macros.
 
      The routines mentioned above which have either {src-order} or {dst-order}
      set to `n' are most often used in conjunction with Internet addresses and
      ports as returned by gethostbyname(3) and getservent(3).
 
 SEE ALSO
-     gethostbyname(3),  getservent(3)
+     gethostbyname(3), getservent(3)
 
 HISTORY
      The byteorder functions appeared in 4.2BSD.
 
 BUGS
      On the vax, alpha, i386, and so far mips, bytes are handled backwards
      from most everyone else in the world.  This is not expected to be fixed
      in the near future.
 
-BSD Experimental                 June 4, 1993                                2
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="ETHERS">
-    <title>ETHERS</title>
+  <sect1 id="net-common-tcpip-manpages-ethers">
+    <title>ethers</title>
     <screen>
-
-ETHERS(3)                 System Programmer's Manual                 ETHERS(3)
+ETHERS(3)               System Library Functions Manual              ETHERS(3)
 
 NAME
      ether_aton, ether_ntoa, ether_addr, ether_ntohost, ether_hostton,
      ether_line - get ethers entry
 
 SYNOPSIS
      #include &lt;netinet/if_ether.h>
 
      char *
-     ether_ntoa(struct ether_addr *e)
+     ether_ntoa(struct ether_addr *e);
 
      struct ether_addr *
-     ether_aton(char *s)
+     ether_aton(char *s);
 
      int
-     ether_ntohost(char *hostname, struct ether_addr *e)
+     ether_ntohost(char *hostname, struct ether_addr *e);
 
      int
-     ether_hostton(char *hostname, struct ether_addr *e)
+     ether_hostton(char *hostname, struct ether_addr *e);
 
      int
-     ether_line(char *l, struct ether_addr *e, char *hostname)
+     ether_line(char *l, struct ether_addr *e, char *hostname);
 
 DESCRIPTION
      Ethernet addresses are represented by the following structure:
 
            struct ether_addr {
@@ -283,21 +279,21 @@ DESCRIPTION
 
      The ether_ntoa() function converts this structure into an ASCII string of
      the form ``xx:xx:xx:xx:xx:xx'', consisting of 6 hexadecimal numbers sepa-
      rated by colons.  It returns a pointer to a static buffer that is reused
      for each call.  The ether_aton() converts an ASCII string of the same
-     form and to a structure containing the 6 octets of the address.  It re-
-     turns a pointer to a static structure that is reused for each call.
+     form and to a structure containing the 6 octets of the address.  It
+     returns a pointer to a static structure that is reused for each call.
 
      The ether_ntohost() and ether_hostton() functions interrogate the
-     database mapping host names to Ethernet addresses, /etc/ethers. The
+     database mapping host names to Ethernet addresses, /etc/ethers.  The
      ether_ntohost() function looks up the given Ethernet address and writes
      the associated host name into the character buffer passed.  This buffer
      should be MAXHOSTNAMELEN characters in size.  The ether_hostton() func-
-     tion looks up the given host name and writes the associated Ethernet ad-
-     dress into the structure passed.  Both functions return zero if they find
-     the requested host name or address, and -1 if not.
+     tion looks up the given host name and writes the associated Ethernet
+     address into the structure passed.  Both functions return zero if they
+     find the requested host name or address, and -1 if not.
 
      Each call reads /etc/ethers from the beginning; if a `+' appears alone on
      a line in the file, then ether_hostton() will consult the ethers.byname
      YP map, and ether_ntohost() will consult the ethers.byaddr YP map.
 
@@ -313,26 +309,26 @@ FILES
 SEE ALSO
      ethers(5)
 
 HISTORY
      The ether_ntoa(), ether_aton(), ether_ntohost(), ether_hostton(), and
-     ether_line() functions were adopted from SunOS and appeared in
+     ether_line() functions were adopted from SunOS and appeared in NetBSD 0.9
+     b.
 
 BUGS
      The data space used by these functions is static; if future use requires
      the data, it should be copied before any subsequent calls to these func-
      tions overwrite it.
 
-BSD Experimental               December 16, 1993                             2
+BSD                            December 16, 1993                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETADDRINFO">
-    <title>GETADDRINFO</title>
+  <sect1 id="net-common-tcpip-manpages-getaddrinfo">
+    <title>getaddrinfo</title>
     <screen>
-
-GETADDRINFO(3)            System Programmer's Manual            GETADDRINFO(3)
+GETADDRINFO(3)          System Library Functions Manual         GETADDRINFO(3)
 
 NAME
      getaddrinfo, freeaddrinfo, gai_strerror - nodename-to-address translation
      in protocol-independent manner
 
@@ -341,22 +337,23 @@ SYNOPSIS
      #include &lt;sys/socket.h>
      #include &lt;netdb.h>
 
      int
      getaddrinfo(const char *nodename, const char *servname,
-             const struct addrinfo *hints, struct addrinfo **res)
+             const struct addrinfo *hints, struct addrinfo **res);
 
      void
-     freeaddrinfo(struct addrinfo *ai)
+     freeaddrinfo(struct addrinfo *ai);
 
      char *
-     gai_strerror(int ecode)
+     gai_strerror(int ecode);
 
 DESCRIPTION
      The getaddrinfo() function is defined for protocol-independent nodename-
-     to-address translation.  It performs the functionality of gethostby-
-     name(3) and getservbyname(3),  but in a more sophisticated manner.
+     to-address translation.  It performs the functionality of
+     gethostbyname(3) and getservbyname(3), but in a more sophisticated man-
+     ner.
 
      The addrinfo structure is defined as a result of including the &lt;netdb.h>
      header:
 
      struct addrinfo {                                                  *
@@ -369,11 +366,11 @@ DESCRIPTION
           struct sockaddr  *ai_addr; /* binary address */
           struct addrinfo  *ai_next; /* next structure in linked list */
      };
 
      The nodename and servname arguments are pointers to NUL-terminated
-     strings or NULL. One or both of these two arguments must be a non-null
+     strings or NULL.  One or both of these two arguments must be a non-null
      pointer.  In the normal client scenario, both the nodename and servname
      are specified.  In the normal server scenario, only the servname is spec-
      ified.  A non-null nodename string can be either a node name or a numeric
      host address string (i.e., a dotted-decimal IPv4 address or an IPv6 hex
      address).  A non-null servname string can be either a service name or a
@@ -388,23 +385,23 @@ DESCRIPTION
      accept any socket type.  A value of 0 for ai_protocol means the caller
      will accept any protocol.  For example, if the caller handles only TCP
      and not UDP, then the ai_socktype member of the hints structure should be
      set to SOCK_STREAM when getaddrinfo() is called.  If the caller handles
      only IPv4 and not IPv6, then the ai_family member of the hints structure
-     should be set to PF_INET when getaddrinfo() is called.  If the third ar-
-     gument to getaddrinfo() is a null pointer, this is the same as if the
+     should be set to PF_INET when getaddrinfo() is called.  If the third
+     argument to getaddrinfo() is a null pointer, this is the same as if the
      caller had filled in an addrinfo structure initialized to zero with
      ai_family set to PF_UNSPEC.
 
      Upon successful return a pointer to a linked list of one or more addrinfo
      structures is returned through the final argument.  The caller can pro-
-     cess each addrinfo structure in this list by following the ai_next point-
-     er, until a null pointer is encountered.  In each returned addrinfo
+     cess each addrinfo structure in this list by following the ai_next
+     pointer, until a null pointer is encountered.  In each returned addrinfo
      structure the three members ai_family, ai_socktype, and ai_protocol are
      the corresponding arguments for a call to the socket() function.  In each
-     addrinfo structure the ai_addr member points to a filled-in socket ad-
-     dress structure whose length is specified by the ai_addrlen member.
+     addrinfo structure the ai_addr member points to a filled-in socket
+     address structure whose length is specified by the ai_addrlen member.
 
      If the AI_PASSIVE bit is set in the ai_flags member of the hints struc-
      ture, then the caller plans to use the returned socket address structure
      in a call to bind().  In this case, if the nodename argument is a null
      pointer, then the IP address portion of the socket address structure will
@@ -412,14 +409,14 @@ DESCRIPTION
      address.
 
      If the AI_PASSIVE bit is not set in the ai_flags member of the hints
      structure, then the returned socket address structure will be ready for a
      call to connect() (for a connection-oriented protocol) or either
-     connect(), sendto(), or sendmsg() (for a connectionless protocol). In
-     this case, if the nodename argument is a null pointer, then the IP ad-
-     dress portion of the socket address structure will be set to the loopback
-     address.
+     connect(), sendto(), or sendmsg() (for a connectionless protocol).  In
+     this case, if the nodename argument is a null pointer, then the IP
+     address portion of the socket address structure will be set to the loop-
+     back address.
 
      If the AI_CANONNAME bit is set in the ai_flags member of the hints struc-
      ture, then upon successful return the ai_canonname member of the first
      addrinfo structure in the linked list will point to a NUL-terminated
      string containing the canonical name of the specified nodename.
@@ -450,36 +447,35 @@ DESCRIPTION
      o   If you specify a numeric servname, while leaving ai_socktype and
          ai_protocol unspecified, getaddrinfo() will raise an error.  This is
          because the numeric servname does not identify any socket type, and
          getaddrinfo() is not allowed to glob the argument in such case.
 
-     All of the information returned by getaddrinfo() is dynamically allocat-
-     ed: the addrinfo structures, the socket address structures, and canonical
-     node name strings pointed to by the addrinfo structures.  To return this
-     information to the system the function freeaddrinfo() is called.  The
-     addrinfo structure pointed to by the ai argument is freed, along with any
-     dynamic storage pointed to by the structure.  This operation is repeated
-     until a NULL ai_next pointer is encountered.
-
+     All of the information returned by getaddrinfo() is dynamically allo-
+     cated: the addrinfo structures, the socket address structures, and canon-
+     ical node name strings pointed to by the addrinfo structures.  To return
+     this information to the system the function freeaddrinfo() is called.
+     The addrinfo structure pointed to by the ai argument is freed, along with
+     any dynamic storage pointed to by the structure.  This operation is
+     repeated until a NULL ai_next pointer is encountered.
 
      To aid applications in printing error messages based on the EAI_xxx codes
      returned by getaddrinfo(), gai_strerror() is defined.  The argument is
      one of the EAI_xxx values defined earlier and the return value points to
      a string describing the error.  If the argument is not one of the EAI_xxx
      values, the function still returns a pointer to a string whose contents
      indicate an unknown error.
 
    Extension for scoped IPv6 address
      The implementation allows experimental numeric IPv6 address notation with
-     scope identifier.  By appending the percent character and scope identifi-
-     er to addresses, you can fill sin6_scope_id field for addresses.  This
+     scope identifier.  By appending the percent character and scope identi-
+     fier to addresses, you can fill sin6_scope_id field for addresses.  This
      would make management of scoped address easier, and allows cut-and-paste
      input of scoped address.
 
      At this moment the code supports only link-local addresses with the for-
      mat.  Scope identifier is hardcoded to name of hardware interface associ-
-     ated with the link.  (such as ne0). Example would be like
+     ated with the link.  (such as ne0).  Example would be like
      ``fe80::1%ne0'', which means ``fe80::1 on the link associated with ne0
      interface''.
 
      The implementation is still very experimental and non-standard.  The cur-
      rent implementation assumes one-by-one relationship between interface and
@@ -593,17 +589,17 @@ DIAGNOSTICS
      string describing the given error code.  If the argument is not one of
      the EAI_xxx values, the function still returns a pointer to a string
      whose contents indicate an unknown error.
 
 SEE ALSO
-     getnameinfo(3),  gethostbyname(3),  getservbyname(3),  hosts(5),
-     resolv.conf(5),  services(5),  hostname(7),  named(8)
+     getnameinfo(3), gethostbyname(3), getservbyname(3), hosts(5),
+     resolv.conf(5), services(5), hostname(7), named(8)
 
      R. Gilligan, S. Thomson, J. Bound, and W. Stevens, Basic Socket Interface
      Extensions for IPv6, RFC2553, March 1999.
 
-     Tatsuya Jinmei, and Atsushi Onoe, An Extension of Format for IPv6 Scoped
+     Tatsuya Jinmei and Atsushi Onoe, An Extension of Format for IPv6 Scoped
      Addresses, internet draft, draft-ietf-ipngwg-scopedaddr-format-02.txt,
      work in progress material.
 
      Craig Metz, "Protocol Independence Using the Sockets API", Proceedings of
      the freenix track: 2000 USENIX annual technical conference, June 2000.
@@ -620,59 +616,58 @@ STANDARDS
 BUGS
      The current implementation is not thread-safe.
 
      The text was shamelessly copied from RFC2553.
 
-BSD Experimental                 May 25, 1995                                5
+BSD                              May 25, 1995                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETHOSTBYNAME">
-    <title>GETHOSTBYNAME</title>
+  <sect1 id="net-common-tcpip-manpages-gethostbyname">
+    <title>gethostbyname</title>
     <screen>
-
-GETHOSTBYNAME(3)          System Programmer's Manual          GETHOSTBYNAME(3)
+GETHOSTBYNAME(3)        System Library Functions Manual       GETHOSTBYNAME(3)
 
 NAME
      gethostbyname, gethostbyname2, gethostbyaddr, gethostent, sethostent,
      endhostent, hstrerror, herror - get network host entry
 
 SYNOPSIS
      #include &lt;netdb.h>
      extern int h_errno;
 
      struct hostent *
-     gethostbyname(const char *name)
+     gethostbyname(const char *name);
 
      struct hostent *
-     gethostbyname2(const char *name, int af)
+     gethostbyname2(const char *name, int af);
 
      struct hostent *
-     gethostbyaddr(const char *addr, int len, int af)
+     gethostbyaddr(const char *addr, int len, int af);
 
      struct hostent *
-     gethostent(void)
+     gethostent(void);
 
      void
-     sethostent(int stayopen)
+     sethostent(int stayopen);
 
      void
-     endhostent(void)
+     endhostent(void);
 
      void
-     herror(const char *string)
+     herror(const char *string);
 
      const char *
-     hstrerror(int err)
+     hstrerror(int err);
 
 DESCRIPTION
      The gethostbyname() and gethostbyaddr() functions each return a pointer
      to an object with the following structure describing an internet host
      referenced by name or by address, respectively.  This structure contains
      either information obtained from the name server (i.e., resolver(3) and
-     named(8)),  broken-out fields from a line in /etc/hosts, or database en-
-     tries supplied by the yp(8) system.  resolv.conf(5) describes how the
+     named(8)), broken-out fields from a line in /etc/hosts, or database
+     entries supplied by the yp(8) system.  resolv.conf(5) describes how the
      particular database is chosen.
 
      struct  hostent {
              char    *h_name;        /* official name of host */
              char    **h_aliases;    /* alias list */
@@ -691,11 +686,10 @@ DESCRIPTION
      h_addrtype   The type of address being returned.
 
      h_length     The length, in bytes, of the address.
 
      h_addr_list  A zero-terminated array of network addresses for the host.
-
                   Host addresses are returned in network byte order.
 
      h_addr       The first address in h_addr_list; this is for backward com-
                   patibility.
 
@@ -705,11 +699,11 @@ DESCRIPTION
 
      gethostbyname2() is an advanced form of gethostbyname() which allows
      lookups in address families other than AF_INET, for example AF_INET6.
 
      The gethostbyaddr() function will search for the specified address of
-     length len in the address family af. The only address family currently
+     length len in the address family af.  The only address family currently
      supported is AF_INET.
 
      The sethostent() function may be used to request the use of a connected
      TCP socket for queries.  If the stayopen flag is non-zero, this sets the
      option to send all queries to the name server using TCP and to retain the
@@ -736,42 +730,42 @@ DIAGNOSTICS
 
      The variable h_errno can have the following values:
 
      HOST_NOT_FOUND  No such host is known.
 
-     TRY_AGAIN       This is usually a temporary error and means that the lo-
-                     cal server did not receive a response from an authorita-
-                     tive server.  A retry at some later time may succeed.
+     TRY_AGAIN       This is usually a temporary error and means that the
+                     local server did not receive a response from an authori-
+                     tative server.  A retry at some later time may succeed.
 
      NO_RECOVERY     Some unexpected server failure was encountered.  This is
                      a non-recoverable error.
 
-     NO_DATA         The requested name is valid but does not have an IP ad-
-                     dress; this is not a temporary error.  This means that
-                     the name is known to the name server but there is no ad-
-                     dress associated with this name.  Another type of request
-                     to the name server using this domain name will result in
-                     an answer; for example, a mail-forwarder may be regis-
-                     tered for this domain.
+     NO_DATA         The requested name is valid but does not have an IP
+                     address; this is not a temporary error.  This means that
+                     the name is known to the name server but there is no
+                     address associated with this name.  Another type of
+                     request to the name server using this domain name will
+                     result in an answer; for example, a mail-forwarder may be
+                     registered for this domain.
 
 SEE ALSO
-     resolver(3),  getaddrinfo(3),  getnameinfo(3),  hosts(5),
-     resolv.conf(5),  hostname(7),  named(8)
+     resolver(3), getaddrinfo(3), getnameinfo(3), hosts(5), resolv.conf(5),
+     hostname(7), named(8)
 
 CAVEAT
      If the search routines in resolv.conf(5) decide to read the /etc/hosts
      file, gethostent() and other functions will read the next line of the
      file, re-opening the file if necessary.
 
-     The sethostent() function opens and/or rewinds the file /etc/hosts. If
+     The sethostent() function opens and/or rewinds the file /etc/hosts.  If
      the stayopen argument is non-zero, the file will not be closed after each
      call to gethostbyname(), gethostbyname2(), or gethostbyaddr().
 
      The endhostent() function closes the file.
 
 HISTORY
-     The herror() function appeared in 4.3BSD. The endhostent(),
+     The herror() function appeared in 4.3BSD.  The endhostent(),
      gethostbyaddr(), gethostbyname(), gethostent(), and sethostent() func-
      tions appeared in 4.2BSD.
 
 BUGS
      These functions use static data storage; if the data is needed for future
@@ -779,40 +773,39 @@ BUGS
      the Internet address formats are currently understood.
 
      YP does not support any address families other than AF_INET and uses the
      traditional database format.
 
-BSD Experimental                March 13, 1997                               3
+BSD                             March 13, 1997                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETIFADDRS">
-    <title>GETIFADDRS</title>
+  <sect1 id="net-common-tcpip-manpages-getifaddrs">
+    <title>getifaddrs</title>
     <screen>
-
-GETIFADDRS(3)             System Programmer's Manual             GETIFADDRS(3)
+GETIFADDRS(3)           System Library Functions Manual          GETIFADDRS(3)
 
 NAME
      getifaddrs - get interface addresses
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
      #include &lt;ifaddrs.h>
 
      int
-     getifaddrs(struct ifaddrs **ifap)
+     getifaddrs(struct ifaddrs **ifap);
 
      void
-     freeifaddrs(struct ifaddrs *ifap)
+     freeifaddrs(struct ifaddrs *ifap);
 
 DESCRIPTION
      The getifaddrs() function stores a reference to a linked list of the net-
      work interfaces on the local machine in the memory referenced by ifap.
      The list consists of ifaddrs structures, as defined in the include file
-     &lt;ifaddrs.h>. The ifaddrs structure contains at least the following en-
-     tries:
+     &lt;ifaddrs.h>.  The ifaddrs structure contains at least the following
+     entries:
 
          struct ifaddrs   *ifa_next;         /* Pointer to next struct */
          char             *ifa_name;         /* Interface name */
          u_int             ifa_flags;        /* Interface flags */
          struct sockaddr  *ifa_addr;         /* Interface address */
@@ -845,19 +838,19 @@ DESCRIPTION
              This field, which should only be referenced for non-P2P inter-
              faces, references the broadcast address associated with ifa_addr,
              if one exists, otherwise it is NULL.
 
      ifa_dstaddr
-             References the destination address on a P2P interface, if one ex-
-             ists, otherwise it is NULL.
+             References the destination address on a P2P interface, if one
+             exists, otherwise it is NULL.
 
      ifa_data
              References address family specific data.  For AF_LINK addresses
-             it contains a pointer to the struct if_data (as defined in in-
-             clude file &lt;net/if.h>) which contains various interface at-
-             tributes and statistics.  For all other address families, it con-
-             tains a pointer to the struct ifa_data (as defined in include
+             it contains a pointer to the struct if_data (as defined in
+             include file &lt;net/if.h>) which contains various interface
+             attributes and statistics.  For all other address families, it
+             contains a pointer to the struct ifa_data (as defined in include
              file &lt;net/if.h>) which contains per-address interface statistics.
 
      The data returned by getifaddrs() is dynamically allocated and should be
      freed using freeifaddrs() when no longer needed.
 
@@ -865,33 +858,31 @@ RETURN VALUES
      Upon successful completion, a value of 0 is returned.  Otherwise, a value
      of -1 is returned and errno is set to indicate the error.
 
 ERRORS
      The getifaddrs() may fail and set errno for any of the errors specified
-     for the library routines ioctl(2),  socket(2),  malloc(3),  or sysctl(3).
-
+     for the library routines ioctl(2), socket(2), malloc(3), or sysctl(3).
 
 BUGS
      If both &lt;net/if.h> and &lt;ifaddrs.h> are being included, &lt;net/if.h> must be
      included before &lt;ifaddrs.h>.
 
 SEE ALSO
-     ioctl(2),  socket(2),  sysctl(3),  networking(4),  ifconfig(8)
+     ioctl(2), socket(2), sysctl(3), networking(4), ifconfig(8)
 
 HISTORY
      The getifaddrs() function first appeared in BSDI BSD/OS.  The function is
-     supplied on since
+     supplied on OpenBSD since OpenBSD 2.7.
 
-                                January 4, 2002                              2
+BSD                            February 24, 2003                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETNAMEINFO">
-    <title>GETNAMEINFO</title>
+  <sect1 id="net-common-tcpip-manpages-getnameinfo">
+    <title>getnameinfo</title>
     <screen>
-
-GETNAMEINFO(3)            System Programmer's Manual            GETNAMEINFO(3)
+GETNAMEINFO(3)          System Library Functions Manual         GETNAMEINFO(3)
 
 NAME
      getnameinfo - address-to-nodename translation in protocol-independent
      manner
 
@@ -900,17 +891,17 @@ SYNOPSIS
      #include &lt;sys/socket.h>
      #include &lt;netdb.h>
 
      int
      getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host,
-             size_t hostlen, char *serv, size_t servlen, int flags)
+             size_t hostlen, char *serv, size_t servlen, int flags);
 
 DESCRIPTION
      The getnameinfo() function is defined for protocol-independent address-
      to-nodename translation.  Its functionality is a reverse conversion of
-     getaddrinfo(3),  and implements similar functionality with gethostbyad-
-     dr(3) and getservbyport(3) in more sophisticated manner.
+     getaddrinfo(3), and implements similar functionality with
+     gethostbyaddr(3) and getservbyport(3) in more sophisticated manner.
 
      This function looks up an IP address and port number provided by the
      caller in the DNS and system-specific database, and returns text strings
      for both in buffers provided by the caller.  The function indicates suc-
      cessful completion by a zero return value; a non-zero return value indi-
@@ -931,12 +922,12 @@ DESCRIPTION
      enough to hold the nodename and the service name, including the terminat-
      ing null characters.
 
      Unfortunately most systems do not provide constants that specify the max-
      imum size of either a fully-qualified domain name or a service name.
-     Therefore to aid the application in allocating buffers for these two re-
-     turned strings the following constants are defined in &lt;netdb.h>:
+     Therefore to aid the application in allocating buffers for these two
+     returned strings the following constants are defined in &lt;netdb.h>:
 
      #define NI_MAXHOST    MAXHOSTNAMELEN
      #define NI_MAXSERV    32
 
      The first value is actually defined as the constant MAXDNAME in recent
@@ -950,30 +941,30 @@ DESCRIPTION
      only the nodename portion of the FQDN is returned for local hosts.
 
      If the flag bit NI_NUMERICHOST is set, or if the host's name cannot be
      located in the DNS, the numeric form of the host's address is returned
      instead of its name (e.g., by calling inet_ntop() instead of
-     gethostbyaddr()). If the flag bit NI_NAMEREQD is set, an error is re-
-     turned if the host's name cannot be located in the DNS.
+     gethostbyaddr()).  If the flag bit NI_NAMEREQD is set, an error is
+     returned if the host's name cannot be located in the DNS.
 
      If the flag bit NI_NUMERICSERV is set, the numeric form of the service
      address is returned (e.g., its port number) instead of its name.  The two
      NI_NUMERICxxx flags are required to support the -n flag that many com-
      mands provide.
 
      A fifth flag bit, NI_DGRAM, specifies that the service is a datagram ser-
      vice, and causes getservbyport() to be called with a second argument of
-     "udp" instead of its default of "tcp". This is required for the few ports
-     (512-514) that have different services for UDP and TCP.
+     "udp" instead of its default of "tcp".  This is required for the few
+     ports (512-514) that have different services for UDP and TCP.
 
      These NI_xxx flags are defined in &lt;netdb.h>.
 
    Extension for scoped IPv6 address
      The implementation allows experimental numeric IPv6 address notation with
      scope identifier.  IPv6 link-local address will appear as string like
-     ``fe80::1%ne0'', if NI_WITHSCOPEID bit is enabled in flags argument.  Re-
-     fer to getaddrinfo(3) for the notation.
+     ``fe80::1%ne0'', if NI_WITHSCOPEID bit is enabled in flags argument.
+     Refer to getaddrinfo(3) for the notation.
 
 EXAMPLES
      The following code tries to get numeric hostname, and service name, for
      given socket address.  Observe that there is no hardcoded reference to
      particular address family.
@@ -1003,38 +994,37 @@ EXAMPLES
 
 DIAGNOSTICS
      The function indicates successful completion by a zero return value; a
      non-zero return value indicates failure.  Error codes are as below:
 
-     EAI_AGAIN     The name could not be resolved at this time.  Future at-
-                   tempts may succeed.
+     EAI_AGAIN          The name could not be resolved at this time.  Future
+                        attempts may succeed.
 
-     EAI_BADFLAGS  The flags had an invalid value.
+     EAI_BADFLAGS       The flags had an invalid value.
 
-     EAI_FAIL      A non-recoverable error occurred.
+     EAI_FAIL           A non-recoverable error occurred.
 
-     EAI_FAMILY    The address family was not recognized or the address length
-                   was invalid for the specified family.
+     EAI_FAMILY         The address family was not recognized or the address
+                        length was invalid for the specified family.
 
-     EAI_MEMORY    There was a memory allocation failure.
+     EAI_MEMORY         There was a memory allocation failure.
 
-     EAI_NONAME    The name does not resolve for the supplied parameters.
-                   NI_NAMEREQD is set and the host's name cannot be located,
+     EAI_NONAME         The name does not resolve for the supplied parameters.
+                        NI_NAMEREQD is set and the host's name cannot be
+                        located, or both nodename and servname were null.
 
-                   or both nodename and servname were null.
-
-     EAI_SYSTEM    A system error occurred.  The error code can be found in
-                   errno.
+     EAI_SYSTEM         A system error occurred.  The error code can be found
+                        in errno.
 
 SEE ALSO
-     getaddrinfo(3),  gethostbyaddr(3),  getservbyport(3),  hosts(5),
-     resolv.conf(5),  services(5),  hostname(7),  named(8)
+     getaddrinfo(3), gethostbyaddr(3), getservbyport(3), hosts(5),
+     resolv.conf(5), services(5), hostname(7), named(8)
 
      R. Gilligan, S. Thomson, J. Bound, and W. Stevens, Basic Socket Interface
      Extensions for IPv6, RFC2553, March 1999.
 
-     Tatsuya Jinmei, and Atsushi Onoe, An Extension of Format for IPv6 Scoped
+     Tatsuya Jinmei and Atsushi Onoe, An Extension of Format for IPv6 Scoped
      Addresses, internet draft, draft-ietf-ipngwg-scopedaddr-format-02.txt,
      work in progress material.
 
      Craig Metz, "Protocol Independence Using the Sockets API", Proceedings of
      the freenix track: 2000 USENIX annual technical conference, June 2000.
@@ -1051,44 +1041,43 @@ STANDARDS
 BUGS
      The current implementation is not thread-safe.
 
      The text was shamelessly copied from RFC2553.
 
-     intentionally uses different NI_MAXHOST value from what RFC2553 suggests,
-     to avoid buffer length handling mistakes.
+     OpenBSD intentionally uses different NI_MAXHOST value from what RFC2553
+     suggests, to avoid buffer length handling mistakes.
 
-BSD Experimental                 May 25, 1995                                3
+BSD                              May 25, 1995                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETNETENT">
-    <title>GETNETENT</title>
+  <sect1 id="net-common-tcpip-manpages-getnetent">
+    <title>getnetent</title>
     <screen>
-
-GETNETENT(3)              System Programmer's Manual              GETNETENT(3)
+GETNETENT(3)            System Library Functions Manual           GETNETENT(3)
 
 NAME
      getnetent, getnetbyaddr, getnetbyname, setnetent, endnetent - get network
      entry
 
 SYNOPSIS
      #include &lt;netdb.h>
 
      struct netent *
-     getnetent(void)
+     getnetent(void);
 
      struct netent *
-     getnetbyname(char *name)
+     getnetbyname(char *name);
 
      struct netent *
-     getnetbyaddr(in_addr_t net, int type)
+     getnetbyaddr(in_addr_t net, int type);
 
      void
-     setnetent(int stayopen)
+     setnetent(int stayopen);
 
      void
-     endnetent(void)
+     endnetent(void);
 
 DESCRIPTION
      The getnetent(), getnetbyname(), and getnetbyaddr() functions each return
      a pointer to an object with the following structure containing the bro-
      ken-out fields of a line in the network database, /etc/networks.
@@ -1126,18 +1115,17 @@ DESCRIPTION
      no name server is configured, they sequentially search from the beginning
      of the file until a matching net name or net address and type is found,
      or until EOF is encountered.  Network numbers are supplied in host order.
 
 FILES
-
      /etc/networks
 
 DIAGNOSTICS
      Null pointer (0) returned on EOF or error.
 
 SEE ALSO
-     resolver(3),  networks(5)
+     resolver(3), networks(5)
 
 HISTORY
      The getnetent(), getnetbyaddr(), getnetbyname(), setnetent(), and
      endnetent() functions appeared in 4.2BSD.
 
@@ -1146,41 +1134,40 @@ BUGS
      the data, it should be copied before any subsequent calls to these func-
      tions overwrite it.  Only Internet network numbers are currently under-
      stood.  Expecting network numbers to fit in no more than 32 bits is
      naive.
 
-BSD Experimental                March 13, 1997                               2
+BSD                             March 13, 1997                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETPROTOENT">
-    <title>GETPROTOENT</title>
+  <sect1 id="net-common-tcpip-manpages-getprotoent">
+    <title>getprotoent</title>
     <screen>
-
-GETPROTOENT(3)            System Programmer's Manual            GETPROTOENT(3)
+GETPROTOENT(3)          System Library Functions Manual         GETPROTOENT(3)
 
 NAME
      getprotoent, getprotobynumber, getprotobyname, setprotoent, endprotoent -
      get protocol entry
 
 SYNOPSIS
      #include &lt;netdb.h>
 
      struct protoent *
-     getprotoent(void)
+     getprotoent(void);
 
      struct protoent *
-     getprotobyname(char *name)
+     getprotobyname(char *name);
 
      struct protoent *
-     getprotobynumber(int proto)
+     getprotobynumber(int proto);
 
      void
-     setprotoent(int stayopen)
+     setprotoent(int stayopen);
 
      void
-     endprotoent(void)
+     endprotoent(void);
 
 DESCRIPTION
      The getprotoent(), getprotobyname(), and getprotobynumber() functions
      each return a pointer to an object with the following structure contain-
      ing the broken-out fields of a line in the network protocol database,
@@ -1216,12 +1203,10 @@ DESCRIPTION
 
 RETURN VALUES
      Null pointer (0) returned on EOF or error.
 
 FILES
-
-
      /etc/protocols
 
 SEE ALSO
      protocols(5)
 
@@ -1232,36 +1217,35 @@ HISTORY
 BUGS
      These functions use a static data space; if the data is needed for future
      use, it should be copied before any subsequent calls overwrite it.  Only
      the Internet protocols are currently understood.
 
-BSD Experimental                 June 4, 1993                                2
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETRRSETBYNAME">
-    <title>GETRRSETBYNAME</title>
+  <sect1 id="net-common-tcpip-manpages-getrrsetbyname">
+    <title>getrrsetbyname</title>
     <screen>
-
-GETRRSETBYNAME(3)         System Programmer's Manual         GETRRSETBYNAME(3)
+GETRRSETBYNAME(3)       System Library Functions Manual      GETRRSETBYNAME(3)
 
 NAME
      getrrsetbyname - retrieve DNS records
 
 SYNOPSIS
      #include &lt;netdb.h>
 
      int
      getrrsetbyname(const char *hostname, unsigned int rdclass,
-             unsigned int rdtype, unsigned int flags, struct rrsetinfo **res)
+             unsigned int rdtype, unsigned int flags, struct rrsetinfo **res);
 
      int
-     freerrset(struct rrsetinfo **rrset)
+     freerrset(struct rrsetinfo **rrset);
 
 DESCRIPTION
      getrrsetbyname() gets a set of resource records associated with a
-     hostname, class and type. hostname is a pointer a to null-terminated
+     hostname, class and type.  hostname is a pointer a to null-terminated
      string.  The flags field is currently unused and must be zero.
 
      After a successful call to getrrsetbyname(), *res is a pointer to an
      rrsetinfo structure, containing a list of one or more rdatainfo struc-
      tures containing resource records and potentially another list of
@@ -1297,81 +1281,79 @@ DESCRIPTION
      name strings pointed to by the rrsetinfostructure. Memory allocated for
      the dynamically allocated structures created by a successful call to
      getrrsetbyname() is released by freerrset().  rrset is a pointer to a
      struct rrset created by a call to getrrsetbyname().
 
-     If the EDNS0 option is activated in resolv.conf(3),  getrrsetbyname()
-     will request DNSSEC authentication using the EDNS0 DNSSEC OK (DO) bit.
+     If the EDNS0 option is activated in resolv.conf(3), getrrsetbyname() will
+     request DNSSEC authentication using the EDNS0 DNSSEC OK (DO) bit.
 
 RETURN VALUES
      getrrsetbyname() returns zero on success, and one of the following error
      codes if an error occurred:
 
-
      ERRSET_NONAME    the name does not exist
      ERRSET_NODATA    the name exists, but does not have data of the desired
                       type
      ERRSET_NOMEMORY  memory could not be allocated
      ERRSET_INVAL     a parameter is invalid
      ERRSET_FAIL      other failure
 
 SEE ALSO
-     resolver(3),  resolv.conf(5),  named(8)
+     resolver(3), resolv.conf(5), named(8)
 
 AUTHORS
      Jakob Schlyter &lt;jakob at openbsd dot org>
 
 HISTORY
-     getrrsetbyname() first appeared in The API first appeared in ISC BIND
-     version 9.
+     getrrsetbyname() first appeared in OpenBSD 3.0.  The API first appeared
+     in ISC BIND version 9.
 
 BUGS
      The data in *rdi_data should be returned in uncompressed wire format.
      Currently, the data is in compressed format and the caller can't uncom-
      press since it doesn't have the full message.
 
 CAVEATS
-     The RRSET_VALIDATED flag in rri_flags is set if the AD (autenticated da-
-     ta) bit in the DNS answer is set. This flag should not be trusted unless
-     the transport between the nameserver and the resolver is secure (e.g.
-     IPsec, trusted network, loopback communication).
+     The RRSET_VALIDATED flag in rri_flags is set if the AD (autenticated
+     data) bit in the DNS answer is set. This flag should not be trusted
+     unless the transport between the nameserver and the resolver is secure
+     (e.g. IPsec, trusted network, loopback communication).
 
-BSD Experimental                 Oct 18, 2000                                2
+BSD                              Oct 18, 2000                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETSERVENT">
-    <title>GETSERVENT</title>
+  <sect1 id="net-common-tcpip-manpages-getservent">
+    <title>getservent</title>
     <screen>
-
-GETSERVENT(3)             System Programmer's Manual             GETSERVENT(3)
+GETSERVENT(3)           System Library Functions Manual          GETSERVENT(3)
 
 NAME
      getservent, getservbyport, getservbyname, setservent, endservent - get
      service entry
 
 SYNOPSIS
      #include &lt;netdb.h>
 
      struct servent *
-     getservent(void)
+     getservent(void);
 
      struct servent *
-     getservbyname(char *name, char *proto)
+     getservbyname(char *name, char *proto);
 
      struct servent *
-     getservbyport(int port, char *proto)
+     getservbyport(int port, char *proto);
 
      void
-     setservent(int stayopen)
+     setservent(int stayopen);
 
      void
-     endservent(void)
+     endservent(void);
 
 DESCRIPTION
-     The getservent(), getservbyname(), and getservbyport() functions each re-
-     turn a pointer to an object with the following structure containing the
+     The getservent(), getservbyname(), and getservbyport() functions each
+     return a pointer to an object with the following structure containing the
      broken-out fields of a line in the network services database,
      /etc/services.
 
            struct  servent {
                    char    *s_name;        /* official name of service */
@@ -1400,92 +1382,90 @@ DESCRIPTION
 
      The endservent() function closes the file.
 
      The getservbyname() and getservbyport() functions sequentially search
      from the beginning of the file until a matching protocol name or port
-     number (specified in network byte order) is found, or until EOF is en-
-     countered.  If a protocol name is also supplied (non-null), searches must
-     also match the protocol.
+     number (specified in network byte order) is found, or until EOF is
+     encountered.  If a protocol name is also supplied (non-null), searches
+     must also match the protocol.
 
 FILES
-
      /etc/services
 
 DIAGNOSTICS
      Null pointer (0) returned on EOF or error.
 
 SEE ALSO
-     getprotoent(3),  services(5)
+     getprotoent(3), services(5)
 
 HISTORY
      The getservent(), getservbyport(), getservbyname(), setservent(), and
      endservent() functions appeared in 4.2BSD.
 
 BUGS
      These functions use static data storage; if the data is needed for future
-     use, it should be copied before any subsequent calls overwrite it.  Ex-
-     pecting port numbers to fit in a 32-bit quantity is probably naive.
+     use, it should be copied before any subsequent calls overwrite it.
+     Expecting port numbers to fit in a 32-bit quantity is probably naive.
 
-BSD Experimental               January 12, 1994                              2
+BSD                            January 12, 1994                            BSD
     </screen>
   </sect1>
 
-  <sect1 id="IF-NAMETOINDEX">
-    <title>IF_NAMETOINDEX</title>
+  <sect1 id="net-common-tcpip-manpages-if-nametoindex">
+    <title>if_nametoindex</title>
     <screen>
-
-IF_NAMETOINDEX(3)         System Programmer's Manual         IF_NAMETOINDEX(3)
+IF_NAMETOINDEX(3)       System Library Functions Manual      IF_NAMETOINDEX(3)
 
 NAME
      if_nametoindex, if_indextoname, if_nameindex, if_freenameindex - convert
      interface index to name, and vice versa
 
 SYNOPSIS
      #include &lt;net/if.h>
 
      unsigned int
-     if_nametoindex(const char *ifname)
+     if_nametoindex(const char *ifname);
 
      char *
-     if_indextoname(unsigned int ifindex, char *ifname)
+     if_indextoname(unsigned int ifindex, char *ifname);
 
      struct if_nameindex *
-     if_nameindex(void)
+     if_nameindex(void);
 
      void
-     if_freenameindex(struct if_nameindex *ptr)
+     if_freenameindex(struct if_nameindex *ptr);
 
 DESCRIPTION
      These functions map interface indexes to interface names (such as
      ``lo0''), and vice versa.
 
      The if_nametoindex() function converts an interface name specified by the
      ifname argument to an interface index (positive integer value).  If the
      specified interface does not exist, 0 will be returned.
 
-     if_indextoname() converts an interface index specified by the ifindex ar-
-     gument to an interface name.  The ifname argument must point to a buffer
-     of at least IF_NAMESIZE bytes into which the interface name corresponding
-     to the specified index is returned.  (IF_NAMESIZE is also defined in
-     &lt;net/if.h> and its value includes a terminating null byte at the end of
-     the interface name.)  This pointer is also the return value of the func-
-     tion.  If there is no interface corresponding to the specified index,
-     NULL is returned.
+     if_indextoname() converts an interface index specified by the ifindex
+     argument to an interface name.  The ifname argument must point to a
+     buffer of at least IF_NAMESIZE bytes into which the interface name corre-
+     sponding to the specified index is returned.  (IF_NAMESIZE is also
+     defined in &lt;net/if.h> and its value includes a terminating null byte at
+     the end of the interface name.)  This pointer is also the return value of
+     the function.  If there is no interface corresponding to the specified
+     index, NULL is returned.
 
      if_nameindex() returns an array of if_nameindex structures.
      if_nametoindex is also defined in &lt;net/if.h>, and is as follows:
 
      struct if_nameindex {
          unsigned int   if_index;  /* 1, 2, ... */
          char          *if_name;   /* null terminated name: "le0", ... */
      };
 
      The end of the array of structures is indicated by a structure with an
-     if_index of 0 and an if_name of NULL. The function returns a null pointer
-     on error.  The memory used for this array of structures along with the
-     interface names pointed to by the if_name members is obtained dynamical-
-     ly.  This memory is freed by the if_freenameindex() function.
+     if_index of 0 and an if_name of NULL.  The function returns a null
+     pointer on error.  The memory used for this array of structures along
+     with the interface names pointed to by the if_name members is obtained
+     dynamically.  This memory is freed by the if_freenameindex() function.
 
      if_freenameindex() takes a pointer that was returned by if_nameindex() as
      argument (ptr), and it reclaims the region allocated.
 
 DIAGNOSTICS
@@ -1498,19 +1478,18 @@ SEE ALSO
 
 STANDARDS
      These functions are defined in ``Basic Socket Interface Extensions for
      IPv6'' (RFC2533).
 
-BSD Experimental                 May 21, 1998                                2
+BSD                              May 21, 1998                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="INET">
-    <title>INET</title>
+  <sect1 id="net-common-tcpip-manpages-inet">
+    <title>inet</title>
     <screen>
-
-INET(3)                   System Programmer's Manual                   INET(3)
+INET(3)                 System Library Functions Manual                INET(3)
 
 NAME
      inet_addr, inet_aton, inet_lnaof, inet_makeaddr, inet_netof,
      inet_network, inet_ntoa, inet_ntop, inet_pton - Internet address manipu-
      lation routines
@@ -1519,64 +1498,64 @@ SYNOPSIS
      #include &lt;sys/socket.h>
      #include &lt;netinet/in.h>
      #include &lt;arpa/inet.h>
 
      in_addr_t
-     inet_addr(const char *cp)
+     inet_addr(const char *cp);
 
      int
-     inet_aton(const char *cp, struct in_addr *addr)
+     inet_aton(const char *cp, struct in_addr *addr);
 
      in_addr_t
-     inet_lnaof(struct in_addr in)
+     inet_lnaof(struct in_addr in);
 
      struct in_addr
-     inet_makeaddr(unsigned long net, unsigned long lna)
+     inet_makeaddr(unsigned long net, unsigned long lna);
 
      in_addr_t
-     inet_netof(struct in_addr in)
+     inet_netof(struct in_addr in);
 
      in_addr_t
-     inet_network(const char *cp)
+     inet_network(const char *cp);
 
      char *
-     inet_ntoa(struct in_addr in)
+     inet_ntoa(struct in_addr in);
 
      const char *
-     inet_ntop(int af, const void *src, char *dst, size_t size)
+     inet_ntop(int af, const void *src, char *dst, size_t size);
 
      int
-     inet_pton(int af, const char *src, void *dst)
+     inet_pton(int af, const char *src, void *dst);
 
 DESCRIPTION
      The routines inet_aton(), inet_addr() and inet_network() interpret char-
      acter strings representing numbers expressed in the Internet standard `.'
-     notation.  The inet_pton() function converts a presentation format ad-
-     dress (that is, printable form as held in a character string) to network
-     format (usually a struct in_addr or some other internal binary represen-
-     tation, in network byte order).  It returns 1 if the address was valid
-     for the specified address family, or 0 if the address wasn't parseable in
-     the specified address family, or -1 if some system error occurred (in
-     which case errno will have been set).  This function is presently valid
-     for AF_INET and AF_INET6. The inet_aton() routine interprets the speci-
-     fied character string as an Internet address, placing the address into
-     the structure provided.  It returns 1 if the string was successfully in-
-     terpreted, or 0 if the string was invalid.  The inet_addr() and
-     inet_network() functions return numbers suitable for use as Internet ad-
-     dresses and Internet network numbers, respectively.
+     notation.  The inet_pton() function converts a presentation format
+     address (that is, printable form as held in a character string) to net-
+     work format (usually a struct in_addr or some other internal binary rep-
+     resentation, in network byte order).  It returns 1 if the address was
+     valid for the specified address family, or 0 if the address wasn't
+     parseable in the specified address family, or -1 if some system error
+     occurred (in which case errno will have been set).  This function is
+     presently valid for AF_INET and AF_INET6.  The inet_aton() routine inter-
+     prets the specified character string as an Internet address, placing the
+     address into the structure provided.  It returns 1 if the string was suc-
+     cessfully interpreted, or 0 if the string was invalid.  The inet_addr()
+     and inet_network() functions return numbers suitable for use as Internet
+     addresses and Internet network numbers, respectively.
 
      The function inet_ntop() converts an address from network format (usually
      a struct in_addr or some other binary form, in network byte order) to
      presentation format (suitable for external display purposes).  It returns
      NULL if a system error occurs (in which case, errno will have been set),
      or it returns a pointer to the destination string.  The routine
      inet_ntoa() takes an Internet address and returns an ASCII string repre-
      senting the address in `.' notation.  The routine inet_makeaddr() takes
      an Internet network number and a local network address and constructs an
      Internet address from it.  The routines inet_netof() and inet_lnaof()
-     break apart Internet host addresses, returning the network number and lo-
-     cal network address part, respectively.
+     break apart Internet host addresses, returning the network number and
+     local network address part, respectively.
 
      All Internet addresses are returned in network order (bytes ordered from
      left to right).  All network numbers and local address parts are returned
      as machine format integer values.
 
@@ -1591,33 +1570,34 @@ INTERNET ADDRESSES (IP VERSION 4)
      When four parts are specified, each is interpreted as a byte of data and
      assigned, from left to right, to the four bytes of an Internet address.
      Note that when an Internet address is viewed as a 32-bit integer quantity
      on a system that uses little-endian byte order (such as the Intel 386,
      486 and Pentium processors) the bytes referred to above appear as
-     ``d.c.b.a''. That is, little-endian bytes are ordered from right to left.
+     ``d.c.b.a''.  That is, little-endian bytes are ordered from right to
+     left.
 
      When a three part address is specified, the last part is interpreted as a
-     16-bit quantity and placed in the rightmost two bytes of the network ad-
-     dress.  This makes the three part address format convenient for specify-
-     ing Class B network addresses as ``128.net.host''.
+     16-bit quantity and placed in the rightmost two bytes of the network
+     address.  This makes the three part address format convenient for speci-
+     fying Class B network addresses as ``128.net.host''.
 
      When a two part address is supplied, the last part is interpreted as a
      24-bit quantity and placed in the rightmost three bytes of the network
      address.  This makes the two part address format convenient for specify-
      ing Class A network addresses as ``net.host''.
 
      When only one part is given, the value is stored directly in the network
      address without any byte rearrangement.
 
-     All numbers supplied as ``parts'' in a `.' notation may be decimal, oc-
-     tal, or hexadecimal, as specified in the C language (i.e., a leading 0x
+     All numbers supplied as ``parts'' in a `.' notation may be decimal,
+     octal, or hexadecimal, as specified in the C language (i.e., a leading 0x
      or 0X implies hexadecimal; otherwise, a leading 0 implies octal; other-
      wise, the number is interpreted as decimal).
 
 INTERNET ADDRESSES (IP VERSION 6)
-     In order to support scoped IPv6 addresses, getaddrinfo(3) and getnamein-
-     fo(3) are recommended rather than the functions presented here.
+     In order to support scoped IPv6 addresses, getaddrinfo(3) and
+     getnameinfo(3) are recommended rather than the functions presented here.
 
      The presentation format of an IPv6 address is given in [RFC1884 2.2]:
 
      There are three conventional forms for representing IPv6 addresses as
      text strings:
@@ -1635,16 +1615,15 @@ INTERNET ADDRESSES (IP VERSION 6)
 
      2.   Due to the method of allocating certain styles of IPv6 addresses, it
           will be common for addresses to contain long strings of zero bits.
           In order to make writing addresses
 
-
           containing zero bits easier a special syntax is available to com-
           press the zeros.  The use of ``::'' indicates multiple groups of 16
           bits of zeros.  The ``::'' can only appear once in an address.  The
-          ``::'' can also be used to compress the leading and/or trailing ze-
-          ros in an address.
+          ``::'' can also be used to compress the leading and/or trailing
+          zeros in an address.
 
           For example the following addresses:
 
                 1080:0:0:0:8:800:200C:417A  a unicast address
                 FF01:0:0:0:0:0:0:43         a multicast address
@@ -1676,89 +1655,90 @@ INTERNET ADDRESSES (IP VERSION 6)
 DIAGNOSTICS
      The constant INADDR_NONE is returned by inet_addr() and inet_network()
      for malformed requests.
 
 SEE ALSO
-     byteorder(3),  gethostbyname(3),  getnetent(3),  inet_net(3),  hosts(5),
+     byteorder(3), gethostbyname(3), getnetent(3), inet_net(3), hosts(5),
      networks(5)
 
 STANDARDS
      The inet_ntop and inet_pton functions conforms to the IETF IPv6 BSD API
-     and address formatting specifications.  Note that inet_pton does not ac-
-     cept 1-, 2-, or 3-part dotted addresses; all four parts must be speci-
+     and address formatting specifications.  Note that inet_pton does not
+     accept 1-, 2-, or 3-part dotted addresses; all four parts must be speci-
      fied.  This is a narrower input set than that accepted by inet_aton.
 
 HISTORY
      The inet_addr, inet_network, inet_makeaddr, inet_lnaof and inet_netof
-     functions appeared in 4.2BSD. The inet_aton and inet_ntoa functions ap-
-     peared in 4.3BSD. The inet_pton and inet_ntop functions appeared in BIND
-     4.9.4.
+     functions appeared in 4.2BSD.  The inet_aton and inet_ntoa functions
+     appeared in 4.3BSD.  The inet_pton and inet_ntop functions appeared in
+     BIND 4.9.4.
 
 BUGS
      The value INADDR_NONE (0xffffffff) is a valid broadcast address, but
      inet_addr() cannot return that value without indicating failure.  Also,
-     inet_addr() should have been designed to return a struct in_addr. The
+     inet_addr() should have been designed to return a struct in_addr.  The
      newer inet_aton() function does not share these problems, and almost all
      existing code should be modified to use inet_aton() instead.
 
      The problem of host byte ordering versus network byte ordering is confus-
      ing.
 
-
      The string returned by inet_ntoa() resides in a static memory area.
+
+BSD                              June 18, 1997                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="INET6-OPTION-SPACE">
-    <title>INET6_OPTION_SPACE</title>
+  <sect1 id="net-common-tcpip-manpages-inet6-option-space">
+    <title>inet6_option_space</title>
     <screen>
-
-INET6_OPTION_SPACE(3)     System Programmer's Manual     INET6_OPTION_SPACE(3)
+INET6_OPTION_SPACE(3)   System Library Functions Manual  INET6_OPTION_SPACE(3)
 
 NAME
      inet6_option_space, inet6_option_init, inet6_option_append,
      inet6_option_alloc, inet6_option_next, inet6_option_find - IPv6 Hop-by-
      Hop and Destination Options manipulation
 
 SYNOPSIS
      #include &lt;netinet/in.h>
 
      int
-     inet6_option_space(int nbytes)
+     inet6_option_space(int nbytes);
 
      int
-     inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type)
+     inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type);
 
      int
      inet6_option_append(struct cmsghdr *cmsg, const u_int8_t *typep,
-             int multx, int plusy)
+             int multx, int plusy);
 
      u_int8_t *
      inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx,
-             int plusy);
+             int plusy);;
 
      int
-     inet6_option_next(const struct cmsghdr *cmsg, u_int8_t **tptrp)
+     inet6_option_next(const struct cmsghdr *cmsg, u_int8_t **tptrp);
 
      int
-     inet6_option_find(const struct cmsghdr *cmsg, u_int8_t **tptrp, int type)
+     inet6_option_find(const struct cmsghdr *cmsg, u_int8_t **tptrp,
+             int type);
 
 DESCRIPTION
-     Building and parsing the Hop-by-Hop and Destination options is complicat-
-     ed due to alignment constranints, padding and ancillary data manipula-
+     Building and parsing the Hop-by-Hop and Destination options is compli-
+     cated due to alignment constranints, padding and ancillary data manipula-
      tion.  RFC2292 defines a set of functions to help the application.  The
      function prototypes for these functions are all in the &lt;netinet/in.h>
      header.
 
    inet6_option_space
-     inet6_option_space() returns the number of bytes required to hold an op-
-     tion when it is stored as ancillary data, including the cmsghdr structure
-     at the beginning, and any padding at the end (to make its size a multiple
-     of 8 bytes). The argument is the size of the structure defining the op-
-     tion, which must include any pad bytes at the beginning (the value y in
-     the alignment term ``xn + y''), the type byte, the length byte, and the
-     option data.
+     inet6_option_space() returns the number of bytes required to hold an
+     option when it is stored as ancillary data, including the cmsghdr struc-
+     ture at the beginning, and any padding at the end (to make its size a
+     multiple of 8 bytes).  The argument is the size of the structure defining
+     the option, which must include any pad bytes at the beginning (the value
+     y in the alignment term ``xn + y''), the type byte, the length byte, and
+     the option data.
 
      Note: If multiple options are stored in a single ancillary data object,
      which is the recommended technique, this function overestimates the
      amount of space required by the size of N-1 cmsghdr structures, where N
      is the number of options to be stored in the object.  This is of little
@@ -1769,21 +1749,20 @@ DESCRIPTION
    inet6_option_init
      inet6_option_init() is called once per ancillary data object that will
      contain either Hop-by-Hop or Destination options.  It returns 0 on suc-
      cess or -1 on an error.
 
-     bp is a pointer to previously allocated space that will contain the an-
-     cillary data object.  It must be large enough to contain all the individ-
-     ual options to be added by later calls to inet6_option_append() and
+     bp is a pointer to previously allocated space that will contain the
+     ancillary data object.  It must be large enough to contain all the indi-
+     vidual options to be added by later calls to inet6_option_append() and
      inet6_option_alloc().
 
-
      cmsgp is a pointer to a pointer to a cmsghdr structure.  *cmsgp is ini-
      tialized by this function to point to the cmsghdr structure constructed
      by this function in the buffer pointed to by bp.
 
-     type is either IPV6_HOPOPTS or IPV6_DSTOPTS. This type is stored in the
+     type is either IPV6_HOPOPTS or IPV6_DSTOPTS.  This type is stored in the
      cmsg_type member of the cmsghdr structure pointed to by *cmsgp.
 
    inet6_option_append
      This function appends a Hop-by-Hop option or a Destination option into an
      ancillary data object that has been initialized by inet6_option_init().
@@ -1802,81 +1781,81 @@ DESCRIPTION
      reserved for the Pad1 and PadN options, respectively.)
 
      The option data length must have a value between 0 and 255, inclusive,
      and is the length of the option data that follows.
 
-     multx is the value x in the alignment term ``xn + y''. It must have a
+     multx is the value x in the alignment term ``xn + y''.  It must have a
      value of 1, 2, 4, or 8.
 
-     plusy is the value y in the alignment term ``xn + y''. It must have a
+     plusy is the value y in the alignment term ``xn + y''.  It must have a
      value between 0 and 7, inclusive.
 
    inet6_option_alloc
      This function appends a Hop-by-Hop option or a Destination option into an
      ancillary data object that has been initialized by inet6_option_init().
      This function returns a pointer to the 8-bit option type field that
      starts the option on success, or NULL on an error.
 
      The difference between this function and inet6_option_append() is that
-     the latter copies the contents of a previously built option into the an-
-     cillary data object while the current function returns a pointer to the
+     the latter copies the contents of a previously built option into the
+     ancillary data object while the current function returns a pointer to the
      space in the data object where the option's TLV must then be built by the
      caller.
 
      cmsg is a pointer to the cmsghdr structure that must have been initial-
      ized by inet6_option_init().
 
      datalen is the value of the option data length byte for this option.
      This value is required as an argument to allow the function to determine
-     if padding must be appended at the end of the option.  argument  since
-     the option data length must already be stored by the caller. (The
-     inet6_option_append() function does not need  a  data  length)
+     if padding must be appended at the end of the option.  (The
+     inet6_option_append() function does not need a data length argument since
+     the option data length must already be stored by the caller.)
 
-     multx is the value x in the alignment term ``xn + y''. It must have a
+     multx is the value x in the alignment term ``xn + y''.  It must have a
      value of 1, 2, 4, or 8.
 
-     plusy is the value y in the alignment term ``xn + y''. It must have a
+     plusy is the value y in the alignment term ``xn + y''.  It must have a
      value between 0 and 7, inclusive.
 
    inet6_option_next
      This function processes the next Hop-by-Hop option or Destination option
      in an ancillary data object.  If another option remains to be processed,
-     the return value of the function is 0 and *tptrp points to the 8-bit op-
-     tion type field the option data (which  is  followed  by the 8-bit option
-     data length, followed by). If no more options remain to be processed, the
-     return value is -1 and *tptrp is NULL. If an error occurs, the return
-     value is -1 and *tptrp is not NULL.
+     the return value of the function is 0 and *tptrp points to the 8-bit
+     option type field (which is followed by the 8-bit option data length,
+     followed by the option data).  If no more options remain to be processed,
+     the return value is -1 and *tptrp is NULL.  If an error occurs, the
+     return value is -1 and *tptrp is not NULL.
 
      cmsg is a pointer to cmsghdr structure of which cmsg_level equals
      IPPROTO_IPV6 and cmsg_type equals either IPV6_HOPOPTS or IPV6_DSTOPTS.
 
      tptrp is a pointer to a pointer to an 8-bit byte and *tptrp is used by
      the function to remember its place in the ancillary data object each time
      the function is called.  The first time this function is called for a
      given ancillary data object, *tptrp must be set to NULL.
 
-     Each time this function returns success, *tptrp points to the 8-bit op-
-     tion type field for the next option to be processed.
+     Each time this function returns success, *tptrp points to the 8-bit
+     option type field for the next option to be processed.
 
    inet6_option_find
      This function is similar to the previously described inet6_option_next()
      function, except this function lets the caller specify the option type to
-     be searched for, instead of always returning the next option in the an-
-     cillary data object.  cmsg is a pointer to cmsghdr structure of which
+     be searched for, instead of always returning the next option in the
+     ancillary data object.  cmsg is a pointer to cmsghdr structure of which
      cmsg_level equals IPPROTO_IPV6 and cmsg_type equals either IPV6_HOPOPTS
      or IPV6_DSTOPTS.
 
      tptrp is a pointer to a pointer to an 8-bit byte and *tptrp is used by
      the function to remember its place in the ancillary data object each time
      the function is called.  The first time this function is called for a
-     given ancillary data object, *tptrp must be set to NULL. ~ This function
+     given ancillary data object, *tptrp must be set to NULL.  ~ This function
      starts searching for an option of the specified type beginning after the
-     value of *tptrp. If an option of the specified type is located, this
+     value of *tptrp.  If an option of the specified type is located, this
      function returns 0 and *tptrp points to the 8- bit option type field for
      the option of the specified type.  If an option of the specified type is
-     not located, the return value is -1 and *tptrp is NULL. If an error oc-
-     curs, the return value is -1 and *tptrp is not NULL.
+     not located, the return value is -1 and *tptrp is NULL.  If an error
+     occurs, the return value is -1 and *tptrp is not NULL.
 
 DIAGNOSTICS
      inet6_option_init() and inet6_option_append() return 0 on success or -1
      on an error.
 
@@ -1887,14 +1866,14 @@ DIAGNOSTICS
 
 EXAMPLES
      RFC2292 gives comprehensive examples in chapter 6.
 
 SEE ALSO
-     W. Stevens, and M. Thomas, Advanced Sockets API for IPv6, RFC2292,
+     W. Stevens and M. Thomas, Advanced Sockets API for IPv6, RFC2292,
      February 1998.
 
-     S. Deering, and R. Hinden, Internet Protocol, Version 6 (IPv6)
+     S. Deering and R. Hinden, Internet Protocol, Version 6 (IPv6)
      Specification, RFC2460, December 1998.
 
 HISTORY
      The implementation first appeared in KAME advanced networking kit.
 
@@ -1903,19 +1882,18 @@ STANDARDS
      (RFC2292).
 
 BUGS
      The text was shamelessly copied from RFC2292.
 
-BSD Experimental               December 10, 1999                             3
+BSD                            December 10, 1999                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="INET6-RTHDR-SPACE">
-    <title>INET6_RTHDR_SPACE</title>
+  <sect1 id="net-common-tcpip-manpages-inet6-rthdr-space">
+    <title>inet6_rthdr_space</title>
     <screen>
-
-INET6_RTHDR_SPACE(3)      System Programmer's Manual      INET6_RTHDR_SPACE(3)
+INET6_RTHDR_SPACE(3)    System Library Functions Manual   INET6_RTHDR_SPACE(3)
 
 NAME
      inet6_rthdr_space, inet6_rthdr_init, inet6_rthdr_add,
      inet6_rthdr_lasthop, inet6_rthdr_reverse, inet6_rthdr_segments,
      inet6_rthdr_getaddr, inet6_rthdr_getflags - IPv6 Routing Header Options
@@ -1923,33 +1901,33 @@ NAME
 
 SYNOPSIS
      #include &lt;netinet/in.h>
 
      size_t
-     inet6_rthdr_space(int type, int segments)
+     inet6_rthdr_space(int type, int segments);
 
      struct cmsghdr *
-     inet6_rthdr_init(void *bp, int type)
+     inet6_rthdr_init(void *bp, int type);
 
      int
      inet6_rthdr_add(struct cmsghdr *cmsg, const struct in6_addr *addr,
-             unsigned int flags)
+             unsigned int flags);
 
      int
-     inet6_rthdr_lasthop(struct cmsghdr *cmsg, unsigned int flags)
+     inet6_rthdr_lasthop(struct cmsghdr *cmsg, unsigned int flags);
 
      int
-     inet6_rthdr_reverse(const struct cmsghdr *in, struct cmsghdr *out)
+     inet6_rthdr_reverse(const struct cmsghdr *in, struct cmsghdr *out);
 
      int
-     inet6_rthdr_segments(const struct cmsghdr *cmsg)
+     inet6_rthdr_segments(const struct cmsghdr *cmsg);
 
      struct in6_addr *
-     inet6_rthdr_getaddr(struct cmsghdr *cmsg, int index)
+     inet6_rthdr_getaddr(struct cmsghdr *cmsg, int index);
 
      int
-     inet6_rthdr_getflags(const struct cmsghdr *cmsg, int index)
+     inet6_rthdr_getflags(const struct cmsghdr *cmsg, int index);
 
 DESCRIPTION
      RFC2292 IPv6 advanced API defines eight functions that the application
      calls to build and examine a Routing header.  Four functions build a
      Routing header:
@@ -1976,30 +1954,30 @@ DESCRIPTION
      header.
 
    inet6_rthdr_space
      This function returns the number of bytes required to hold a Routing
      header of the specified type containing the specified number of segments
-     (addresses). For an IPv6 Type 0 Routing header, the number of segments
+     (addresses).  For an IPv6 Type 0 Routing header, the number of segments
      must be between 1 and 23, inclusive.  The return value includes the size
-     of the cmsghdr structure that precedes the Routing header, and any re-
-     quired padding.
+     of the cmsghdr structure that precedes the Routing header, and any
+     required padding.
 
      If the return value is 0, then either the type of the Routing header is
      not supported by this implementation or the number of segments is invalid
      for this type of Routing header.
 
-     Note: This function returns the size but does not allocate the space re-
-     quired for the ancillary data.  This allows an application to allocate a
-     larger buffer, if other ancillary data objects are desired, since all the
-     ancillary data objects must be specified to sendmsg(2) as a single
+     Note: This function returns the size but does not allocate the space
+     required for the ancillary data.  This allows an application to allocate
+     a larger buffer, if other ancillary data objects are desired, since all
+     the ancillary data objects must be specified to sendmsg(2) as a single
      msg_control buffer.
 
    inet6_rthdr_init
      This function initializes the buffer pointed to by bp to contain a
-     cmsghdr structure followed by a Routing header of the specified type. The
-     cmsg_len member of the cmsghdr structure is initialized to the size of
-     the structure plus the amount of space required by the Routing header.
+     cmsghdr structure followed by a Routing header of the specified type.
+     The cmsg_len member of the cmsghdr structure is initialized to the size
+     of the structure plus the amount of space required by the Routing header.
      The cmsg_level and cmsg_type members are also initialized as required.
 
      The caller must allocate the buffer and its size can be determined by
      calling inet6_rthdr_space().
 
@@ -2008,11 +1986,11 @@ DESCRIPTION
      Upon an error the return value is NULL.
 
    inet6_rthdr_add
      This function adds the address pointed to by addr to the end of the Rout-
      ing header being constructed and sets the type of this hop to the value
-     of flags. For an IPv6 Type 0 Routing header, flags must be either
+     of flags.  For an IPv6 Type 0 Routing header, flags must be either
      IPV6_RTHDR_LOOSE or IPV6_RTHDR_STRICT.
 
      If successful, the cmsg_len member of the cmsghdr structure is updated to
      account for the new address in the Routing header and the return value of
      the function is 0.  Upon an error the return value of the function is -1.
@@ -2037,30 +2015,28 @@ DESCRIPTION
 
      The return value of the function is 0 on success, or -1 upon an error.
 
    inet6_rthdr_segments
      This function returns the number of segments (addresses) contained in the
-     Routing header described by cmsg. On success the return value is between
-     1 and 23, inclusive.  The return value of the function is -1 upon an er-
-     ror.
-
+     Routing header described by cmsg.  On success the return value is between
+     1 and 23, inclusive.  The return value of the function is -1 upon an
+     error.
 
    inet6_rthdr_getaddr
      This function returns a pointer to the IPv6 address specified by index
-     inet6_rthdr_segments() (which must have a value between  1  and  the
-     value  returned  by) in the Routing header described by cmsg. An applica-
-     tion should first call inet6_rthdr_segments() to obtain the number of
-     segments in the Routing header.
+     (which must have a value between 1 and the value returned by
+     inet6_rthdr_segments()) in the Routing header described by cmsg.  An
+     application should first call inet6_rthdr_segments() to obtain the number
+     of segments in the Routing header.
 
      Upon an error the return value of the function is NULL.
 
    inet6_rthdr_getflags
-     This function returns the flags value specified by index
-     inet6_rthdr_segments() (which  must  have  a  value  between  0 and the
-     value returned by) in the Routing header described by cmsg. For an IPv6
-     Type 0 Routing header the return value will be either IPV6_RTHDR_LOOSE or
-     IPV6_RTHDR_STRICT.
+     This function returns the flags value specified by index (which must have
+     a value between 0 and the value returned by inet6_rthdr_segments()) in
+     the Routing header described by cmsg.  For an IPv6 Type 0 Routing header
+     the return value will be either IPV6_RTHDR_LOOSE or IPV6_RTHDR_STRICT.
 
      Upon an error the return value of the function is -1.
 
      Note: Addresses are indexed starting at 1, and flags starting at 0, to
      maintain consistency with the terminology and figures in RFC2460.
@@ -2077,14 +2053,14 @@ DIAGNOSTICS
 
 EXAMPLES
      RFC2292 gives comprehensive examples in chapter 8.
 
 SEE ALSO
-     W. Stevens, and M. Thomas, Advanced Sockets API for IPv6, RFC2292,
+     W. Stevens and M. Thomas, Advanced Sockets API for IPv6, RFC2292,
      February 1998.
 
-     S. Deering, and R. Hinden, Internet Protocol, Version 6 (IPv6)
+     S. Deering and R. Hinden, Internet Protocol, Version 6 (IPv6)
      Specification, RFC2460, December 1998.
 
 HISTORY
      The implementation first appeared in KAME advanced networking kit.
 
@@ -2095,19 +2071,18 @@ STANDARDS
 BUGS
      The text was shamelessly copied from RFC2292.
 
      inet6_rthdr_reverse() is not implemented yet.
 
-BSD Experimental               December 10, 1999                             3
+BSD                            December 10, 1999                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="INET-NET">
-    <title>INET_NET</title>
+  <sect1 id="net-common-tcpip-manpages-inet-net">
+    <title>inet_net</title>
     <screen>
-
-INET_NET(3)               System Programmer's Manual               INET_NET(3)
+INET_NET(3)             System Library Functions Manual            INET_NET(3)
 
 NAME
      inet_net_ntop, inet_net_pton - Internet network number manipulation rou-
      tines
 
@@ -2115,14 +2090,14 @@ SYNOPSIS
      #include &lt;sys/socket.h>
      #include &lt;netinet/in.h>
      #include &lt;arpa/inet.h>
 
      char *
-     inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size)
+     inet_net_ntop(int af, const void *src, int bits, char *dst, size_t size);
 
      int
-     inet_net_pton(int af, const char *src, void *dst, size_t size)
+     inet_net_pton(int af, const char *src, void *dst, size_t size);
 
 DESCRIPTION
      The inet_net_ntop() function converts an Internet network number from
      network format (usually a struct in_addr or some other binary form, in
      network byte order) to CIDR presentation format (suitable for external
@@ -2137,12 +2112,12 @@ DESCRIPTION
      representation, in network byte order).  It returns the number of bits
      (either computed based on the class, or specified with /CIDR), or -1 if a
      failure occurred (in which case errno will have been set.  It will be set
      to ENOENT if the Internet network number was not valid).
 
-     The only value for af currently supported is AF_INET. size is the size of
-     the result buffer dst.
+     The only value for af currently supported is AF_INET.  size is the size
+     of the result buffer dst.
 
 NETWORK NUMBERS (IP VERSION 4)
      Internet network numbers may be specified in one of the following forms:
 
            a.b.c.d/bits
@@ -2154,11 +2129,11 @@ NETWORK NUMBERS (IP VERSION 4)
      When four parts are specified, each is interpreted as a byte of data and
      assigned, from left to right, to the four bytes of an Internet network
      number.  Note that when an Internet network number is viewed as a 32-bit
      integer quantity on a system that uses little-endian byte order (such as
      the Intel 386, 486, and Pentium processors) the bytes referred to above
-     appear as ``d.c.b.a''. That is, little-endian bytes are ordered from
+     appear as ``d.c.b.a''.  That is, little-endian bytes are ordered from
      right to left.
 
      When a three part number is specified, the last part is interpreted as a
      16-bit quantity and placed in the rightmost two bytes of the Internet
      network number.  This makes the three part number format convenient for
@@ -2167,52 +2142,50 @@ NETWORK NUMBERS (IP VERSION 4)
      When a two part number is supplied, the last part is interpreted as a
      24-bit quantity and placed in the rightmost three bytes of the Internet
      network number.  This makes the two part number format convenient for
      specifying Class A network numbers as ``net.host''.
 
-
      When only one part is given, the value is stored directly in the Internet
      network number without any byte rearrangement.
 
-     All numbers supplied as ``parts'' in a `.' notation may be decimal, oc-
-     tal, or hexadecimal, as specified in the C language (i.e., a leading 0x
+     All numbers supplied as ``parts'' in a `.' notation may be decimal,
+     octal, or hexadecimal, as specified in the C language (i.e., a leading 0x
      or 0X implies hexadecimal; otherwise, a leading 0 implies octal; other-
      wise, the number is interpreted as decimal).
 
 SEE ALSO
-     byteorder(3),  inet(3),  networks(5)
+     byteorder(3), inet(3), networks(5)
 
 HISTORY
      The inet_net_ntop and inet_net_pton functions first appeared in BIND
      4.9.4.
 
-BSD Experimental                 June 18, 1997                               2
+BSD                              June 18, 1997                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="IPX">
-    <title>IPX</title>
+  <sect1 id="net-common-tcpip-manpages-ipx">
+    <title>ipx</title>
     <screen>
-
-IPX(3)                    System Programmer's Manual                    IPX(3)
+IPX(3)                  System Library Functions Manual                 IPX(3)
 
 NAME
      ipx_addr, ipx_ntoa - IPX address conversion routines
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;netipx/ipx.h>
 
      struct ipx_addr
-     ipx_addr(const char *cp)
+     ipx_addr(const char *cp);
 
      char *
-     ipx_ntoa(struct ipx_addr ipx)
+     ipx_ntoa(struct ipx_addr ipx);
 
 DESCRIPTION
-     The routine ipx_addr() interprets character strings representing IPX ad-
-     dresses, returning binary information suitable for use in system calls.
+     The routine ipx_addr() interprets character strings representing IPX
+     addresses, returning binary information suitable for use in system calls.
      The routine ipx_ntoa() takes IPX addresses and returns ASCII strings rep-
      resenting the address in a notation in common use:
 
            &lt;network number>.&lt;host number>.&lt;port number>
 
@@ -2221,63 +2194,62 @@ DESCRIPTION
      ing super-decimal digits will have a trailing `H' appended.
 
      An effort has been made to ensure that ipx_addr() be compatible with most
      formats in common use.  It will first separate an address into 1 to 3
      fields using a single delimiter chosen from period (`.'), colon (`:'), or
-     pound-sign (`#'). Each field is then examined for byte separators (colon
+     pound-sign (`#').  Each field is then examined for byte separators (colon
      or period).  If there are byte separators, each subfield separated is
      taken to be a small hexadecimal number, and the entirety is taken as a
-     network-byte-ordered quantity to be zero extended in the high-network-or-
-     der bytes.  Next, the field is inspected for hyphens, in which case the
+     network-byte-ordered quantity to be zero extended in the high-network-
+     order bytes.  Next, the field is inspected for hyphens, in which case the
      field is assumed to be a number in decimal notation with hyphens separat-
-     ing the millenia.  Next, the field is assumed to be a number: It is in-
-     terpreted as hexadecimal if there is a leading `0x' (as in C), a trailing
-     `H' (as in Mesa), or there are any super-decimal digits present.  It is
-     interpreted as octal is there is a leading `0' and there are no super-oc-
-     tal digits.  Otherwise, it is converted as a decimal number.
+     ing the millenia.  Next, the field is assumed to be a number: It is
+     interpreted as hexadecimal if there is a leading `0x' (as in C), a trail-
+     ing `H' (as in Mesa), or there are any super-decimal digits present.  It
+     is interpreted as octal is there is a leading `0' and there are no super-
+     octal digits.  Otherwise, it is converted as a decimal number.
 
 RETURN VALUES
      None.  (See BUGS.)
 
 SEE ALSO
-     ns(4),  hosts(5),  networks(5)
+     ns(4), hosts(5), networks(5)
 
 HISTORY
      The precursor ns_addr() and ns_ntoa() functions appeared in 4.3BSD.
 
 BUGS
      The string returned by ipx_ntoa() resides in a static memory area.  The
      function ipx_addr() should diagnose improperly formed input, and there
      should be an unambiguous way to recognize this.
 
-BSD Experimental                 June 4, 1993                                1
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="ISO-ADDR">
-    <title>ISO_ADDR</title>
+  <sect1 id="net-common-tcpip-manpages-iso-addr">
+    <title>iso_addr</title>
     <screen>
-
-ISO_ADDR(3)               System Programmer's Manual               ISO_ADDR(3)
+ISO_ADDR(3)             System Library Functions Manual            ISO_ADDR(3)
 
 NAME
      iso_addr, iso_ntoa - network address conversion routines for Open System
      Interconnection
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;netiso/iso.h>
 
      struct iso_addr *
-     iso_addr(char *cp)
+     iso_addr(char *cp);
 
      char *
-     iso_ntoa(struct iso_addr *isoa)
+     iso_ntoa(struct iso_addr *isoa);
 
 DESCRIPTION
-     The routine iso_addr() interprets character strings representing OSI ad-
-     dresses, returning binary information suitable for use in system calls.
+     The routine iso_addr() interprets character strings representing OSI
+     addresses, returning binary information suitable for use in system calls.
      The routine iso_ntoa() takes OSI addresses and returns ASCII strings rep-
      resenting NSAPs (network service access points) in a notation inverse to
      that accepted by iso_addr().
 
      Unfortunately, no universal standard exists for representing OSI network
@@ -2294,11 +2266,11 @@ DESCRIPTION
      following an odd number of bytes has the effect of causing the byte of
      address being translated to have its higher order bits filled with zeros.
 
 RETURN VALUES
      iso_ntoa() always returns a null terminated string.  iso_addr() always
-     returns a pointer to a struct iso_addr. (See BUGS.)
+     returns a pointer to a struct iso_addr.  (See BUGS.)
 
 SEE ALSO
      iso(4)
 
 HISTORY
@@ -2308,19 +2280,18 @@ BUGS
      The returned values reside in a static memory area.
 
      The function iso_addr() should diagnose improperly formed input, and
      there should be an unambiguous way to recognize this.
 
-BSD Experimental                 June 4, 1993                                1
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="LINK-ADDR">
-    <title>LINK_ADDR</title>
+  <sect1 id="net-common-tcpip-manpages-link-addr">
+    <title>link_addr</title>
     <screen>
-
-LINK_ADDR(3)              System Programmer's Manual              LINK_ADDR(3)
+LINK_ADDR(3)            System Library Functions Manual           LINK_ADDR(3)
 
 NAME
      link_addr, link_ntoa - elementary address specification routines for link
      level access
 
@@ -2328,14 +2299,14 @@ SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
      #include &lt;net/if_dl.h>
 
      void
-     link_addr(const char *addr, struct sockaddr_dl *sdl)
+     link_addr(const char *addr, struct sockaddr_dl *sdl);
 
      char *
-     link_ntoa(const struct sockaddr_dl *sdl)
+     link_ntoa(const struct sockaddr_dl *sdl);
 
 DESCRIPTION
      The link_addr() function interprets character strings representing link-
      level addresses, returning binary information suitable for use in system
      calls.  link_ntoa() takes a link-level address and returns an ASCII
@@ -2343,24 +2314,24 @@ DESCRIPTION
      level address itself, and the interface name or number, if present.  This
      facility is experimental and is still subject to change.
 
      For link_addr(), the string addr may contain an optional network inter-
      face identifier of the form ``name unit-number'', suitable for the first
-     argument to ifconfig(8),  followed in all cases by a colon and an inter-
-     face address in the form of groups of hexadecimal digits separated by pe-
-     riods.  Each group represents a byte of address; address bytes are filled
-     left to right from low order bytes through high order bytes.
+     argument to ifconfig(8), followed in all cases by a colon and an inter-
+     face address in the form of groups of hexadecimal digits separated by
+     periods.  Each group represents a byte of address; address bytes are
+     filled left to right from low order bytes through high order bytes.
 
      Thus le0:8.0.9.13.d.30 represents an Ethernet address to be transmitted
      on the first Lance Ethernet interface.
 
 RETURN VALUES
      link_ntoa() always returns a null-terminated string.  link_addr() has no
      return value.  (See BUGS.)
 
 SEE ALSO
-     iso(4),  ifconfig(8)
+     iso(4), ifconfig(8)
 
 HISTORY
      The link_addr() and link_ntoa() functions appeared in 4.3BSD-Reno.
 
 BUGS
@@ -2372,28 +2343,27 @@ BUGS
      If the sdl_len field of the link socket address sdl is 0, link_ntoa()
      will not insert a colon before the interface address bytes.  If this
      translated address is given to link_addr() without inserting an initial
      colon, the latter will not interpret it correctly.
 
-BSD Experimental                 July 28, 1993                               1
+BSD                              July 28, 1993                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="NET-ADDRCMP">
-    <title>NET_ADDRCMP</title>
+  <sect1 id="net-common-tcpip-manpages-net-addrcmp">
+    <title>net_addrcmp</title>
     <screen>
-
-NET_ADDRCMP(3)            System Programmer's Manual            NET_ADDRCMP(3)
+NET_ADDRCMP(3)          System Library Functions Manual         NET_ADDRCMP(3)
 
 NAME
      net_addrcmp - compare socket address structures
 
 SYNOPSIS
      #include &lt;netdb.h>
 
      int
-     net_addrcmp(struct sockaddr *sa1, struct sockaddr *sa2)
+     net_addrcmp(struct sockaddr *sa1, struct sockaddr *sa2);
 
 DESCRIPTION
      The net_addrcmp() function compares two socket address structures, sa1
      and sa2.
 
@@ -2412,87 +2382,86 @@ RETURN VALUES
      match, the protocol-specific data (the sa_data field) is compared.  If
      there's a match, both sa1 and sa2 must refer to the same address, and 0
      is returned; otherwise, a value >0 or &lt;0 is returned.
 
 HISTORY
-     A net_addrcmp() function was added in
+     A net_addrcmp() function was added in OpenBSD 2.5.
 
-BSD Experimental                 July 3, 1999                                1
+BSD                              July 3, 1999                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="NS">
-    <title>NS</title>
+  <sect1 id="net-common-tcpip-manpages-ns">
+    <title>ns</title>
     <screen>
-
-NS(3)                     System Programmer's Manual                     NS(3)
+NS(3)                   System Library Functions Manual                  NS(3)
 
 NAME
      ns_addr, ns_ntoa - Xerox NS(tm) address conversion routines
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;netns/ns.h>
 
      struct ns_addr
-     ns_addr(char *cp)
+     ns_addr(char *cp);
 
      char *
-     ns_ntoa(struct ns_addr ns)
+     ns_ntoa(struct ns_addr ns);
 
 DESCRIPTION
-     The routine ns_addr() interprets character strings representing XNS ad-
-     dresses, returning binary information suitable for use in system calls.
+     The routine ns_addr() interprets character strings representing XNS
+     addresses, returning binary information suitable for use in system calls.
      The routine ns_ntoa() takes XNS addresses and returns ASCII strings rep-
      resenting the address in a notation in common use in the Xerox Develop-
      ment Environment:
 
            &lt;network number>.&lt;host number>.&lt;port number>
 
      Trailing zero fields are suppressed, and each number is printed in hex-
      adecimal, in a format suitable for input to ns_addr().  Any fields lack-
      ing super-decimal digits will have a trailing `H' appended.
 
-     Unfortunately, no universal standard exists for representing XNS address-
-     es.  An effort has been made to ensure that ns_addr() be compatible with
-     most formats in common use.  It will first separate an address into 1 to
-     3 fields using a single delimiter chosen from period (`.'), colon (`:'),
-     or pound-sign `#'. Each field is then examined for byte separators (colon
-     or period).  If there are byte separators, each subfield separated is
-     taken to be a small hexadecimal number, and the entirety is taken as a
-     network-byte-ordered quantity to be zero extended in the high-network-or-
-     der bytes.  Next, the field is inspected for hyphens, in which case the
-     field is assumed to be a number in decimal notation with hyphens separat-
-     ing the millenia.  Next, the field is assumed to be a number: It is in-
-     terpreted as hexadecimal if there is a leading `0x' (as in C), a trailing
-     `H' (as in Mesa), or there are any super-decimal digits present.  It is
-     interpreted as octal is there is a leading `0' and there are no super-oc-
-     tal digits.  Otherwise, it is converted as a decimal number.
+     Unfortunately, no universal standard exists for representing XNS
+     addresses.  An effort has been made to ensure that ns_addr() be compati-
+     ble with most formats in common use.  It will first separate an address
+     into 1 to 3 fields using a single delimiter chosen from period (`.'),
+     colon (`:'), or pound-sign `#'.  Each field is then examined for byte
+     separators (colon or period).  If there are byte separators, each sub-
+     field separated is taken to be a small hexadecimal number, and the
+     entirety is taken as a network-byte-ordered quantity to be zero extended
+     in the high-network-order bytes.  Next, the field is inspected for
+     hyphens, in which case the field is assumed to be a number in decimal
+     notation with hyphens separating the millenia.  Next, the field is
+     assumed to be a number: It is interpreted as hexadecimal if there is a
+     leading `0x' (as in C), a trailing `H' (as in Mesa), or there are any
+     super-decimal digits present.  It is interpreted as octal is there is a
+     leading `0' and there are no super-octal digits.  Otherwise, it is con-
+     verted as a decimal number.
 
 RETURN VALUES
      None.  (See BUGS.)
 
 SEE ALSO
-     hosts(5),  networks(5)
+     hosts(5), networks(5)
 
 HISTORY
      The ns_addr() and ns_toa() functions appeared in 4.3BSD.
 
 BUGS
      The string returned by ns_ntoa() resides in a static memory area.  The
      function ns_addr() should diagnose improperly formed input, and there
      should be an unambiguous way to recognize this.
 
-BSD Experimental                 June 4, 1993                                1
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="RESOLVER">
-    <title>RESOLVER</title>
+  <sect1 id="net-common-tcpip-manpages-resolver">
+    <title>resolver</title>
     <screen>
-
-RESOLVER(3)               System Programmer's Manual               RESOLVER(3)
+RESOLVER(3)             System Library Functions Manual            RESOLVER(3)
 
 NAME
      res_query, res_search, res_mkquery, res_send, res_init, dn_comp,
      dn_expand - resolver routines
 
@@ -2501,41 +2470,41 @@ SYNOPSIS
      #include &lt;netinet/in.h>
      #include &lt;arpa/nameser.h>
      #include &lt;resolv.h>
 
      int
-     res_query(char *dname, int class, int type, u_char *answer, int anslen)
+     res_query(char *dname, int class, int type, u_char *answer, int anslen);
 
      int
-     res_search(char *dname, int class, int type, u_char *answer, int anslen)
+     res_search(char *dname, int class, int type, u_char *answer, int anslen);
 
      int
      res_mkquery(int op, char *dname, int class, int type, char *data,
-             int datalen, struct rrec *newrr, char *buf, int buflen)
+             int datalen, struct rrec *newrr, char *buf, int buflen);
 
      int
-     res_send(char *msg, int msglen, char *answer, int anslen)
+     res_send(char *msg, int msglen, char *answer, int anslen);
 
      int
-     res_init(void)
+     res_init(void);
 
      int
      dn_comp(char *exp_dn, char *comp_dn, int length, char **dnptrs,
-             char **lastdnptr)
+             char **lastdnptr);
 
      int
      dn_expand(u_char *msg, u_char *eomorig, u_char *comp_dn, u_char *exp_dn,
-             int length)
+             int length);
 
 DESCRIPTION
      These routines are used for making, sending, and interpreting query and
      reply messages with Internet domain name servers.
 
      Global configuration and state information that is used by the resolver
-     routines is kept in the structure _res. Most of the values have reason-
-     able defaults and can be ignored.  Options stored in _res.options are de-
-     fined in &lt;resolv.h> and are as follows.  Options are stored as a simple
+     routines is kept in the structure _res.  Most of the values have reason-
+     able defaults and can be ignored.  Options stored in _res.options are
+     defined in &lt;resolv.h> and are as follows.  Options are stored as a simple
      bit mask containing the bitwise OR of the options enabled.
 
      RES_INIT       True if the initial name server address and default domain
                     name are initialized (i.e., res_init() has been called).
 
@@ -2546,160 +2515,158 @@ DESCRIPTION
                     answer or finds an error.  Currently this is not imple-
                     mented.
 
      RES_USEVC      Use TCP connections for queries instead of UDP datagrams.
 
-     RES_STAYOPEN   Used with RES_USEVC to keep the TCP connection open be-
-                    tween queries.  This is useful only in programs that regu-
-                    larly do many queries.  UDP should be the normal mode
+     RES_STAYOPEN   Used with RES_USEVC to keep the TCP connection open
+                    between queries.  This is useful only in programs that
+                    regularly do many queries.  UDP should be the normal mode
                     used.
 
      RES_IGNTC      Unused currently (ignore truncation errors, i.e., don't
-
                     retry with TCP).
 
-     RES_RECURSE    Set the recursion-desired bit in queries.  This is the de-
-                    fault.  (res_send() does not do iterative queries and ex-
-                    pects the name server to handle recursion.)
+     RES_RECURSE    Set the recursion-desired bit in queries.  This is the
+                    default.  (res_send() does not do iterative queries and
+                    expects the name server to handle recursion.)
 
      RES_DEFNAMES   If set, res_search() will append the default domain name
                     to single-component names (those that do not contain a
                     dot).  This option is enabled by default.
 
      RES_DNSRCH     If this option is set, res_search() will search for host
                     names in the current domain and in parent domains; see
                     hostname(7).  This is used by the standard host lookup
-                    routine gethostbyname(3).  This option is enabled by de-
-                    fault.
+                    routine gethostbyname(3).  This option is enabled by
+                    default.
 
      RES_USE_INET6  Enables support for IPv6-only applications.  This causes
                     IPv4 addresses to be returned as an IPv4 mapped address.
                     For example, 10.1.1.1 will be returned as ::ffff:10.1.1.1.
-                    The option is not meaningful on
+                    The option is not meaningful on OpenBSD.
 
      The res_init() routine reads the configuration file (if any; see
-     resolv.conf(5))  to get the default domain name, search list, and the In-
-     ternet address of the local name server(s).  If no server is configured,
-     the host running the resolver is tried.  The current domain name is de-
-     fined by the hostname if not specified in the configuration file; it can
-     be overridden by the environment variable LOCALDOMAIN. This environment
-     variable may contain several blank-separated tokens if you wish to over-
-     ride the search list on a per-process basis.  This is similar to the
+     resolv.conf(5)) to get the default domain name, search list, and the
+     Internet address of the local name server(s).  If no server is config-
+     ured, the host running the resolver is tried.  The current domain name is
+     defined by the hostname if not specified in the configuration file; it
+     can be overridden by the environment variable LOCALDOMAIN.  This environ-
+     ment variable may contain several blank-separated tokens if you wish to
+     override the search list on a per-process basis.  This is similar to the
      search command in the configuration file.  Another environment variable
      RES_OPTIONS can be set to override certain internal resolver options
      which are otherwise set by changing fields in the _res structure or are
      inherited from the configuration file's options command.  The syntax of
      the RES_OPTIONS environment variable is explained in resolv.conf(5).
      Initialization normally occurs on the first call to one of the following
      routines.
 
      The res_query() function provides an interface to the server query mecha-
-     nism.  It constructs a query, sends it to the local server, awaits a re-
-     sponse, and makes preliminary checks on the reply.  The query requests
+     nism.  It constructs a query, sends it to the local server, awaits a
+     response, and makes preliminary checks on the reply.  The query requests
      information of the specified type and class for the specified fully qual-
-     ified domain name dname. The reply message is left in the answer buffer
+     ified domain name dname.  The reply message is left in the answer buffer
      with length anslen supplied by the caller.
 
      The res_search() routine makes a query and awaits a response like
      res_query(), but in addition, it implements the default and search rules
      controlled by the RES_DEFNAMES and RES_DNSRCH options.  It returns the
      first successful reply.
 
      The remaining routines are lower-level routines used by res_query().  The
      res_mkquery() function constructs a standard query message and places it
-     in buf. It returns the size of the query, or -1 if the query is larger
-     than buflen. The query type op is usually QUERY, but can be any of the
-     query types defined in &lt;arpa/nameser.h>. The domain name for the query is
-     given by dname. newrr is currently unused but is intended for making up-
-     date messages.
+     in buf.  It returns the size of the query, or -1 if the query is larger
+     than buflen.  The query type op is usually QUERY, but can be any of the
+     query types defined in &lt;arpa/nameser.h>.  The domain name for the query
+     is given by dname.  newrr is currently unused but is intended for making
+     update messages.
 
      The res_send() routine sends a pre-formatted query and returns an answer.
-     It will call res_init() if RES_INIT is not set, send the query to the lo-
-     cal name server, and handle timeouts and retries.  The length of the re-
-     ply message is returned, or -1 if there were errors.
+     It will call res_init() if RES_INIT is not set, send the query to the
+     local name server, and handle timeouts and retries.  The length of the
+     reply message is returned, or -1 if there were errors.
 
      The dn_comp() function compresses the domain name exp_dn and stores it in
-     comp_dn. The size of the compressed name is returned or -1 if there were
+     comp_dn.  The size of the compressed name is returned or -1 if there were
      errors.  The size of the array pointed to by comp_dn is given by length.
      The compression uses an array of pointers dnptrs to previously compressed
      names in the current message.  The first pointer points to the beginning
-     of the message and the list ends with NULL. The limit to the array is
-     specified by lastdnptr. A side effect of dn_comp() is to update the list
+     of the message and the list ends with NULL.  The limit to the array is
+     specified by lastdnptr.  A side effect of dn_comp() is to update the list
      of pointers for labels inserted into the message as the name is com-
      pressed.  If dnptr is NULL, names are not compressed.  If lastdnptr is
      NULL, the list of labels is not updated.
 
      The dn_expand() entry expands the compressed domain name comp_dn to a
      full domain name The compressed name is contained in a query or reply
      message; msg is a pointer to the beginning of the message.  The uncom-
      pressed name is placed in the buffer indicated by exp_dn which is of size
-     length. The size of compressed name is returned or -1 if there was an er-
-     ror.
+     length.  The size of compressed name is returned or -1 if there was an
+     error.
 
 FILES
      /etc/resolv.conf configuration file see resolv.conf(5).
 
 SEE ALSO
-     gethostbyname(3),  resolv.conf(5),  hostname(7),  named(8)
+     gethostbyname(3), resolv.conf(5), hostname(7), named(8)
 
      RFC1032, RFC1033, RFC1034, RFC1035, RFC1535, RFC974
 
      Name Server Operations Guide for BIND.
 
 HISTORY
      The res_query function appeared in 4.3BSD.
 
-BSD Experimental                 June 4, 1993                                3
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="ACCEPT">
-    <title>ACCEPT</title>
+  <sect1 id="net-common-tcpip-manpages-accept">
+    <title>accept</title>
     <screen>
-
-ACCEPT(2)                 System Programmer's Manual                 ACCEPT(2)
+ACCEPT(2)                     System Calls Manual                    ACCEPT(2)
 
 NAME
      accept - accept a connection on a socket
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     accept(int s, struct sockaddr *addr, socklen_t *addrlen)
+     accept(int s, struct sockaddr *addr, socklen_t *addrlen);
 
 DESCRIPTION
-     The argument s is a socket that has been created with socket(2),  bound
-     to an address with bind(2),  and is listening for connections after a
+     The argument s is a socket that has been created with socket(2), bound to
+     an address with bind(2), and is listening for connections after a
      listen(2).  The accept() argument extracts the first connection request
      on the queue of pending connections, creates a new socket with the same
      properties of s, and allocates a new file descriptor for the socket.  If
      no pending connections are present on the queue, and the socket is not
      marked as non-blocking, accept() blocks the caller until a connection is
      present.  If the socket is marked non-blocking and no pending connections
      are present on the queue, accept() returns an error as described below.
      The accepted socket may not be used to accept more connections.  The
      original socket s remains open.
 
-     The argument addr is a result parameter that is filled in with the ad-
-     dress of the connecting entity as known to the communications layer.  The
-     exact format of the addr parameter is determined by the domain in which
-     the communication is occurring.  The addrlen is a value-result parameter;
-     it should initially contain the amount of space pointed to by addr; on
-     return it will contain the actual length (in bytes) of the address re-
-     turned.  This call is used with connection-based socket types, currently
-     with SOCK_STREAM.
+     The argument addr is a result parameter that is filled in with the
+     address of the connecting entity as known to the communications layer.
+     The exact format of the addr parameter is determined by the domain in
+     which the communication is occurring.  The addrlen is a value-result
+     parameter; it should initially contain the amount of space pointed to by
+     addr; on return it will contain the actual length (in bytes) of the
+     address returned.  This call is used with connection-based socket types,
+     currently with SOCK_STREAM.
 
      It is possible to select(2) or poll(2) a socket for the purposes of doing
      an accept() by selecting it for read.
 
      For certain protocols which require an explicit confirmation, such as ISO
      or DATAKIT, accept() can be thought of as merely dequeuing the next con-
-     nection request and not implying confirmation.  Confirmation can be im-
-     plied by a normal read or write on the new file descriptor, and rejection
-     can be implied by closing the new socket.
+     nection request and not implying confirmation.  Confirmation can be
+     implied by a normal read or write on the new file descriptor, and rejec-
+     tion can be implied by closing the new socket.
 
      One can obtain user connection request data without confirming the con-
      nection by issuing a recvmsg(2) call with an msg_iovlen of 0 and a non-
      zero msg_controllen, or by issuing a getsockopt(2) request.  Similarly,
      one can provide user connection rejection information by issuing a
@@ -2711,60 +2678,55 @@ RETURN VALUES
      integer that is a descriptor for the accepted socket.
 
 ERRORS
      The accept() will fail if:
 
-     [EBADF]       The descriptor is invalid.
-
-     [ENOTSOCK]    The descriptor references a file, not a socket.
+     [EBADF]            The descriptor is invalid.
 
-     [EOPNOTSUPP]  The referenced socket is not of type SOCK_STREAM.
+     [ENOTSOCK]         The descriptor references a file, not a socket.
 
-     [EINVAL]      The referenced socket is not listening for connections
+     [EOPNOTSUPP]       The referenced socket is not of type SOCK_STREAM.
 
-                   (that is, listen(2) has not yet been called).
+     [EINVAL]           The referenced socket is not listening for connections
+                        (that is, listen(2) has not yet been called).
 
-     [EFAULT]      The addr parameter is not in a writable part of the user
-                   address space.
+     [EFAULT]           The addr parameter is not in a writable part of the
+                        user address space.
 
-     [EWOULDBLOCK]
-                   The socket is marked non-blocking and no connections are
-                   present to be accepted.
+     [EWOULDBLOCK]      The socket is marked non-blocking and no connections
+                        are present to be accepted.
 
-     [EMFILE]      The per-process descriptor table is full.
+     [EMFILE]           The per-process descriptor table is full.
 
-     [ENFILE]      The system file table is full.
+     [ENFILE]           The system file table is full.
 
-     [ECONNABORTED]
-                   A connection has been aborted.
+     [ECONNABORTED]     A connection has been aborted.
 
 SEE ALSO
-     bind(2),  connect(2),  listen(2),  poll(2),  select(2),  poll(2),  sock-
-     et(2)
+     bind(2), connect(2), listen(2), poll(2), select(2), poll(2), socket(2)
 
 HISTORY
      The accept() function appeared in 4.2BSD.
 
-BSD Experimental               February 15, 1999                             2
+BSD                            February 15, 1999                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="BIND">
-    <title>BIND</title>
+  <sect1 id="net-common-tcpip-manpages-bind">
+    <title>bind</title>
     <screen>
-
-BIND(2)                   System Programmer's Manual                   BIND(2)
+BIND(2)                       System Calls Manual                      BIND(2)
 
 NAME
      bind - bind a name to a socket
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     bind(int s, const struct sockaddr *name, socklen_t namelen)
+     bind(int s, const struct sockaddr *name, socklen_t namelen);
 
 DESCRIPTION
      bind() assigns a name to an unnamed socket.  When a socket is created
      with socket(2) it exists in a name space (address family) but has no name
      assigned.  bind() requests that name be assigned to the socket.
@@ -2782,191 +2744,181 @@ RETURN VALUES
      indicates an error, which is further specified in the global errno.
 
 ERRORS
      The bind() call will fail if:
 
-     [EBADF]       S is not a valid descriptor.
+     [EBADF]            S is not a valid descriptor.
 
-     [ENOTSOCK]    S is not a socket.
+     [ENOTSOCK]         S is not a socket.
 
-     [EADDRNOTAVAIL]
-                   The specified address is not available from the local ma-
-                   chine.
+     [EADDRNOTAVAIL]    The specified address is not available from the local
+                        machine.
 
-     [EADDRINUSE]  The specified address is already in use.
+     [EADDRINUSE]       The specified address is already in use.
 
-     [EINVAL]      The socket is already bound to an address.
+     [EINVAL]           The socket is already bound to an address.
 
-     [EINVAL]      The family of the socket and that requested in
-                   name->sa_family are not equivalent.
+     [EINVAL]           The family of the socket and that requested in
+                        name->sa_family are not equivalent.
 
-     [EACCES]      The requested address is protected, and the current user
-                   has inadequate permission to access it.
+     [EACCES]           The requested address is protected, and the current
+                        user has inadequate permission to access it.
 
-     [EFAULT]      The name parameter is not in a valid part of the user ad-
-                   dress space.
+     [EFAULT]           The name parameter is not in a valid part of the user
+                        address space.
 
      The following errors are specific to binding names in the UNIX domain.
 
-     [ENOTDIR]     A component of the path prefix is not a directory.
-
-     [ENAMETOOLONG]
-                   A component of a pathname exceeded {NAME_MAX} characters,
-                   or an entire path name exceeded {PATH_MAX} characters.
+     [ENOTDIR]          A component of the path prefix is not a directory.
 
-     [ENOENT]      A prefix component of the path name does not exist.
+     [ENAMETOOLONG]     A component of a pathname exceeded {NAME_MAX} charac-
+                        ters, or an entire path name exceeded {PATH_MAX} char-
+                        acters.
 
-     [ELOOP]       Too many symbolic links were encountered in translating the
+     [ENOENT]           A prefix component of the path name does not exist.
 
-                   pathname.
+     [ELOOP]            Too many symbolic links were encountered in translat-
+                        ing the pathname.
 
-     [EIO]         An I/O error occurred while making the directory entry or
-                   allocating the inode.
+     [EIO]              An I/O error occurred while making the directory entry
+                        or allocating the inode.
 
-     [EROFS]       The name would reside on a read-only file system.
+     [EROFS]            The name would reside on a read-only file system.
 
-     [EISDIR]      An empty pathname was specified.
+     [EISDIR]           An empty pathname was specified.
 
 SEE ALSO
-     connect(2),  getsockname(2),  listen(2),  socket(2)
+     connect(2), getsockname(2), listen(2), socket(2)
 
 HISTORY
      The bind() function call appeared in 4.2BSD.
 
-BSD Experimental               February 15, 1999                             2
+BSD                            February 15, 1999                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="CONNECT">
-    <title>CONNECT</title>
+  <sect1 id="net-common-tcpip-manpages-connect">
+    <title>connect</title>
     <screen>
-
-CONNECT(2)                System Programmer's Manual                CONNECT(2)
+CONNECT(2)                    System Calls Manual                   CONNECT(2)
 
 NAME
      connect - initiate a connection on a socket
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     connect(int s, const struct sockaddr *name, socklen_t namelen)
+     connect(int s, const struct sockaddr *name, socklen_t namelen);
 
 DESCRIPTION
      The parameter s is a socket.  If it is of type SOCK_DGRAM, this call
-     specifies the peer with which the socket is to be associated; this ad-
-     dress is that to which datagrams are to be sent, and the only address
+     specifies the peer with which the socket is to be associated; this
+     address is that to which datagrams are to be sent, and the only address
      from which datagrams are to be received.  If the socket is of type
      SOCK_STREAM, this call attempts to make a connection to another socket.
      The other socket is specified by name, which is an address in the commu-
      nications space of the socket.  Each communications space interprets the
-     name parameter in its own way.  Generally, stream sockets may successful-
-     ly connect() only once; datagram sockets may use connect() multiple times
-     to change their association.  Datagram sockets may dissolve the associa-
-     tion by connecting to an invalid address, such as a null address.
+     name parameter in its own way.  Generally, stream sockets may success-
+     fully connect() only once; datagram sockets may use connect() multiple
+     times to change their association.  Datagram sockets may dissolve the
+     association by connecting to an invalid address, such as a null address.
 
 RETURN VALUES
      If the connection or binding succeeds, 0 is returned.  Otherwise a -1 is
      returned, and a more specific error code is stored in errno.
 
 ERRORS
      The connect() call fails if:
 
-     [EBADF]       S is not a valid descriptor.
-
-     [ENOTSOCK]    S is a descriptor for a file, not a socket.
+     [EBADF]            S is not a valid descriptor.
 
-     [EADDRNOTAVAIL]
-                   The specified address is not available on this machine.
+     [ENOTSOCK]         S is a descriptor for a file, not a socket.
 
-     [EAFNOSUPPORT]
-                   Addresses in the specified address family cannot be used
-                   with this socket.
+     [EADDRNOTAVAIL]    The specified address is not available on this
+                        machine.
 
-     [EISCONN]     The socket is already connected.
+     [EAFNOSUPPORT]     Addresses in the specified address family cannot be
+                        used with this socket.
 
-     [ETIMEDOUT]   Connection establishment timed out without establishing a
-                   connection.
+     [EISCONN]          The socket is already connected.
 
-     [EINVAL]      A TCP connection with a local broadcast, the all-ones or a
-                   multicast address as the peer was attempted.
+     [ETIMEDOUT]        Connection establishment timed out without establish-
+                        ing a connection.
 
-     [ECONNREFUSED]
-                   The attempt to connect was forcefully rejected.
+     [EINVAL]           A TCP connection with a local broadcast, the all-ones
+                        or a multicast address as the peer was attempted.
 
-     [EINTR]       A connect was interrupted before it succeeded by the deliv-
-                   ery of a signal.
+     [ECONNREFUSED]     The attempt to connect was forcefully rejected.
 
-     [ENETUNREACH]
-                   The network isn't reachable from this host.
+     [EINTR]            A connect was interrupted before it succeeded by the
+                        delivery of a signal.
 
-     [EADDRINUSE]  The address is already in use.
+     [ENETUNREACH]      The network isn't reachable from this host.
 
-     [EFAULT]      The name parameter specifies an area outside the process
+     [EADDRINUSE]       The address is already in use.
 
-                   address space.
+     [EFAULT]           The name parameter specifies an area outside the pro-
+                        cess address space.
 
-     [EINPROGRESS]
-                   The socket is non-blocking and the connection cannot be
-                   completed immediately.  It is possible to select(2) or
-                   poll(2) for completion by selecting the socket for writing,
-                   and also use getsockopt(2) with SO_ERROR to check for error
-                   conditions.
+     [EINPROGRESS]      The socket is non-blocking and the connection cannot
+                        be completed immediately.  It is possible to select(2)
+                        or poll(2) for completion by selecting the socket for
+                        writing, and also use getsockopt(2) with SO_ERROR to
+                        check for error conditions.
 
-     [EALREADY]    The socket is non-blocking and a previous connection at-
-                   tempt has not yet been completed.
+     [EALREADY]         The socket is non-blocking and a previous connection
+                        attempt has not yet been completed.
 
      The following errors are specific to connecting names in the UNIX domain.
      These errors may not apply in future versions of the UNIX IPC domain.
 
-     [ENOTDIR]     A component of the path prefix is not a directory.
+     [ENOTDIR]          A component of the path prefix is not a directory.
 
-     [ENAMETOOLONG]
-                   A component of a pathname exceeded {NAME_MAX} characters,
-                   or an entire path name exceeded {PATH_MAX} characters.
+     [ENAMETOOLONG]     A component of a pathname exceeded {NAME_MAX} charac-
+                        ters, or an entire path name exceeded {PATH_MAX} char-
+                        acters.
 
-     [ENOENT]      The named socket does not exist.
+     [ENOENT]           The named socket does not exist.
 
-     [EACCES]      Search permission is denied for a component of the path
-                   prefix.
+     [EACCES]           Search permission is denied for a component of the
+                        path prefix.
 
-     [EACCES]      Write access to the named socket is denied.
+     [EACCES]           Write access to the named socket is denied.
 
-     [ELOOP]       Too many symbolic links were encountered in translating the
-                   pathname.
+     [ELOOP]            Too many symbolic links were encountered in translat-
+                        ing the pathname.
 
 SEE ALSO
-     accept(2),  getsockname(2),  getsockopt(2),  poll(2),  select(2),  sock-
-     et(2)
+     accept(2), getsockname(2), getsockopt(2), poll(2), select(2), socket(2)
 
 HISTORY
      The connect() function call appeared in 4.2BSD.
 
-BSD Experimental               February 15, 1999                             2
+BSD                            February 15, 1999                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETPEERNAME">
-    <title>GETPEERNAME</title>
+  <sect1 id="net-common-tcpip-manpages-getpeername">
+    <title>getpeername</title>
     <screen>
-
-GETPEERNAME(2)            System Programmer's Manual            GETPEERNAME(2)
+GETPEERNAME(2)                System Calls Manual               GETPEERNAME(2)
 
 NAME
      getpeername - get name of connected peer
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     getpeername(int s, struct sockaddr *name, socklen_t *namelen)
+     getpeername(int s, struct sockaddr *name, socklen_t *namelen);
 
 DESCRIPTION
      getpeername() returns the address information of the peer connected to
-     socket s. One common use occurs when a process inherits an open socket,
+     socket s.  One common use occurs when a process inherits an open socket,
      such as TCP servers forked from inetd(8).  In this scenario,
      getpeername() is used to determine the connecting client's IP address.
 
      getpeername() takes three parameters:
 
@@ -2992,53 +2944,52 @@ DESCRIPTION
      If name does not point to enough space to hold the entire socket address,
      the result will be truncated to namelen bytes.
 
 RETURN VALUES
      If the call succeeds, a 0 is returned and namelen is set to the actual
-     size of the socket address returned in name. Otherwise, errno is set and
+     size of the socket address returned in name.  Otherwise, errno is set and
      a value of -1 is returned.
 
 ERRORS
      On failure, errno is set to one of the following:
 
-     [EBADF]       The argument s is not a valid descriptor.
+     [EBADF]            The argument s is not a valid descriptor.
 
-     [ENOTSOCK]    The argument s is a file, not a socket.
+     [ENOTSOCK]         The argument s is a file, not a socket.
 
-     [ENOTCONN]    The socket is not connected.
+     [ENOTCONN]         The socket is not connected.
 
-     [ENOBUFS]     Insufficient resources were available in the system to per-
-                   form the operation.
+     [ENOBUFS]          Insufficient resources were available in the system to
+                        perform the operation.
 
-     [EFAULT]      The name parameter points to memory not in a valid part of
-                   the process address space.
+     [EFAULT]           The name parameter points to memory not in a valid
+                        part of the process address space.
 
 SEE ALSO
-     accept(2),  bind(2),  getsockname(2),  getpeereid(2),  socket(2)
+     accept(2), bind(2), getsockname(2), getpeereid(2), socket(2)
 
 HISTORY
      The getpeername() function call appeared in 4.2BSD.
 
-BSD Experimental                 July 17, 1999                               2
+BSD                              July 17, 1999                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETSOCKNAME">
-    <title>GETSOCKNAME</title>
+  <sect1 id="net-common-tcpip-manpages-getsockname">
+    <title>getsockname</title>
     <screen>
-
-GETSOCKNAME(2)            System Programmer's Manual            GETSOCKNAME(2)
+GETSOCKNAME(2)                System Calls Manual               GETSOCKNAME(2)
 
 NAME
      getsockname - get socket name
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     getsockname(int s, struct sockaddr *name, socklen_t *namelen)
+     getsockname(int s, struct sockaddr *name, socklen_t *namelen);
 
 DESCRIPTION
      getsockname() returns the locally bound address information for a speci-
      fied socket.
 
@@ -3078,75 +3029,72 @@ DESCRIPTION
      If name does not point to enough space to hold the entire socket address,
      the result will be truncated to namelen bytes.
 
 RETURN VALUES
      On success, getsockname() returns a 0, and namelen is set to the actual
-     size of the socket address returned in name. Otherwise, errno is set, and
-     a value of -1 is returned.
+     size of the socket address returned in name.  Otherwise, errno is set,
+     and a value of -1 is returned.
 
 ERRORS
      If getsockname() fails, errno is set to one of the following:
 
-     [EBADF]       The argument s is not a valid descriptor.
-
-
+     [EBADF]            The argument s is not a valid descriptor.
 
-     [ENOTSOCK]    The argument s is a file, not a socket.
+     [ENOTSOCK]         The argument s is a file, not a socket.
 
-     [ENOBUFS]     Insufficient resources were available in the system to per-
-                   form the operation.
+     [ENOBUFS]          Insufficient resources were available in the system to
+                        perform the operation.
 
-     [EFAULT]      The name parameter points to memory not in a valid part of
-                   the process address space.
+     [EFAULT]           The name parameter points to memory not in a valid
+                        part of the process address space.
 
 SEE ALSO
-     accept(2),  bind(2),  getpeername(2),  getpeereid(2),  socket(2)
+     accept(2), bind(2), getpeername(2), getpeereid(2), socket(2)
 
 BUGS
      Names bound to sockets in the UNIX domain are inaccessible; getsockname
      returns a zero length name.
 
 HISTORY
      The getsockname() function call appeared in 4.2BSD.
 
-BSD Experimental                 July 17, 1999                               2
+BSD                              July 17, 1999                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="GETSOCKOPT">
-    <title>GETSOCKOPT</title>
+  <sect1 id="net-common-tcpip-manpages-getsockopt">
+    <title>getsockopt</title>
     <screen>
-
-GETSOCKOPT(2)             System Programmer's Manual             GETSOCKOPT(2)
+GETSOCKOPT(2)                 System Calls Manual                GETSOCKOPT(2)
 
 NAME
      getsockopt, setsockopt - get and set options on sockets
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
      getsockopt(int s, int level, int optname, void *optval,
-             socklen_t *optlen)
+             socklen_t *optlen);
 
      int
      setsockopt(int s, int level, int optname, const void *optval,
-             socklen_t optlen)
+             socklen_t optlen);
 
 DESCRIPTION
      getsockopt() and setsockopt() manipulate the options associated with a
      socket.  Options may exist at multiple protocol levels; they are always
      present at the uppermost ``socket'' level.
 
      When manipulating socket options the level at which the option resides
      and the name of the option must be specified.  To manipulate options at
-     the socket level, level is specified as SOL_SOCKET. To manipulate options
-     at any other level the protocol number of the appropriate protocol con-
-     trolling the option is supplied.  For example, to indicate that an option
-     is to be interpreted by the TCP protocol, level should be set to the pro-
-     tocol number of TCP; see getprotoent(3).
+     the socket level, level is specified as SOL_SOCKET.  To manipulate
+     options at any other level the protocol number of the appropriate proto-
+     col controlling the option is supplied.  For example, to indicate that an
+     option is to be interpreted by the TCP protocol, level should be set to
+     the protocol number of TCP; see getprotoent(3).
 
      The parameters optval and optlen are used to access option values for
      setsockopt().  For getsockopt() they identify a buffer in which the value
      for the requested option(s) are to be returned.  For getsockopt(), optlen
      is a value-result parameter, initially containing the size of the buffer
@@ -3158,30 +3106,28 @@ DESCRIPTION
      priate protocol module for interpretation.  The include file
      &lt;sys/socket.h> contains definitions for socket level options, described
      below.  Options at other protocol levels vary in format and name; consult
      the appropriate entries in section 4 of the manual.
 
-     Most socket-level options utilize an int parameter for optval. For
-     setsockopt(), the parameter should be non-zero to enable a boolean op-
-     tion, or zero if the option is to be disabled.  SO_LINGER uses a struct
+     Most socket-level options utilize an int parameter for optval.  For
+     setsockopt(), the parameter should be non-zero to enable a boolean
+     option, or zero if the option is to be disabled.  SO_LINGER uses a struct
      linger parameter, defined in &lt;sys/socket.h>, which specifies the desired
      state of the option and the linger interval (see below).  SO_SNDTIMEO and
      SO_RCVTIMEO use a struct timeval parameter, defined in &lt;sys/time.h>.
 
-     The following options are recognized at the socket level.  Except as not-
-     ed, each may be examined with getsockopt() and set with setsockopt().
+     The following options are recognized at the socket level.  Except as
+     noted, each may be examined with getsockopt() and set with setsockopt().
 
            SO_DEBUG        enables recording of debugging information
            SO_REUSEADDR    enables local address reuse
            SO_REUSEPORT    enables duplicate address and port bindings
            SO_KEEPALIVE    enables keep connections alive
            SO_DONTROUTE    enables routing bypass for outgoing messages
            SO_LINGER       linger on close if data present
            SO_BROADCAST    enables permission to transmit broadcast messages
            SO_OOBINLINE    enables reception of out-of-band data in band
-
-
            SO_SNDBUF       set buffer size for output
            SO_RCVBUF       set buffer size for input
            SO_SNDLOWAT     set minimum count for output
            SO_RCVLOWAT     set minimum count for input
            SO_SNDTIMEO     set timeout value for output
@@ -3203,13 +3149,13 @@ DESCRIPTION
      ing messages should bypass the standard routing facilities.  Instead,
      messages are directed to the appropriate network interface according to
      the network portion of the destination address.
 
      SO_LINGER controls the action taken when unsent messages are queued on
-     socket and a close(2) is performed.  If the socket promises reliable de-
-     livery of data and SO_LINGER is set, the system will block the process on
-     the close(2) attempt until it is able to transmit the data or until it
+     socket and a close(2) is performed.  If the socket promises reliable
+     delivery of data and SO_LINGER is set, the system will block the process
+     on the close(2) attempt until it is able to transmit the data or until it
      decides it is unable to deliver the information (a timeout period mea-
      sured in seconds, termed the linger interval, is specified in the
      setsockopt() call when SO_LINGER is requested).  If SO_LINGER is disabled
      and a close(2) is issued, the system will process the close in a manner
      that allows the process to continue as quickly as possible.
@@ -3225,37 +3171,36 @@ DESCRIPTION
      tively.  The buffer size may be increased for high-volume connections, or
      may be decreased to limit the possible backlog of incoming data.  The
      system places an absolute limit on these values.
 
      SO_SNDLOWAT is an option to set the minimum count for output operations.
-     Most output operations process all of the data supplied by the call, de-
-     livering data to the protocol for transmission and blocking as necessary
-     for flow control.  Nonblocking output operations will process as much da-
-     ta as permitted subject to flow control without blocking, but will pro-
-     cess no data if flow control does not allow the smaller of the low water
-     mark value or the entire request to be processed.  A select(2) or poll(2)
-     operation testing the ability to write to a socket will return true only
-     if the low water mark amount could be processed.  The default value for
-     SO_SNDLOWAT is set to a convenient size for network efficiency, often
-     1024.  SO_RCVLOWAT is an option to set the minimum count for input opera-
-     tions.  In general, receive calls will block until any (non-zero) amount
-     of data is received, then return with the smaller of the amount available
-     or the amount requested.  The default value for SO_RCVLOWAT is 1.  If
-     SO_RCVLOWAT is set to a larger value, blocking receive calls normally
-     wait until they have received the smaller of the low water mark value or
-     the requested amount.  Receive calls may still return less than the low
-     water mark if an error occurs, a signal is caught, or the type of data
-     next in the receive queue is different than that returned.
-
+     Most output operations process all of the data supplied by the call,
+     delivering data to the protocol for transmission and blocking as neces-
+     sary for flow control.  Nonblocking output operations will process as
+     much data as permitted subject to flow control without blocking, but will
+     process no data if flow control does not allow the smaller of the low
+     water mark value or the entire request to be processed.  A select(2) or
+     poll(2) operation testing the ability to write to a socket will return
+     true only if the low water mark amount could be processed.  The default
+     value for SO_SNDLOWAT is set to a convenient size for network efficiency,
+     often 1024.  SO_RCVLOWAT is an option to set the minimum count for input
+     operations.  In general, receive calls will block until any (non-zero)
+     amount of data is received, then return with the smaller of the amount
+     available or the amount requested.  The default value for SO_RCVLOWAT is
+     1.  If SO_RCVLOWAT is set to a larger value, blocking receive calls nor-
+     mally wait until they have received the smaller of the low water mark
+     value or the requested amount.  Receive calls may still return less than
+     the low water mark if an error occurs, a signal is caught, or the type of
+     data next in the receive queue is different than that returned.
 
      SO_SNDTIMEO is an option to set a timeout value for output operations.
-     It accepts a struct timeval parameter with the number of seconds and mi-
-     croseconds used to limit waits for output operations to complete.  If a
+     It accepts a struct timeval parameter with the number of seconds and
+     microseconds used to limit waits for output operations to complete.  If a
      send operation has blocked for this much time, it returns with a partial
      count or with the error EWOULDBLOCK if no data was sent.  In the current
-     implementation, this timer is restarted each time additional data are de-
-     livered to the protocol, implying that the limit applies to output por-
+     implementation, this timer is restarted each time additional data are
+     delivered to the protocol, implying that the limit applies to output por-
      tions ranging in size from the low water mark to the high water mark for
      output.  SO_RCVTIMEO is an option to set a timeout value for input opera-
      tions.  It accepts a struct timeval parameter with the number of seconds
      and microseconds used to limit waits for input operations to complete.
      In the current implementation, this timer is restarted each time addi-
@@ -3275,51 +3220,49 @@ RETURN VALUES
      A 0 is returned if the call succeeds, -1 if it fails.
 
 ERRORS
      The call succeeds unless:
 
-     [EBADF]       The argument s is not a valid descriptor.
+     [EBADF]            The argument s is not a valid descriptor.
 
-     [ENOTSOCK]    The argument s is a file, not a socket.
+     [ENOTSOCK]         The argument s is a file, not a socket.
 
-     [ENOPROTOOPT]
-                   The option is unknown at the level indicated.
+     [ENOPROTOOPT]      The option is unknown at the level indicated.
 
-     [EFAULT]      The address pointed to by optval is not in a valid part of
-                   the process address space.  For getsockopt(), this error
-                   may also be returned if optlen is not in a valid part of
-                   the process address space.
+     [EFAULT]           The address pointed to by optval is not in a valid
+                        part of the process address space.  For getsockopt(),
+                        this error may also be returned if optlen is not in a
+                        valid part of the process address space.
 
 SEE ALSO
-     connect(2),  ioctl(2),  poll(2),  select(2),  poll(2),  socket(2),
-     getprotoent(3),  protocols(5)
+     connect(2), ioctl(2), poll(2), select(2), poll(2), socket(2),
+     getprotoent(3), protocols(5)
 
 BUGS
      Several of the socket options should be handled at lower levels of the
      system.
 
 HISTORY
      The getsockopt() system call appeared in 4.2BSD.
 
-BSD Experimental               February 15, 1999                             3
+BSD                            February 15, 1999                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="IOCTL">
-    <title>IOCTL</title>
+  <sect1 id="net-common-tcpip-manpages-ioctl">
+    <title>ioctl</title>
     <screen>
-
-IOCTL(2)                  System Programmer's Manual                  IOCTL(2)
+IOCTL(2)                      System Calls Manual                     IOCTL(2)
 
 NAME
      ioctl - control device
 
 SYNOPSIS
      #include &lt;sys/ioctl.h>
 
      int
-     ioctl(int d, unsigned long request, ...)
+     ioctl(int d, unsigned long request, ...);
 
 DESCRIPTION
      The ioctl() function manipulates the underlying device parameters of spe-
      cial files.  In particular, many operating characteristics of character
      special files (e.g., terminals) may be controlled with ioctl() requests.
@@ -3327,57 +3270,57 @@ DESCRIPTION
      The argument d must be an open file descriptor. The third argument is
      called arg and contains additional information needed by this device to
      perform the requested function.  arg is either an int or a pointer to a
      device-specific data structure, depending upon the given request.
 
-     An ioctl request has encoded in it whether the argument is an ``in'' pa-
-     rameter or ``out'' parameter, and the size of the third argument (arg) in
-     bytes.  Macros and defines used in specifying an ioctl request are locat-
-     ed in the file &lt;sys/ioctl.h>.
+     An ioctl request has encoded in it whether the argument is an ``in''
+     parameter or ``out'' parameter, and the size of the third argument (arg)
+     in bytes.  Macros and defines used in specifying an ioctl request are
+     located in the file &lt;sys/ioctl.h>.
 
 RETURN VALUES
      If an error has occurred, a value of -1 is returned and errno is set to
      indicate the error.
 
 ERRORS
      ioctl() will fail if:
 
-     [EBADF]       d is not a valid descriptor.
+     [EBADF]            d is not a valid descriptor.
 
-     [ENOTTY]      d is not associated with a character special device.
+     [ENOTTY]           d is not associated with a character special device.
 
-     [ENOTTY]      The specified request does not apply to the kind of object
-                   that the descriptor d references.
+     [ENOTTY]           The specified request does not apply to the kind of
+                        object that the descriptor d references.
 
-     [EINVAL]      request or arg is not valid.
+     [EINVAL]           request or arg is not valid.
 
-     [EFAULT]      arg points outside the process's allocated address space.
+     [EFAULT]           arg points outside the process's allocated address
+                        space.
 
 SEE ALSO
-     cdio(1),  chio(1),  mt(1),  execve(2),  fcntl(2),  intro(4),  tty(4)
+     cdio(1), chio(1), mt(1), execve(2), fcntl(2), intro(4), tty(4)
 
 HISTORY
      An ioctl() function call appeared in Version 7 AT&amp;T UNIX.
 
-BSD Experimental               December 11, 1993                             1
+BSD                            December 11, 1993                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="POLL">
-    <title>POLL</title>
+  <sect1 id="net-common-tcpip-manpages-poll">
+    <title>poll</title>
     <screen>
-
-POLL(2)                   System Programmer's Manual                   POLL(2)
+POLL(2)                       System Calls Manual                      POLL(2)
 
 NAME
      poll - synchronous I/O multiplexing
 
 SYNOPSIS
      #include &lt;poll.h>
 
      int
-     poll(struct pollfd *fds, int nfds, int timeout)
+     poll(struct pollfd *fds, int nfds, int timeout);
 
 DESCRIPTION
      poll() provides a mechanism for reporting I/O conditions across a set of
      file descriptors.
 
@@ -3397,12 +3340,12 @@ DESCRIPTION
 
      nfds     The number of pollfd structures in the array.
 
      timeout  Maximum interval to wait for the poll to complete, in millisec-
               onds.  If this value is 0, then poll() will return immediately.
-              If this value is INFTIM (-1), poll() will block indefinitely un-
-              til a condition is found.
+              If this value is INFTIM (-1), poll() will block indefinitely
+              until a condition is found.
 
      The calling process sets the events bitmask and poll() sets the revents
      bitmask.  Each call to poll() resets the revents bitmask for accuracy.
      The condition flags in the bitmasks are defined as:
 
@@ -3427,11 +3370,10 @@ DESCRIPTION
 
      POLLRDBAND  Same as POLLIN.
 
      POLLWRNORM  Same as POLLOUT.
 
-
      POLLWRBAND  Same as POLLOUT.
 
      POLLMSG     This flag is not used in this implementation and is provided
                  only for source code compatibility.
 
@@ -3442,18 +3384,18 @@ DESCRIPTION
      In addition to I/O multiplexing, poll() can be used to generate simple
      timeouts.  This functionality may be achieved by passing a null pointer
      for fds.
 
 WARNINGS
-     The POLLHUP flag is only a close approximation and may not always be ac-
-     curate.
+     The POLLHUP flag is only a close approximation and may not always be
+     accurate.
 
 RETURN VALUES
-     Upon error, poll() returns a -1 and sets the global variable errno to in-
-     dicate the error.  If the timeout interval was reached before any events
-     occurred, a 0 is returned.  Otherwise, poll() returns the number of file
-     descriptors for which revents is non-zero.
+     Upon error, poll() returns a -1 and sets the global variable errno to
+     indicate the error.  If the timeout interval was reached before any
+     events occurred, a 0 is returned.  Otherwise, poll() returns the number
+     of file descriptors for which revents is non-zero.
 
 ERRORS
      poll() will fail if:
 
      [EINVAL]   nfds was either a negative number or greater than the number
@@ -3468,24 +3410,23 @@ ERRORS
                 to poll() may succeed.
 
      [EINTR]    poll() caught a signal during the polling process.
 
 SEE ALSO
-     poll(2),  select(2),  sysconf(3)
+     poll(2), select(2), sysconf(3)
 
 HISTORY
      A poll() system call appeared in AT&amp;T System V UNIX.
 
-BSD Experimental               December 13, 1994                             2
+BSD                            December 13, 1994                           BSD
     </screen>
   </sect1>
 
-  <sect1 id="SELECT">
-    <title>SELECT</title>
+  <sect1 id="net-common-tcpip-manpages-select">
+    <title>select</title>
     <screen>
-
-SELECT(2)                 System Programmer's Manual                 SELECT(2)
+SELECT(2)                     System Calls Manual                    SELECT(2)
 
 NAME
      select - synchronous I/O multiplexing
 
 SYNOPSIS
@@ -3493,19 +3434,19 @@ SYNOPSIS
      #include &lt;sys/time.h>
      #include &lt;unistd.h>
 
      int
      select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-             struct timeval *timeout)
+             struct timeval *timeout);
 
-     FD_SET(fd, &amp;fdset)
+     FD_SET(fd, &amp;fdset);
 
-     FD_CLR(fd, &amp;fdset)
+     FD_CLR(fd, &amp;fdset);
 
-     FD_ISSET(fd, &amp;fdset)
+     FD_ISSET(fd, &amp;fdset);
 
-     FD_ZERO(&amp;fdset)
+     FD_ZERO(&amp;fdset);
 
 DESCRIPTION
      select() examines the I/O descriptor sets whose addresses are passed in
      readfds, writefds, and exceptfds to see if some of their descriptors are
      ready for reading, are ready for writing, or have an exceptional condi-
@@ -3518,12 +3459,12 @@ DESCRIPTION
 
      The descriptor sets are stored as bit fields in arrays of integers.  The
      following macros are provided for manipulating such descriptor sets:
      FD_ZERO(&amp;fdset) initializes a descriptor set fdset to the null set.
      FD_SET(fd, &amp;fdset) includes a particular descriptor fd in fdset.
-     FD_CLR(fd, &amp;fdset) removes fd from fdset. FD_ISSET(fd, &amp;fdset) is non-ze-
-     ro if fd is a member of fdset, zero otherwise.  The behavior of these
+     FD_CLR(fd, &amp;fdset) removes fd from fdset.  FD_ISSET(fd, &amp;fdset) is non-
+     zero if fd is a member of fdset, zero otherwise.  The behavior of these
      macros is undefined if a descriptor value is less than zero or greater
      than or equal to FD_SETSIZE, which is normally at least equal to the max-
      imum number of descriptors supported by the system.
 
      If timeout is a non-null pointer, it specifies a maximum interval to wait
@@ -3536,32 +3477,33 @@ DESCRIPTION
      Any of readfds, writefds, and exceptfds may be given as null pointers if
      no descriptors are of interest.
 
 RETURN VALUES
      select() returns the number of ready descriptors that are contained in
-     the descriptor sets, or -1 is an error occurred.  If the time limit ex-
-     pires, select() returns 0.  If select() returns with an error, including
-     one due to an interrupted call, the descriptor sets will be unmodified.
+     the descriptor sets, or -1 is an error occurred.  If the time limit
+     expires, select() returns 0.  If select() returns with an error, includ-
+     ing one due to an interrupted call, the descriptor sets will be unmodi-
+     fied.
 
 ERRORS
      An error return from select() indicates:
 
-     [EFAULT]      One or more of readfds, writefds, or exceptfds points out-
+     [EFAULT]           One or more of readfds, writefds, or exceptfds points
+                        outside the process's allocated address space.
 
-                   side the process's allocated address space.
+     [EBADF]            One of the descriptor sets specified an invalid
+                        descriptor.
 
-     [EBADF]       One of the descriptor sets specified an invalid descriptor.
+     [EINTR]            A signal was delivered before the time limit expired
+                        and before any of the selected events occurred.
 
-     [EINTR]       A signal was delivered before the time limit expired and
-                   before any of the selected events occurred.
-
-     [EINVAL]      The specified time limit is invalid.  One of its components
-                   is negative or too large.
+     [EINVAL]           The specified time limit is invalid.  One of its com-
+                        ponents is negative or too large.
 
 SEE ALSO
-     accept(2),  connect(2),  gettimeofday(2),  poll(2),  read(2),  recv(2),
-     send(2),  write(2),  getdtablesize(3)
+     accept(2), connect(2), gettimeofday(2), poll(2), read(2), recv(2),
+     send(2), write(2), getdtablesize(3)
 
 BUGS
      Although the provision of getdtablesize(3) was intended to allow user
      programs to be written independent of the kernel limit on the number of
      open files, the dimension of a sufficiently large bit field for select
@@ -3569,16 +3511,16 @@ BUGS
      FD_SETSIZE (currently 256), but that is somewhat smaller than the current
      kernel limit to the number of open files.  However, in order to accommo-
      date programs which might potentially use a larger number of open files
      with select, it is possible to increase this size within a program by
      providing a larger definition of FD_SETSIZE before the inclusion of
-     &lt;sys/types.h>. The kernel will cope, and the userland libraries provided
+     &lt;sys/types.h>.  The kernel will cope, and the userland libraries provided
      with the system are also ready for large numbers of file descriptors.
 
      Alternatively, to be really safe, it is possible to allocate fd_set bit-
      arrays dynamically.  The idea is to permit a program to work properly
-     even if it is execve(2)'d  with 4000 file descriptors pre-allocated.  The
+     even if it is execve(2)'d with 4000 file descriptors pre-allocated.  The
      following illustrates the technique which is used by userland libraries:
 
                    fd_set *fdsr;
                    int max = fd;
 
@@ -3598,12 +3540,12 @@ BUGS
      large, and for fixed numbers of file descriptors one need not size and
      dynamically allocate a memory object.
 
      select() should probably have been designed to return the time remaining
      from the original timeout, if any, by modifying the time value in place.
-     Even though some systems stupidly act in this different way, it is un-
-     likely this semantic will ever be commonly implemented, as the change
+     Even though some systems stupidly act in this different way, it is
+     unlikely this semantic will ever be commonly implemented, as the change
      causes massive source code compatibility problems.  Furthermore, recent
      new standards have dictated the current behaviour.  In general, due to
      the existence of those brain-damaged non-conforming systems, it is unwise
      to assume that the timeout value will be unmodified by the select() call,
      and the caller should reinitialize it on each invocation.  Calculating
@@ -3615,49 +3557,48 @@ BUGS
      see that many daemons are written that way (i.e., httpd(8)).
 
 HISTORY
      The select() function call appeared in 4.2BSD.
 
-BSD Experimental                March 25, 1994                               3
+BSD                             March 25, 1994                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="SEND">
-    <title>SEND</title>
+  <sect1 id="net-common-tcpip-manpages-send">
+    <title>send</title>
     <screen>
-
-SEND(2)                   System Programmer's Manual                   SEND(2)
+SEND(2)                       System Calls Manual                      SEND(2)
 
 NAME
      send, sendto, sendmsg - send a message from a socket
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      ssize_t
-     send(int s, const void *msg, size_t len, int flags)
+     send(int s, const void *msg, size_t len, int flags);
 
      ssize_t
      sendto(int s, const void *msg, size_t len, int flags,
-             const struct sockaddr *to, socklen_t tolen)
+             const struct sockaddr *to, socklen_t tolen);
 
      ssize_t
-     sendmsg(int s, const struct msghdr *msg, int flags)
+     sendmsg(int s, const struct msghdr *msg, int flags);
 
 DESCRIPTION
      send(), sendto(), and sendmsg() are used to transmit a message to another
      socket.  send() may be used only when the socket is in a connected state,
      while sendto() and sendmsg() may be used at any time.
 
      The address of the target is given by to with tolen specifying its size.
-     The length of the message is given by len. If the message is too long to
+     The length of the message is given by len.  If the message is too long to
      pass atomically through the underlying protocol, the error EMSGSIZE is
      returned, and the message is not transmitted.
 
-     No indication of failure to deliver is implicit in a send().  Locally de-
-     tected errors are indicated by a return value of -1.
+     No indication of failure to deliver is implicit in a send().  Locally
+     detected errors are indicated by a return value of -1.
 
      If no messages space is available at the socket to hold the message to be
      transmitted, then send() normally blocks, unless the socket has been
      placed in non-blocking I/O mode.  The select(2) or poll(2) system calls
      may be used to determine when it is possible to send more data.
@@ -3666,162 +3607,159 @@ DESCRIPTION
 
      #define MSG_OOB        0x1  /* process out-of-band data */
      #define MSG_DONTROUTE  0x4  /* bypass routing, use direct interface */
 
      The flag MSG_OOB is used to send ``out-of-band'' data on sockets that
-     support this notion (e.g., SOCK_STREAM); the underlying protocol must al-
-     so support ``out-of-band'' data.  MSG_DONTROUTE is usually used only by
+     support this notion (e.g., SOCK_STREAM); the underlying protocol must
+     also support ``out-of-band'' data.  MSG_DONTROUTE is usually used only by
      diagnostic or routing programs.
 
      See recv(2) for a description of the msghdr structure.
 
 RETURN VALUES
-     The call returns the number of characters sent, or -1 if an error oc-
-     curred.
+     The call returns the number of characters sent, or -1 if an error
+     occurred.
 
 ERRORS
      send(), sendto(), and sendmsg() fail if:
 
-     [EBADF]       An invalid descriptor was specified.
+     [EBADF]            An invalid descriptor was specified.
 
-     [ENOTSOCK]    The argument s is not a socket.
+     [ENOTSOCK]         The argument s is not a socket.
 
-     [EFAULT]      An invalid user space address was specified for a parame-
-                   ter.
+     [EFAULT]           An invalid user space address was specified for a
+                        parameter.
 
-     [EMSGSIZE]    The socket requires that message be sent atomically, and
+     [EMSGSIZE]         The socket requires that message be sent atomically,
+                        and the size of the message to be sent made this
+                        impossible.
 
-                   the size of the message to be sent made this impossible.
+     [EAGAIN]           The socket is marked non-blocking and the requested
+                        operation would block.
 
-     [EAGAIN]      The socket is marked non-blocking and the requested opera-
-                   tion would block.
+     [ENOBUFS]          The system was unable to allocate an internal buffer.
+                        The operation may succeed when buffers become avail-
+                        able.
 
-     [ENOBUFS]     The system was unable to allocate an internal buffer.  The
-                   operation may succeed when buffers become available.
+     [ENOBUFS]          The output queue for a network interface was full.
+                        This generally indicates that the interface has
+                        stopped sending, but may be caused by transient con-
+                        gestion.
 
-     [ENOBUFS]     The output queue for a network interface was full.  This
-                   generally indicates that the interface has stopped sending,
-                   but may be caused by transient congestion.
+     [EACCES]           The SO_BROADCAST option is not set on the socket, and
+                        a broadcast address was given as the destination.
 
-     [EACCES]      The SO_BROADCAST option is not set on the socket, and a
-                   broadcast address was given as the destination.
+     [EHOSTUNREACH]     The destination address specified an unreachable host.
 
-     [EHOSTUNREACH]
-                   The destination address specified an unreachable host.
+     [EINVAL]           The flags parameter is invalid.
 
-     [EINVAL]      The flags parameter is invalid.
+     [EHOSTDOWN]        The destination address specified a host that is down.
 
-     [EHOSTDOWN]   The destination address specified a host that is down.
+     [ENETDOWN]         The destination address specified a network that is
+                        down.
 
-     [ENETDOWN]    The destination address specified a network that is down.
+     [ECONNREFUSED]     The destination host rejected the message (or a previ-
+                        ous one).  This error can only be returned by con-
+                        nected sockets.
 
-     [ECONNREFUSED]
-                   The destination host rejected the message (or a previous
-                   one).  This error can only be returned by connected sock-
-                   ets.
+     [ENOPROTOOPT]      There was a problem sending the message.  This error
+                        can only be returned by connected sockets.
 
-     [ENOPROTOOPT]
-                   There was a problem sending the message.  This error can
-                   only be returned by connected sockets.
+     [EDESTADDRREQ]     The socket is not connected, and no destination
+                        address was specified.
 
-     [EDESTADDRREQ]
-                   The socket is not connected, and no destination address was
-                   specified.
-
-     [EISCONN]     The socket is already connected, and a destination address
-                   was specified.
+     [EISCONN]          The socket is already connected, and a destination
+                        address was specified.
 
      In addition, send() and sendto() may return the following error:
 
-     [EINVAL]      len was larger than SSIZE_MAX.
+     [EINVAL]           len was larger than SSIZE_MAX.
 
      Also, sendmsg() may return the following errors:
 
-     [EINVAL]      The sum of the iov_len values in the msg_iov array over-
-                   flowed an ssize_t.
+     [EINVAL]           The sum of the iov_len values in the msg_iov array
+                        overflowed an ssize_t.
 
-     [EMSGSIZE]    The msg_iovlen member of msg was less than 0 or larger than
-                   IOV_MAX.
+     [EMSGSIZE]         The msg_iovlen member of msg was less than 0 or larger
+                        than IOV_MAX.
 
-     [EAFNOSUPPORT]
-                   Addresses in the specified address family cannot be used
-                   with this socket.
+     [EAFNOSUPPORT]     Addresses in the specified address family cannot be
+                        used with this socket.
 
 SEE ALSO
-     fcntl(2),  getsockopt(2),  poll(2),  recv(2),  select(2),  poll(2),
-     socket(2),  write(2)
+     fcntl(2), getsockopt(2), poll(2), recv(2), select(2), poll(2), socket(2),
+     write(2)
 
 HISTORY
      The send() function call appeared in 4.2BSD.
 
-BSD Experimental                 July 28, 1998                               2
+BSD                              July 28, 1998                             BSD
     </screen>
   </sect1>
 
-  <sect1 id="SHUTDOWN">
-    <title>SHUTDOWN</title>
+  <sect1 id="net-common-tcpip-manpages-shutdown">
+    <title>shutdown</title>
     <screen>
-
-SHUTDOWN(2)               System Programmer's Manual               SHUTDOWN(2)
+SHUTDOWN(2)                   System Calls Manual                  SHUTDOWN(2)
 
 NAME
      shutdown - shut down part of a full-duplex connection
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     shutdown(int s, int how)
+     shutdown(int s, int how);
 
 DESCRIPTION
      The shutdown() call causes all or part of a full-duplex connection on the
-     socket associated with s to be shut down.  If how is SHUT_RD, further re-
-     ceives will be disallowed.  If how is SHUT_WR, further sends will be dis-
-     allowed.  If how is SHUT_RDWR, further sends and receives will be disal-
-     lowed.
+     socket associated with s to be shut down.  If how is SHUT_RD, further
+     receives will be disallowed.  If how is SHUT_WR, further sends will be
+     disallowed.  If how is SHUT_RDWR, further sends and receives will be dis-
+     allowed.
 
 RETURN VALUES
      A 0 is returned if the call succeeds, -1 if it fails.
 
 ERRORS
      The call succeeds unless:
 
-     [EINVAL]      how is not SHUT_RD, SHUT_WR, or SHUT_RDWR.
+     [EINVAL]           how is not SHUT_RD, SHUT_WR, or SHUT_RDWR.
 
-     [EBADF]       s is not a valid descriptor.
+     [EBADF]            s is not a valid descriptor.
 
-     [ENOTSOCK]    s is a file, not a socket.
+     [ENOTSOCK]         s is a file, not a socket.
 
-     [ENOTCONN]    The specified socket is not connected.
+     [ENOTCONN]         The specified socket is not connected.
 
 SEE ALSO
-     connect(2),  socket(2)
+     connect(2), socket(2)
 
 HISTORY
-     The shutdown() function call appeared in 4.2BSD. The how arguments used
-     to be simply 0, 1, and 2, but now have named values as specified by .
+     The shutdown() function call appeared in 4.2BSD.  The how arguments used
+     to be simply 0, 1, and 2, but now have named values as specified by
+     X/Open Portability Guide Issue 4 (``XPG4'').
 
-BSD Experimental                 June 4, 1993                                1
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="SOCKET">
-    <title>SOCKET</title>
+  <sect1 id="net-common-tcpip-manpages-socket">
+    <title>socket</title>
     <screen>
-
-SOCKET(2)                 System Programmer's Manual                 SOCKET(2)
+SOCKET(2)                     System Calls Manual                    SOCKET(2)
 
 NAME
      socket - create an endpoint for communication
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     socket(int domain, int type, int protocol)
+     socket(int domain, int type, int protocol);
 
 DESCRIPTION
      socket() creates an endpoint for communication and returns a descriptor.
 
      The domain parameter specifies a communications domain within which com-
@@ -3845,21 +3783,21 @@ DESCRIPTION
            SOCK_RAW
            SOCK_SEQPACKET
            SOCK_RDM
 
      A SOCK_STREAM type provides sequenced, reliable, two-way connection based
-     byte streams.  An out-of-band data transmission mechanism may be support-
-     ed.  A SOCK_DGRAM socket supports datagrams (connectionless, unreliable
-     messages of a fixed (typically small) maximum length).  A SOCK_SEQPACKET
-     socket may provide a sequenced, reliable, two-way connection-based data
-     transmission path for datagrams of fixed maximum length; a consumer may
-     be required to read an entire packet with each read system call.  This
-     facility is protocol specific, and presently implemented only for PF_NS.
-     SOCK_RAW sockets provide access to internal network protocols and inter-
-     faces.  The types SOCK_RAW, which is available only to the superuser, and
-     SOCK_RDM, which is planned, but not yet implemented, are not described
-     here.
+     byte streams.  An out-of-band data transmission mechanism may be sup-
+     ported.  A SOCK_DGRAM socket supports datagrams (connectionless, unreli-
+     able messages of a fixed (typically small) maximum length).  A
+     SOCK_SEQPACKET socket may provide a sequenced, reliable, two-way connec-
+     tion-based data transmission path for datagrams of fixed maximum length;
+     a consumer may be required to read an entire packet with each read system
+     call.  This facility is protocol specific, and presently implemented only
+     for PF_NS.  SOCK_RAW sockets provide access to internal network protocols
+     and interfaces.  The types SOCK_RAW, which is available only to the supe-
+     ruser, and SOCK_RDM, which is planned, but not yet implemented, are not
+     described here.
 
      The protocol specifies a particular protocol to be used with the socket.
      Normally only a single protocol exists to support a particular socket
      type within a given protocol family.  However, it is possible that many
      protocols may exist, in which case a particular protocol must be speci-
@@ -3872,143 +3810,141 @@ DESCRIPTION
      pipes.  A stream socket must be in a connected state before any data may
      be sent or received on it.  A connection to another socket is created
      with a connect(2) call.  Once connected, data may be transferred using
      read(2) and write(2) calls or some variant of the send(2) and recv(2)
      calls.  When a session has been completed a close(2) may be performed.
-     Out-of-band data may also be transmitted as described in send(2) and re-
-     ceived as described in recv(2).
+     Out-of-band data may also be transmitted as described in send(2) and
+     received as described in recv(2).
 
      The communications protocols used to implement a SOCK_STREAM ensure that
      data is not lost or duplicated.  If a piece of data for which the peer
      protocol has buffer space cannot be successfully transmitted within a
      reasonable length of time, then the connection is considered broken and
      calls will indicate an error with -1 returns and with ETIMEDOUT as the
-     specific code in the global variable errno. The protocols optionally keep
-     sockets ``warm'' by forcing transmissions roughly every minute in the ab-
-     sence of other activity.  An error is then indicated if no response can
-     be elicited on an otherwise idle connection for a extended period (e.g.,
-     5 minutes).  A SIGPIPE signal is raised if a process sends on a broken
-     stream; this causes naive processes, which do not handle the signal, to
-     exit.
+     specific code in the global variable errno.  The protocols optionally
+     keep sockets ``warm'' by forcing transmissions roughly every minute in
+     the absence of other activity.  An error is then indicated if no response
+     can be elicited on an otherwise idle connection for a extended period
+     (e.g., 5 minutes).  A SIGPIPE signal is raised if a process sends on a
+     broken stream; this causes naive processes, which do not handle the sig-
+     nal, to exit.
 
      SOCK_SEQPACKET sockets employ the same system calls as SOCK_STREAM sock-
      ets.  The only difference is that read(2) calls will return only the
      amount of data requested, and any remaining in the arriving packet will
      be discarded.
 
      SOCK_DGRAM and SOCK_RAW sockets allow sending of datagrams to correspon-
      dents named in send(2) calls.  Datagrams are generally received with
-     recvfrom(2),  which returns the next datagram with its return address.
+     recvfrom(2), which returns the next datagram with its return address.
 
      An fcntl(2) call can be used to specify a process group to receive a
      SIGURG signal when the out-of-band data arrives.  It may also enable non-
      blocking I/O and asynchronous notification of I/O events via SIGIO.
 
-     The operation of sockets is controlled by socket level options. These op-
-     tions are defined in the file &lt;sys/socket.h>. setsockopt(2) and getsock-
-     opt(2) are used to set and get options, respectively.
+     The operation of sockets is controlled by socket level options.  These
+     options are defined in the file &lt;sys/socket.h>.  setsockopt(2) and
+     getsockopt(2) are used to set and get options, respectively.
 
 RETURN VALUES
-     A -1 is returned if an error occurs, otherwise the return value is a de-
-     scriptor referencing the socket.
+     A -1 is returned if an error occurs, otherwise the return value is a
+     descriptor referencing the socket.
 
 ERRORS
      The socket() call fails if:
 
-     [EPROTONOSUPPORT]
-                   The protocol type or the specified protocol is not support-
-                   ed within this domain.
+     [EPROTONOSUPPORT]  The protocol type or the specified protocol is not
+                        supported within this domain.
 
-     [EMFILE]      The per-process descriptor table is full.
+     [EMFILE]           The per-process descriptor table is full.
 
-     [ENFILE]      The system file table is full.
+     [ENFILE]           The system file table is full.
 
-     [EACCES]      Permission to create a socket of the specified type and/or
-                   protocol is denied.
+     [EACCES]           Permission to create a socket of the specified type
+                        and/or protocol is denied.
 
-     [ENOBUFS]     Insufficient buffer space is available.  The socket cannot
-                   be created until sufficient resources are freed.
+     [ENOBUFS]          Insufficient buffer space is available.  The socket
+                        cannot be created until sufficient resources are
+                        freed.
 
 SEE ALSO
-     accept(2),  bind(2),  connect(2),  getsockname(2),  getsockopt(2),
-     ioctl(2),  listen(2),  poll(2),  read(2),  recv(2),  select(2),  send(2),
-      setsockopt(2),  shutdown(2),  socketpair(2),  write(2),  getprotoent(3),
-      netintro(4)
+     accept(2), bind(2), connect(2), getsockname(2), getsockopt(2), ioctl(2),
+     listen(2), poll(2), read(2), recv(2), select(2), send(2), setsockopt(2),
+     shutdown(2), socketpair(2), write(2), getprotoent(3), netintro(4)
 
      An Introductory 4.3 BSD Interprocess Communication Tutorial, reprinted in
      UNIX Programmer's Supplementary Documents Volume 1.
 
      BSD Interprocess Communication Tutorial, reprinted in UNIX Programmer's
      Supplementary Documents Volume 1.
 
 HISTORY
      The socket() function call appeared in 4.2BSD.
 
-BSD Experimental                 June 4, 1993                                3
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
-  <sect1 id="SOCKETPAIR">
-    <title>SOCKETPAIR</title>
+  <sect1 id="net-common-tcpip-manpages-socketpair">
+    <title>socketpair</title>
     <screen>
-
-SOCKETPAIR(2)             System Programmer's Manual             SOCKETPAIR(2)
+SOCKETPAIR(2)                 System Calls Manual                SOCKETPAIR(2)
 
 NAME
      socketpair - create a pair of connected sockets
 
 SYNOPSIS
      #include &lt;sys/types.h>
      #include &lt;sys/socket.h>
 
      int
-     socketpair(int d, int type, int protocol, int *sv)
+     socketpair(int d, int type, int protocol, int *sv);
 
 DESCRIPTION
      The socketpair() call creates an unnamed pair of connected sockets in the
      specified domain d, of the specified type, and using the optionally spec-
-     ified protocol. The descriptors used in referencing the new sockets are
-     returned in sv[0] and sv[1]. The two sockets are indistinguishable.
+     ified protocol.  The descriptors used in referencing the new sockets are
+     returned in sv[0] and sv[1].  The two sockets are indistinguishable.
 
 RETURN VALUES
      A 0 is returned if the call succeeds, -1 if it fails.
 
 ERRORS
      The call succeeds unless:
 
-     [EMFILE]      Too many descriptors are in use by this process.
+     [EMFILE]           Too many descriptors are in use by this process.
 
-     [EAFNOSUPPORT]
-                   The specified address family is not supported on this ma-
-                   chine.
+     [EAFNOSUPPORT]     The specified address family is not supported on this
+                        machine.
 
-     [EPROTONOSUPPORT]
-                   The specified protocol is not supported on this machine.
+     [EPROTONOSUPPORT]  The specified protocol is not supported on this
+                        machine.
 
-     [EOPNOTSUPP]  The specified protocol does not support creation of socket
-                   pairs.
+     [EOPNOTSUPP]       The specified protocol does not support creation of
+                        socket pairs.
 
-     [EFAULT]      The address sv does not specify a valid part of the process
-                   address space.
+     [EFAULT]           The address sv does not specify a valid part of the
+                        process address space.
 
-     [ENFILE]      The system file table is full.
+     [ENFILE]           The system file table is full.
 
 SEE ALSO
-     pipe(2),  read(2),  write(2)
+     pipe(2), read(2), write(2)
 
 BUGS
      This call is currently implemented only for the LOCAL domain.  Many oper-
      ating systems only accept a protocol of PF_UNSPEC, so that should be used
      instead of PF_LOCAL for maximal portability.
 
 STANDARDS
-     The socketpair() function conforms to .
+     The socketpair() function conforms to X/Open Portability Guide Issue 4.2
+     (``XPG4.2'').
 
 HISTORY
      The socketpair() function call appeared in 4.2BSD.
 
-BSD Experimental                 June 4, 1993                                1
+BSD                              June 4, 1993                              BSD
     </screen>
   </sect1>
 
 
 </chapter>
Index: packages/net/ftpclient/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ftpclient/current/ChangeLog,v
retrieving revision 1.5
diff -u -5 -p -r1.5 ChangeLog
--- packages/net/ftpclient/current/ChangeLog	7 Aug 2002 08:00:33 -0000	1.5
+++ packages/net/ftpclient/current/ChangeLog	24 Feb 2003 06:47:05 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/ftpclient.cdl: Add doc link.
+
 2002-08-06  Andrew Lunn <andrew dot lunn at ascom dot ch>
 
 	* src/ftpclient.c: Send "quit" not "quit " to keep some servers
 	  happy.  Also deal with multi line replies correctly.
 	
Index: packages/net/ftpclient/current/cdl/ftpclient.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ftpclient/current/cdl/ftpclient.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 ftpclient.cdl
--- packages/net/ftpclient/current/cdl/ftpclient.cdl	23 May 2002 23:08:03 -0000	1.3
+++ packages/net/ftpclient/current/cdl/ftpclient.cdl	24 Feb 2003 06:47:05 -0000
@@ -64,10 +64,11 @@ cdl_package CYGPKG_NET_FTPCLIENT {
     requires      CYGPKG_NET
     description   "
         FTP client support. Provides ftp_put and ftp_get to put a file
         onto a remote FTP server and get a file from a remote server. 
         Only binary more is supported."
+    doc           ref/net-ftpclient.html
 
     compile       ftpclient.c
 
     cdl_component CYGPKG_NET_FTPCLIENT_OPTIONS {
         display "FTP client build options"
Index: packages/net/httpd/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/httpd/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/net/httpd/current/ChangeLog	14 Feb 2003 02:27:35 -0000	1.2
+++ packages/net/httpd/current/ChangeLog	24 Feb 2003 06:47:05 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/httpd.cdl: Add doc link.
+
 2003-02-14  Bob Koninckx  <bob dot koninckx at mech dot kuleuven dot ac dot be>
 
 	* include/httpd.h (html_end): fix typo.
 
 2002-12-06  Nick Garnett  <nickg at ecoscentric dot com>
Index: packages/net/httpd/current/cdl/httpd.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/httpd/current/cdl/httpd.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 httpd.cdl
--- packages/net/httpd/current/cdl/httpd.cdl	22 Dec 2002 11:09:01 -0000	1.1
+++ packages/net/httpd/current/cdl/httpd.cdl	24 Feb 2003 06:47:05 -0000
@@ -48,11 +48,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_HTTPD {
     display       "HTTP Daemon"
     parent        CYGPKG_NET
-#    doc           doc/index.html
+    doc           ref/net-httpd.html
     include_dir   cyg/httpd
     requires      CYGPKG_IO
     requires      { 0 != CYGINT_ISO_STDLIB_STRCONV }
     requires      { 0 != CYGINT_ISO_STDIO_FORMATTED_IO }
     requires      { 0 != CYGINT_ISO_STRING_STRFUNCS }
Index: packages/net/ns/dns/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ns/dns/current/ChangeLog,v
retrieving revision 1.11
diff -u -5 -p -r1.11 ChangeLog
--- packages/net/ns/dns/current/ChangeLog	22 Jan 2003 06:39:19 -0000	1.11
+++ packages/net/ns/dns/current/ChangeLog	24 Feb 2003 06:47:05 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/dns.cdl: Add doc link.
+
 2003-01-22  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* doc/dns.sgml: Use correct (and working!) docbook.
 
 2003-01-18  Jonathan Larmour  <jifl at eCosCentric dot com>
Index: packages/net/ns/dns/current/cdl/dns.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/ns/dns/current/cdl/dns.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 dns.cdl
--- packages/net/ns/dns/current/cdl/dns.cdl	18 Jan 2003 03:47:03 -0000	1.5
+++ packages/net/ns/dns/current/cdl/dns.cdl	24 Feb 2003 06:47:05 -0000
@@ -51,10 +51,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_NS_DNS {
     display       "DNS client"
     include_dir   cyg/ns/dns
+    doc           ref/net-ns-dns.html
 
     cdl_option CYGPKG_NS_DNS_BUILD {
         display       "Build DNS NS client package"
         default_value 1
         implements    CYGINT_ISO_DNS
Index: packages/net/snmp/agent/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/agent/current/ChangeLog,v
retrieving revision 1.23
diff -u -5 -p -r1.23 ChangeLog
--- packages/net/snmp/agent/current/ChangeLog	14 Feb 2003 18:28:49 -0000	1.23
+++ packages/net/snmp/agent/current/ChangeLog	24 Feb 2003 06:47:06 -0000
@@ -1,5 +1,12 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/snmpagent.cdl: Add doc link.
+
+	* doc/prepare-manpages.sh: Generate namespaced IDs, without shouting.
+	* doc/snmp-manpages.sgml: Regenerated.
+
 2003-02-14  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* cdl/snmpagent.cdl: Explicitly require OpenBSD stack since we don't
 	work with the FreeBSD stack yet.
 
Index: packages/net/snmp/agent/current/cdl/snmpagent.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/agent/current/cdl/snmpagent.cdl,v
retrieving revision 1.8
diff -u -5 -p -r1.8 snmpagent.cdl
--- packages/net/snmp/agent/current/cdl/snmpagent.cdl	14 Feb 2003 18:28:49 -0000	1.8
+++ packages/net/snmp/agent/current/cdl/snmpagent.cdl	24 Feb 2003 06:47:06 -0000
@@ -50,11 +50,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_SNMPAGENT {
     display       "SNMP agent"
     parent        CYGPKG_NET
-#    doc           doc/index.html
+    doc           ref/net-snmp-ecos-port.html
     include_dir   ucd-snmp
     requires      CYGPKG_IO
     requires      { 0 != CYGINT_ISO_STRING_STRFUNCS }
     requires      { 0 != CYGINT_ISO_STDLIB_STRCONV }
     requires      { 0 != CYGINT_ISO_STDIO_FORMATTED_IO }
Index: packages/net/snmp/agent/current/doc/prepare-manpages.sh
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/agent/current/doc/prepare-manpages.sh,v
retrieving revision 1.1
diff -u -5 -p -r1.1 prepare-manpages.sh
--- packages/net/snmp/agent/current/doc/prepare-manpages.sh	3 Feb 2003 16:34:45 -0000	1.1
+++ packages/net/snmp/agent/current/doc/prepare-manpages.sh	24 Feb 2003 06:47:07 -0000
@@ -18,15 +18,15 @@ echo >> snmp-manpages.sgml
 
 for manpage in $MANPAGE_LIST
 do
     echo "processing $manpage"
     # get the title for this section
-    manpage_title=`egrep '^\.TH' $manpage | awk '{print $2}'`
+    manpage_title=`egrep '^\.TH' $manpage | awk '{print $2}' | tr 'A-Z' 'a-z'`
     # note that _ is illegal in an id, so we canonicalize it to -
     docbook_section_id=`echo $manpage_title | sed 's/_/-/g'`
     # now prepare out a section and title
-    echo "  <sect1 id=\"$docbook_section_id\">" >> snmp-manpages.sgml
+    echo "  <sect1 id=\"net-snmp-agent-manpages-$docbook_section_id\">" >> snmp-manpages.sgml
     echo "    <title>$manpage_title</title>" >> snmp-manpages.sgml
     # we make it <screen> so that it is a monospaced font
     echo "    <screen>" >> snmp-manpages.sgml
 
     # now put the contents into this section
Index: packages/net/snmp/agent/current/doc/snmp-manpages.sgml
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/agent/current/doc/snmp-manpages.sgml,v
retrieving revision 1.1
diff -u -5 -p -r1.1 snmp-manpages.sgml
--- packages/net/snmp/agent/current/doc/snmp-manpages.sgml	3 Feb 2003 16:34:45 -0000	1.1
+++ packages/net/snmp/agent/current/doc/snmp-manpages.sgml	24 Feb 2003 06:47:07 -0000
@@ -2,12 +2,12 @@
 <!-- this file is automatically generated by the script -->
 <!--       ./prepare-manpages.sh      -->
 <!-- so PLEASE do not modify it: your changes will be lost -->
 
 
-  <sect1 id="SNMPD.CONF">
-    <title>SNMPD.CONF</title>
+  <sect1 id="net-snmp-agent-manpages-snmpd.conf">
+    <title>snmpd.conf</title>
     <screen>
 SNMPD.CONF(5)                                       SNMPD.CONF(5)
 
 
 
Index: packages/net/snmp/agent/current/doc/snmp.sgml
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/agent/current/doc/snmp.sgml,v
retrieving revision 1.5
diff -u -5 -p -r1.5 snmp.sgml
--- packages/net/snmp/agent/current/doc/snmp.sgml	14 Feb 2003 18:28:49 -0000	1.5
+++ packages/net/snmp/agent/current/doc/snmp.sgml	24 Feb 2003 06:47:07 -0000
@@ -300,11 +300,11 @@ in the usual way as with the standard UC
 </SECT2>
 <SECT2 id="Traps">
 <TITLE>Traps</TITLE>
 <PARA>
 The support of the <LITERAL>trapsink</LITERAL> command in the
-<link linkend="SNMPD.CONF">snmpd.conf</link> file is not tested 
+<link linkend="net-snmp-agent-manpages-snmpd.conf">snmpd.conf</link> file is not tested 
 and there may be problems for it working as expected. Moreover, in systems that do not 
 have filesystem support, there is no way to configure a trap-session in the
 conventional way.
 </PARA>
 <PARA>
@@ -344,11 +344,11 @@ if (trapsink.ip != 0) {
 Using snmpd.conf requires the inclusion of one of the file-system packages
 (eg. CYGPKG_RAMFS) and CYGPKG_FILEIO. With these two packages included, the
 SNMP sub-system will read the snmpd.conf file from the location specified in
 <LITERAL>SNMPCONFPATH</LITERAL>, or the standard builtin locations, and use
 these profiles. Only the profiles specified in the <LITERAL>ACCESS-CONTROL</LITERAL>
-section of <link linkend="SNMPD.CONF">snmpd.conf</link> file have 
+section of <link linkend="net-snmp-agent-manpages-snmpd.conf">snmpd.conf</link> file have 
 been tested and shown to work. Other profiles which have been implemented in 
 <LITERAL>UCD-SNMP-4.1.2</LITERAL>'s <LITERAL>snmpd.conf</LITERAL> may not work
 because the sole purpose of adding support for the snmpd.conf file has been to
 set up <LITERAL>ACCESS-CONTROL</LITERAL> models.
 </PARA>
Index: packages/net/snmp/lib/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/lib/current/ChangeLog,v
retrieving revision 1.9
diff -u -5 -p -r1.9 ChangeLog
--- packages/net/snmp/lib/current/ChangeLog	3 Feb 2003 16:34:45 -0000	1.9
+++ packages/net/snmp/lib/current/ChangeLog	24 Feb 2003 06:47:07 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/snmplib.cdl: Add doc link.
+
 2003-02-03  Manu Sharma <manu dot sharma at ascom dot com>
 
         * include/transform_oids.h,
         * src/keytools.c,
         * src/lcd_time.c,
Index: packages/net/snmp/lib/current/cdl/snmplib.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/snmp/lib/current/cdl/snmplib.cdl,v
retrieving revision 1.5
diff -u -5 -p -r1.5 snmplib.cdl
--- packages/net/snmp/lib/current/cdl/snmplib.cdl	3 Feb 2003 16:34:46 -0000	1.5
+++ packages/net/snmp/lib/current/cdl/snmplib.cdl	24 Feb 2003 06:47:07 -0000
@@ -50,11 +50,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_SNMPLIB {
     display       "SNMP library"
     parent        CYGPKG_NET
-#    doc           doc/index.html
+    doc           ref/net-snmp-ecos-port.html
     include_dir   ucd-snmp
     requires      CYGPKG_IO
     requires      { 0 != CYGINT_ISO_STRING_STRFUNCS }
     requires      { 0 != CYGINT_ISO_STRING_MEMFUNCS }
     requires      { 0 != CYGINT_ISO_STDLIB_STRCONV }
Index: packages/net/tcpip/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/tcpip/current/ChangeLog,v
retrieving revision 1.42
diff -u -5 -p -r1.42 ChangeLog
--- packages/net/tcpip/current/ChangeLog	30 Jan 2003 15:38:02 -0000	1.42
+++ packages/net/tcpip/current/ChangeLog	24 Feb 2003 06:47:09 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/openbsd_net.cdl: Improve doc links.
+
 2003-01-30  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* src/sys/net/if_bridge.c (bridge_input): Learn source host addr,
 	not dest host addr.
 	Fix pointed to by Daniel Néri.
Index: packages/net/tcpip/current/cdl/openbsd_net.cdl
===================================================================
RCS file: /cvs/ecos/ecos-opt/net/net/tcpip/current/cdl/openbsd_net.cdl,v
retrieving revision 1.1
diff -u -5 -p -r1.1 openbsd_net.cdl
--- packages/net/tcpip/current/cdl/openbsd_net.cdl	20 May 2002 22:25:15 -0000	1.1
+++ packages/net/tcpip/current/cdl/openbsd_net.cdl	24 Feb 2003 06:47:09 -0000
@@ -27,11 +27,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_NET_OPENBSD_STACK {
     display       "OpenBSD TCP/IP Stack"
     parent        CYGPKG_NET
-    doc           doc/index.html
+    doc           ref/tcpip-openbsd.html
     include_dir   .
     requires      CYGPKG_IO
     requires      CYGPKG_ISOINFRA
     requires      CYGINT_ISO_C_TIME_TYPES
     requires      CYGINT_ISO_STRERROR
Index: packages/pkgconf/rules.doc
===================================================================
RCS file: /cvs/ecos/ecos/packages/pkgconf/rules.doc,v
retrieving revision 1.6
diff -u -5 -p -r1.6 rules.doc
--- packages/pkgconf/rules.doc	18 Oct 2002 01:46:15 -0000	1.6
+++ packages/pkgconf/rules.doc	24 Feb 2003 06:47:09 -0000
@@ -51,11 +51,11 @@
 #       OTHER_SGML - any other .sgml files accessed from main
 #       PICTURES   - referenced by the SGML files
 #####DESCRIPTIONEND####
 #=============================================================================
 
-.PHONY: default check html pdf clean
+.PHONY: default check html pdf clean copyfiles
 
 # Locations of the stylesheets and other SGML support files. These
 # have moved around in various releases of the tools.
 ifneq (,$(wildcard /usr/share/sgml/docbook))
   CATALOG	:= /etc/sgml/catalog
@@ -97,20 +97,28 @@ PNGS :=$(foreach x,$(PICTURES),$(x).png)
 	convert -crop 0x0 $< $@
 
 %.eps: %.fig
 	convert -crop 0x0 $< $@
 
+# This is a little grotty. In some cases we want to just copy files from
+# their source location to the destination's current dir and nothing
+# more.
+copyfiles:
+ifneq (,$(COPYFILES))
+	cp $(COPYFILES) .
+endif
+
 default: check
 
 # Validating an sgml document can be achieved with
 check: $(MAIN_SGML) $(OTHER_SGML) $(GIFS) $(EPS)
 	nsgmls -vs -c $(CATALOG) $<
 
 # Generating HTML from the SGML. In practice multiple .html files may
 # be generated, but for the purposes of dependency analysis the others
 # can be ignored.
-html: $(MAIN_HTML)
+html: copyfiles $(MAIN_HTML)
 
 $(MAIN_HTML): $(MAIN_SGML) $(OTHER_SGML) $(GIFS) $(ECOS_STYLESHEET) $(FIXHTML)
 	jade -t sgml -i html -c $(DSSSL_CATALOG) -d $(ECOS_STYLESHEET)#html $<
 	tclsh $(FIXHTML)
 
Index: packages/redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.91
diff -u -5 -p -r1.91 ChangeLog
--- packages/redboot/current/ChangeLog	14 Feb 2003 16:31:39 -0000	1.91
+++ packages/redboot/current/ChangeLog	24 Feb 2003 06:47:11 -0000
@@ -1,5 +1,11 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* doc/redboot.sgml: De-vendorise a little.
+
+	* cdl/redboot.cdl: Add doc links.
+
 2003-02-14  Jonathan Larmour  <jifl at eCosCentric dot com>
 
 	* cdl/redboot.cdl: Put virtually all options inside
 	CYGBLD_BUILD_REDBOOT. And indent accordingly.
 
Index: packages/redboot/current/cdl/redboot.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/cdl/redboot.cdl,v
retrieving revision 1.44
diff -u -5 -p -r1.44 redboot.cdl
--- packages/redboot/current/cdl/redboot.cdl	14 Feb 2003 02:49:06 -0000	1.44
+++ packages/redboot/current/cdl/redboot.cdl	24 Feb 2003 06:47:12 -0000
@@ -49,10 +49,11 @@
 #####DESCRIPTIONEND####
 #
 # ====================================================================
 cdl_package CYGPKG_REDBOOT {
     display       "Redboot ROM monitor"
+    doc           ref/redboot.html
     define_header redboot.h
     description   "
            This package supports the Redboot \[stand-alone debug monitor\]
            using eCos as the underlying board support mechanism."
 
@@ -136,48 +137,55 @@ cdl_package CYGPKG_REDBOOT {
             compile       decompress.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_XYZMODEM {
             display       "Include support for xyzModem downloads"
+            doc           ref/download-command.html
             no_define
             default_value 1
             implements    CYGINT_REDBOOT_LOAD_METHOD
             compile -library=libextras.a xyzModem.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_CKSUM {
             display       "Include POSIX checksum command"
+            doc           ref/cksum-command.html
             default_value 1
             compile -library=libextras.a cksum.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_MFILL {
             display       "Include memory fill command"
+            doc           ref/mfill-command.html
             default_value 1
             compile -library=libextras.a mfill.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_MCMP {
             display       "Include memory compare command"
+            doc           ref/mcmp-command.html
             default_value 1
             compile -library=libextras.a mcmp.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_DUMP {
             display       "Include memory dump command"
+            doc           ref/dump-command.html
             default_value 1
             compile -library=libextras.a dump.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_CACHES {
             display       "Include cache command"
+            doc           ref/cache-command.html
             default_value 1
             compile -library=libextras.a caches.c
         }
 
         cdl_option CYGBLD_BUILD_REDBOOT_WITH_EXEC {
             display       "Include exec command"
+            doc           ref/exec-command.html
             default_value 1
             # Implemented within the platform HAL
         }
 
         no_define
@@ -461,10 +469,11 @@ cdl_package CYGPKG_REDBOOT {
             }
     
             cdl_option CYGOPT_REDBOOT_FIS {
                 display         "RedBoot Flash Image System support"
                 default_value   1
+                doc             ref/flash-image-system.html
                 description "
                     This option enables the Flash Image System commands
                     and support within RedBoot.  If disabled, simple Flash
                     access commands such as \"fis write\" will still exist.
                     This option would be disabled for targets that need simple
@@ -747,10 +756,11 @@ cdl_package CYGPKG_REDBOOT {
             }
         }
     
         cdl_component CYGPKG_REDBOOT_BOOT_SCRIPT {
             display         "Boot scripting"
+            doc             ref/persistent-state-flash.html
             flavor          none
             no_define
             description     "
                     This contains options related to RedBoot's boot script
                     functionality."
Index: packages/redboot/current/doc/redboot.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/doc/redboot.sgml,v
retrieving revision 1.4
diff -u -5 -p -r1.4 redboot.sgml
--- packages/redboot/current/doc/redboot.sgml	15 Sep 2002 21:45:31 -0000	1.4
+++ packages/redboot/current/doc/redboot.sgml	24 Feb 2003 06:47:12 -0000
@@ -85,16 +85,10 @@ system should refer to the <emphasis>Get
 document, which provides information about the portability and extendability
 of RedBoot in an eCos environment.</para>
 <sect1 id="redboot-on-the-web">
 <title>More information about RedBoot on the web</title>
 <para>
-Information about the RedBoot product, including information about
-details of porting,
-customization, training and technical support services from Red Hat, is
-available from the
-<ulink url="http://www.redhat.com/embedded/technologies/redboot/";>RedBoot
-Product web site</ulink>. </para>
 <para>The <ulink url="http://sources.redhat.com/redboot/";>RedBoot Net
 Distribution web site</ulink> contains downloadable sources and documentation
 for all publically released targets, including the latest features and updates.
 </para>
 </sect1>
Index: packages/services/cpuload/current/cdl/cpuload.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/cpuload/current/cdl/cpuload.cdl,v
retrieving revision 1.3
diff -u -5 -p -r1.3 cpuload.cdl
--- packages/services/cpuload/current/cdl/cpuload.cdl	21 Feb 2003 00:08:17 -0000	1.3
+++ packages/services/cpuload/current/cdl/cpuload.cdl	24 Feb 2003 06:47:12 -0000
@@ -59,10 +59,11 @@ cdl_package CYGPKG_CPULOAD {
     description "
        This package measures the CPU load over the last 100ms, 1second 
        and 10 second. All loads are returned as a percentage, ie 0-100.
        This is only a rough measure. Any clever power management, sleep 
        modes etc, will cause these results to be wrong."
+    doc           ref/services-cpuload.html
 
     cdl_option CYGPKG_CPULOAD_TESTS {
         display "CPU load measurement tests"
         flavor  data   
         no_define      
Index: packages/services/crc/current/cdl/crc.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/crc/current/cdl/crc.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 crc.cdl
--- packages/services/crc/current/cdl/crc.cdl	21 Feb 2003 00:08:23 -0000	1.2
+++ packages/services/crc/current/cdl/crc.cdl	24 Feb 2003 06:47:12 -0000
@@ -50,10 +50,11 @@
 # ====================================================================
 
 cdl_package CYGPKG_CRC {
     display       "Compute CRCs"
     include_dir   cyg/crc
+    doc           ref/services-crc.html
 
     compile       posix_crc.c crc16.c crc32.c
     description "
       This package provides support for CRC calculation. Currently 
       this is the POSIX 1003 defined CRC algorithm, a 32 CRC by 
Index: packages/services/gfx/mw/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/gfx/mw/current/ChangeLog,v
retrieving revision 1.1
diff -u -5 -p -r1.1 ChangeLog
--- packages/services/gfx/mw/current/ChangeLog	20 May 2002 22:25:28 -0000	1.1
+++ packages/services/gfx/mw/current/ChangeLog	24 Feb 2003 06:47:13 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/microwindows.cdl: There's no docs so don't supply CDL.
+
 2002-04-30  Bart Veer  <bartv at redhat dot com>
 
 	* cdl/microwindows.cdl:
 	Replace description properties with display properties.
 
Index: packages/services/gfx/mw/current/cdl/microwindows.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/gfx/mw/current/cdl/microwindows.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 microwindows.cdl
--- packages/services/gfx/mw/current/cdl/microwindows.cdl	23 May 2002 23:08:37 -0000	1.2
+++ packages/services/gfx/mw/current/cdl/microwindows.cdl	24 Feb 2003 06:47:13 -0000
@@ -49,11 +49,10 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_MICROWINDOWS {
     display       "MicroWindows"
-    doc           doc/index.html
     requires      CYGPKG_POSIX
     requires      CYGPKG_ISOINFRA
     requires      CYGINT_ISO_C_TIME_TYPES
     requires      CYGINT_ISO_STRERROR
     requires      CYGINT_ISO_ERRNO
Index: packages/services/power/common/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/power/common/current/ChangeLog,v
retrieving revision 1.2
diff -u -5 -p -r1.2 ChangeLog
--- packages/services/power/common/current/ChangeLog	23 May 2002 23:08:46 -0000	1.2
+++ packages/services/power/common/current/ChangeLog	24 Feb 2003 06:47:13 -0000
@@ -1,5 +1,12 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/power.cdl: Fix doc links for config tool's doc system.
+
+	* doc/power.sgml: Comment out DOCTYPE for now to allow building
+	with standard doc build.
+
 2001-11-21  Jonathan Larmour  <jlarmour at redhat dot com>
 
 	* include/power.h: Use a POWER_INLINE macro for "inline" to allow
 	non-inline versions to be defined when the C compiler chooses not to
 	inline.
Index: packages/services/power/common/current/cdl/power.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/power/common/current/cdl/power.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 power.cdl
--- packages/services/power/common/current/cdl/power.cdl	23 May 2002 23:08:46 -0000	1.2
+++ packages/services/power/common/current/cdl/power.cdl	24 Feb 2003 06:47:13 -0000
@@ -49,19 +49,19 @@
 #
 # ====================================================================
 
 cdl_package CYGPKG_POWER {
     display     "Generic power management support"
-    doc         services-power.html
+    doc         ref/services-power.html
     parent      CYGPKG_IO
     include_dir "cyg/power"
     compile     power.cxx
     compile     -library=libextras.a power_data.cxx
     
     cdl_option CYGIMP_POWER_PROVIDE_STRINGS {
 	display        "Provide a string for every power controller"
-	doc            power-info.html#POWER-MANAGEMENT-INFO_IDS
+	doc            ref/power-info.html#POWER-MANAGEMENT-INFO_IDS
 	default_value  1
 	description "
             Optionally each power controller can contain a string identifying
             the hardware or functionality it is associated with. This string
             is not required by the generic power management, but may be
@@ -70,11 +70,11 @@ cdl_package CYGPKG_POWER {
         "
     }
 
     cdl_option CYGIMP_POWER_PROVIDE_POLICY_DATA {
 	display        "Reserve space in each power controller for use by the policy manager"
-	doc            power-policy.html#POWER-POLICY-DATA
+	doc            ref/power-policy.html#POWER-POLICY-DATA
 	default_value  1
 	description "
 	    Optionally each power controller can provide a word of data
 	    for use by the policy manager, for example to store a pointer
 	    to some data structure controlled by the policy manager. If
@@ -83,11 +83,11 @@ cdl_package CYGPKG_POWER {
 	"
     }
     
     cdl_component CYGPKG_POWER_THREAD {
 	display        "Run a separate thread within the power management package"
-	doc            power-intro.html#POWER-INTRO-OPERATION
+	doc            ref/power-intro.html#POWER-INTRO-OPERATION
 	active_if      CYGPKG_KERNEL
 	default_value  1
 	description "
             Optionally the power management code can run in its own thread. This
             can be useful if state changes can be requested from any code,
Index: packages/services/power/common/current/doc/power.sgml
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/power/common/current/doc/power.sgml,v
retrieving revision 1.3
diff -u -5 -p -r1.3 power.sgml
--- packages/services/power/common/current/doc/power.sgml	15 Sep 2002 21:45:59 -0000	1.3
+++ packages/services/power/common/current/doc/power.sgml	24 Feb 2003 06:47:15 -0000
@@ -1,6 +1,6 @@
-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!-- DOCTYPE reference  PUBLIC "-//OASIS//DTD DocBook V3.1//EN" -->
 
 <!-- {{{ Banner                         -->
 
 <!-- =============================================================== -->
 <!--                                                                 -->
Index: packages/services/profile/gprof/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/profile/gprof/current/ChangeLog,v
retrieving revision 1.4
diff -u -5 -p -r1.4 ChangeLog
--- packages/services/profile/gprof/current/ChangeLog	15 Nov 2002 18:36:26 -0000	1.4
+++ packages/services/profile/gprof/current/ChangeLog	24 Feb 2003 06:47:15 -0000
@@ -1,5 +1,9 @@
+2003-02-24  Jonathan Larmour  <jifl at eCosCentric dot com>
+
+	* cdl/profile_gprof.cdl: Add doc link.
+
 2002-11-15  Gary Thomas  <gthomas at ecoscentric dot com>
 
 	* include/gmon_out.h: Import non-GPL version from OpenBSD.
 
 	* doc/profile.sgml: Improve description of host/client and
Index: packages/services/profile/gprof/current/cdl/profile_gprof.cdl
===================================================================
RCS file: /cvs/ecos/ecos/packages/services/profile/gprof/current/cdl/profile_gprof.cdl,v
retrieving revision 1.2
diff -u -5 -p -r1.2 profile_gprof.cdl
--- packages/services/profile/gprof/current/cdl/profile_gprof.cdl	15 Nov 2002 15:03:50 -0000	1.2
+++ packages/services/profile/gprof/current/cdl/profile_gprof.cdl	24 Feb 2003 06:47:15 -0000
@@ -53,10 +53,11 @@ cdl_package CYGPKG_PROFILE_GPROF {
     display       "Gather runtime profile statistics"
     requires      CYGPKG_NET
     requires      CYGPKG_NET_TFTP
     requires      CYGPKG_MEMALLOC   
     requires      { CYGINT_PROFILE_HAL_TIMER != 0 }
+    doc           ref/services-profile-gprof.html
 
     include_dir   cyg/profile
     
     compile profile.c
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]