--- a/packages/net/snmp/agent/current/ChangeLog
+++ b/packages/net/snmp/agent/current/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-24  Jonathan Larmour  <jifl@eCosCentric.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@eCosCentric.com>
 
 	* cdl/snmpagent.cdl: Explicitly require OpenBSD stack since we don't

--- a/packages/net/snmp/agent/current/cdl/snmpagent.cdl
+++ b/packages/net/snmp/agent/current/cdl/snmpagent.cdl
@@ -52,7 +52,7 @@
 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 }

--- a/packages/net/snmp/agent/current/doc/prepare-manpages.sh
+++ b/packages/net/snmp/agent/current/doc/prepare-manpages.sh
@@ -20,11 +20,11 @@ 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

--- a/packages/net/snmp/agent/current/doc/snmp-manpages.sgml
+++ b/packages/net/snmp/agent/current/doc/snmp-manpages.sgml
@@ -4,8 +4,8 @@
 <!-- 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)
 

--- a/packages/net/snmp/agent/current/doc/snmp.sgml
+++ b/packages/net/snmp/agent/current/doc/snmp.sgml
@@ -302,7 +302,7 @@ in the usual way as with the standard UC
 <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.
@@ -346,7 +346,7 @@ Using snmpd.conf requires the inclusion 
 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