--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,15 @@
+2003-11-22  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* sgml/doclist: Added ipsec packages documentation
+	* sgml/makemakefile: Added another set of man pages to the kludge.
+
+2003-11-08  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* sgml/user-guide/programming.sgml: Suggest Unix users may prefer
+	ecosconfig rather than the GUI.
+	* sgml/user-guide/makefile: Listed the other .sgml files so
+	dependency checking works
+	
 2003-09-11  Gary Thomas  <gary@mlbassoc.com>
 
 	* sgml/doclist: Add ethernet PHY documentation.

--- a/doc/sgml/doclist
+++ b/doc/sgml/doclist
@@ -17,6 +17,8 @@ net/common/current/doc/tcpip-manpages.sg
 net/bsd_tcpip/current/doc/freebsd.sgml
 net/tcpip/current/doc/openbsd.sgml
 net/ns/dns/current/doc/dns.sgml
+net/common/current/doc/ipsec.sgml
+net/ipsec/libipsec/current/doc/libipsec-manpages.sgml
 io/eth/current/doc/ethdrv.sgml
 devs/eth/phy/current/doc/eth_phy.sgml
 net/snmp/agent/current/doc/snmp.sgml

--- a/doc/sgml/makemakefile
+++ b/doc/sgml/makemakefile
@@ -209,7 +209,11 @@ for i in `cat ${doclist}`; do
   if (test ! -z $line); then
    entityi="`echo $i | sed 's@/@-@g; s@\.@-@g; s@_@-@g; s@-current-doc@@g; s@-current@@g'`"
    # special kludge
-   if [ "`basename $i`" != "tcpip-manpages.sgml" -a "`basename $i`" != "snmp-manpages.sgml" -a "`basename $i`" != "porting.sgml" ]; then
+   if [ "`basename $i`" != "tcpip-manpages.sgml" -a \
+	"`basename $i`" != "snmp-manpages.sgml" -a \
+	"`basename $i`" != "libipsec.sgml" -a \
+	"`basename $i`" != "libipsec-manpages.sgml" -a \
+	"`basename $i`" != "porting.sgml" ]; then
      echo "&$entityi;" >> ecos-ref.sgml
    fi
   fi

--- a/doc/sgml/user-guide/makefile
+++ b/doc/sgml/user-guide/makefile
@@ -46,7 +46,9 @@ TOPLEVEL   := ../../../packages
 MAIN_SGML  := user-guide.sgml
 MAIN_HTML  := ecos-user-guide.html
 MAIN_PDF   := ecos-user-guide.pdf
-OTHER_SGML :=
+OTHER_SGML := config-tool.sgml configuration.sgml ecos-license.sgml installation.sgml \
+	      introduction.sgml programming-concepts-techniques.sgml \
+	      programming.sgml real-time-characterization.sgml target-setup.sgml
 PICTURES   :=
 
 include $(TOPLEVEL)/pkgconf/rules.doc

--- a/doc/sgml/user-guide/programming.sgml
+++ b/doc/sgml/user-guide/programming.sgml
@@ -302,7 +302,12 @@ Configuration Tool on Windows and Linux 
 
 <PARA><!-- <conditionaltext> --> 
 
-Note that the use of the <application>Configuration Tool</application>
+This section described the GUI based configuration tool. This
+tool is probably more suited to users who prefer GUI's. The next
+section describes a CLI based tool which Unix users may
+prefer. </PARA>
+
+<PARA>Note that the use of the <application>Configuration Tool</application>
 is described in detail in <XREF
 LINKEND="THE-ECOS-CONFIGURATION-TOOL">.</PARA>
 
@@ -426,9 +431,11 @@ do not need to build the tests it is unn
 Ecosconfig on Windows and Linux Quick Start</TITLE>
 
 <PARA>As an alternative to using the graphical
-<application>Configuration Tool</application>, it is still possible to
+<application>Configuration Tool</application>, it is possible to
 configure and build a kernel by editing a configuration file manually
-and using the <command>ecosconfig</command> command. </PARA>
+and using the <command>ecosconfig</command> command. Users with a Unix
+background may find this tool more suitable than the GUI tool
+described in the previous section.</PARA>
 
 <para>
 Manual configuration and the <command>ecosconfig</command> command are