- Fix a couple of LaTeX escaping bugs.

- Fix urls in footnotes.
- Cleanup developers docs.
(This used to be commit d55b9f72ffbd0421cbde67915d9f275cc8956ed7)

17 files changed, 26 insertions, 477 deletions

diff --git a/docs/Makefile b/docs/Makefile
index f7f6ed5ff3..f0bd5bec2a 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -276,16 +276,16 @@ archive: pdf
 	cp $(PDFDIR)/Samba3-ByExample.pdf $(ARCHIVEDIR)/S3bE-$(DATETIME).pdf
 
 # XSL scripts
-xslt/html.xsl: xslt/html-common.xsl settings.xsl
-xslt/html-chunk.xsl: xslt/html-common.xsl settings.xsl
-xslt/latex.xsl: settings.xsl
-xslt/expand-sambadoc.xsl: settings.xsl
+xslt/html.xsl: xslt/html-common.xsl 
+xslt/html-chunk.xsl: xslt/html-common.xsl 
+xslt/latex.xsl: 
+xslt/expand-sambadoc.xsl: 
 xslt/generate-attributions.xsl: 
 xslt/man.xsl:
 xslt/pearson.xsl:
 
 clobber: clean
-	rm Makefile.settings settings.xsl config.status config.log configure
+	rm Makefile.settings config.status config.log configure
 
 clean: 
 	rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
diff --git a/docs/Samba3-ByExample/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
index b94c8d69e4..26c89bbcaf 100644
--- a/docs/Samba3-ByExample/SBE-500UserNetwork.xml
+++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml
@@ -1030,7 +1030,7 @@ hosts:      files dns wins
 <!-- Three -->
 <example id="ch5-commonsmb">
 <title>Common Samba Configuration File: <filename>/etc/samba/common.conf</filename></title>
-<smbconfblock
+<smbconfblock>
 <smbconfsection name="[global]"/>
 <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption>
 <smbconfoption name="log level">1</smbconfoption>
diff --git a/docs/Samba3-Developers-Guide/NetBIOS.xml b/docs/Samba3-Developers-Guide/NetBIOS.xml
deleted file mode 100644
index 04eaecd4ab..0000000000
--- a/docs/Samba3-Developers-Guide/NetBIOS.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<chapter id="netbios">
-<chapterinfo>
-	<author>
-		<firstname>Luke</firstname><surname>Leighton</surname>
-	</author>
-	<pubdate>12 June 1997</pubdate>
-</chapterinfo>
-
-<title>Definition of NetBIOS Protocol and Name Resolution Modes</title>
-
-<sect1>
-<title>NETBIOS</title>
-
-<para>
-NetBIOS runs over the following transports: TCP/IP; NetBEUI and IPX/SPX.
-Samba only uses NetBIOS over TCP/IP.  For details on the TCP/IP NetBIOS 
-Session Service NetBIOS Datagram Service, and NetBIOS Names, see
-rfc1001.txt and rfc1002.txt.
-</para>
-
-<para> 
-NetBEUI is a raw NetBIOS frame protocol implementation that allows NetBIOS
-datagrams to be sent out over the 'wire' embedded within LLC frames.
-NetBEUI is not required when using NetBIOS over TCP/IP protocols and it
-is preferable NOT to install NetBEUI if it can be avoided.
-</para>
-
-<para> 
-IPX/SPX is also not required when using NetBIOS over TCP/IP, and it is
-preferable NOT to install the IPX/SPX transport unless you are using Novell
-servers.  At the very least, it is recommended that you do not install
-'NetBIOS over IPX/SPX'.
-</para>
-
-<para>
-[When installing Windows 95, you will find that NetBEUI and IPX/SPX are
-installed as the default protocols.  This is because they are the simplest
-to manage: no Windows 95 user-configuration is required].
-</para>
-
-<para> 
-NetBIOS applications (such as samba) offer their services (for example,
-SMB file and print sharing) on a NetBIOS name.  They must claim this name
-on the network before doing so.  The NetBIOS session service will then
-accept connections on the application's behalf (on the NetBIOS name
-claimed by the application).  A NetBIOS session between the application
-and the client can then commence.
-</para>
-
-<para> 
-NetBIOS names consist of 15 characters plus a 'type' character.  This is
-similar, in concept, to an IP address and a TCP port number, respectively.
-A NetBIOS-aware application on a host will offer different services under
-different NetBIOS name types, just as a host will offer different TCP/IP
-services on different port numbers.
-</para>
-
-<para> 
-NetBIOS names must be claimed on a network, and must be defended.  The use
-of NetBIOS names is most suitable on a single subnet; a Local Area Network
-or a Wide Area Network.
-</para>
-
-<para> 
-NetBIOS names are either UNIQUE or GROUP.  Only one application can claim a
-UNIQUE NetBIOS name on a network.
-</para>
-
-<para>
-There are two kinds of NetBIOS Name resolution: Broadcast and Point-to-Point.
-</para>
-
-</sect1>
-
-<sect1>
-<title>BROADCAST NetBIOS</title>
-
-<para> 
-Clients can claim names, and therefore offer services on successfully claimed
-names, on their broadcast-isolated subnet.  One way to get NetBIOS services
-(such as browsing: see ftp.microsoft.com/drg/developr/CIFS/browdiff.txt; and
-SMB file/print sharing: see cifs4.txt) working on a LAN or WAN is to make
-your routers forward all broadcast packets from TCP/IP ports 137, 138 and 139.
-</para>
-
-<para> 
-This, however, is not recommended.  If you have a large LAN or WAN, you will
-find that some of your hosts spend 95 percent of their time dealing with
-broadcast traffic.  [If you have IPX/SPX on your LAN or WAN, you will find
-that this is already happening: a packet analyzer will show, roughly
-every twelve minutes, great swathes of broadcast traffic!].
-</para>
-
-</sect1>
-
-<sect1>
-<title>NBNS NetBIOS</title>
-
-<para>
-rfc1001.txt describes, amongst other things, the implementation and use
-of, a 'NetBIOS Name Service'.  NT/AS offers 'Windows Internet Name Service'
-which is fully rfc1001/2 compliant, but has had to take specific action
-with certain NetBIOS names in order to make it useful.  (for example, it
-deals with the registration of &lt;1c&gt; &lt;1d&gt; &lt;1e&gt; names all in different ways.
-I recommend the reading of the Microsoft WINS Server Help files for full
-details).
-</para>
-
-<para> 
-The use of a WINS server cuts down on broadcast network traffic for
-NetBIOS name resolution.  It has the effect of pulling all the broadcast
-isolated subnets together into a single NetBIOS scope, across your LAN
-or WAN, while avoiding the use of TCP/IP broadcast packets.
-</para>
-
-<para>
-When you have a WINS server on your LAN, WINS clients will be able to
-contact the WINS server to resolve NetBIOS names.  Note that only those
-WINS clients that have registered with the same WINS server will be
-visible.  The WINS server _can_ have static NetBIOS entries added to its
-database (usually for security reasons you might want to consider putting
-your domain controllers or other important servers as static entries,
-but you should not rely on this as your sole means of security), but for
-the most part, NetBIOS names are registered dynamically.
-</para>
-
-<para>
-This provides some confusion for lots of people, and is worth mentioning
-here:  a Browse Server is NOT a WINS Server, even if these services are
-implemented in the same application.  A Browse Server _needs_ a WINS server
-because a Browse Server is a WINS client, which is _not_ the same thing].
-</para>
-
-<para>
-Clients can claim names, and therefore offer services on successfully claimed
-names, on their broadcast-isolated subnet.  One way to get NetBIOS services
-(such as browsing: see ftp.microsoft.com/drg/developr/CIFS/browdiff.txt; and
-SMB file/print sharing: see cifs6.txt) working on a LAN or WAN is to make
-your routers forward all broadcast packets from TCP/IP ports 137, 138 and 139.
-You will find, however, if you do this on a large LAN or a WAN, that your
-network is completely swamped by NetBIOS and browsing packets, which is why
-WINS was developed to minimise the necessity of broadcast traffic.
-</para>
-
-<para> 
-WINS Clients therefore claim names from the WINS server.  If the WINS
-server allows them to register a name, the client's NetBIOS session service
-can then offer services on this name.  Other WINS clients will then
-contact the WINS server to resolve a NetBIOS name.
-</para>
-
-</sect1>
-
-</chapter>
diff --git a/docs/Samba3-Developers-Guide/index.xml b/docs/Samba3-Developers-Guide/index.xml
index 492d5038ef..0e3eb10b3b 100644
--- a/docs/Samba3-Developers-Guide/index.xml
+++ b/docs/Samba3-Developers-Guide/index.xml
@@ -26,8 +26,6 @@ It's nothing more than a collection of documents written by samba developers abo
 the internals of various parts of samba and the SMB protocol. It's still (and will always be) incomplete.
 The most recent version of this document
 can be found at <ulink url="http://devel.samba.org/">http://devel.samba.org/</ulink>.
-Please send updates to <ulink 
-url="mailto:jelmer@samba.org">Jelmer Vernooij</ulink>.
 </para>
 
 <para>
@@ -37,6 +35,11 @@ distribution.  A copy can be found on-line at <ulink
 url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</ulink>
 </para>
 
+<warning>
+	<para>This document is incomplete and unmaintained. It is merely a 
+	collection of development-related notes.</para>
+</warning>
+
 </abstract>
 
 </bookinfo>
@@ -54,7 +57,6 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 <part>
 	<title>The protocol</title>
 
-	<xi:include href="NetBIOS.xml"/>
 	<xi:include href="unix-smb.xml"/>
 	<xi:include href="cifsntdomain.xml"/>
 
@@ -76,7 +78,6 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 	
 	<xi:include href="rpc_plugin.xml"/>
 	<xi:include href="vfs.xml"/>
-	<xi:include href="registry.xml"/>
 	<xi:include href="parsing.xml"/>
 	<xi:include href="wins.xml"/>
 	<xi:include href="encryption.xml"/>
@@ -87,7 +88,6 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 	<title>Debugging and tracing</title>
 
 	<xi:include href="Tracing.xml"/>
-	<xi:include href="windows-debug.xml"/>
 	<xi:include href="printing.xml"/>
 </part>
 
diff --git a/docs/Samba3-Developers-Guide/registry.dot b/docs/Samba3-Developers-Guide/registry.dot
deleted file mode 100644
index b26f74b703..0000000000
--- a/docs/Samba3-Developers-Guide/registry.dot
+++ /dev/null
@@ -1,10 +0,0 @@
-digraph foo {
-	libwinregistry -> libregistry;
-	KConfig -> libregistry;
-	gconf -> libregistry;
-	"TDB (Samba)" -> libwinregistry;
-	"Wine registry files" -> libwinregistry;
-	"RPC (Remote windows server" -> libwinregistry;
-	"NT4-style Registry files" -> libwinregistry;
-	libregistry -> libwinregistry;
-}
diff --git a/docs/Samba3-Developers-Guide/registry.xml b/docs/Samba3-Developers-Guide/registry.xml
deleted file mode 100644
index bc394d71b7..0000000000
--- a/docs/Samba3-Developers-Guide/registry.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<chapter id="registry">
-	<chapterinfo>
-		&author.jelmer;
-		<pubdate>24 September 2003</pubdate>
-	</chapterinfo>
-
-	<title>The registry subsystem</title>
-
-	<sect1><title>Planned backends</title>
-	
-<para>
-	The new registry subsystem will work with several different backends: 
-</para>
-
-<itemizedlist>
-	<listitem><para>NT4 (NT4 registry files)</para></listitem>
-	<listitem><para>TDB (Samba TDB files)</para></listitem>
-	<listitem><para>RPC (Remote Registry over RPC, reg pipe)</para></listitem>
-	<listitem><para>wine (Wine Registry Files)</para></listitem>
-	<listitem><para>gconf (The GNOME configuration backend)</para></listitem>
-</itemizedlist>
-
-</sect1>
-
-<sect1><title>Data structures</title>
-
-<para>
-The following structure describes a registry key:
-</para>
-
-<programlisting>
-typedef struct reg_key_s {
-  char *name;         /* Name of the key                    */
-  smb_ucs2_t *class_name; /* Name of key class */
-  int type;           /* One of REG_ROOT_KEY or REG_SUB_KEY */
-  NTTIME last_mod; /* Time last modified                 */
-  struct reg_key_s *owner;
-  struct key_list_s *sub_keys; /* NULL indicates keys not available in memory, function should be called */
-  struct val_list_s *values; /* NULL indicates values not available in memory, function should be called */
-  SEC_DESC *security;
-  REG_HANDLE *handle; /* Pointer to REG_HANDLE this key belongs to */
-  void *backend_data; /* Pointer used by the backend */
-} REG_KEY;
-</programlisting>
-
-<para>The following structure describes a registry value:</para>
-
-<programlisting>
-typedef struct val_key_s {
-  char *name; /* NULL if name not available */
-  int data_type;
-  int data_len;
-  void *data_blk;    /* Might want a separate block */
-  REG_HANDLE *handle; /* Pointer to REG_HANDLE this key belongs to */
-  void *backend_data;
-} REG_VAL;
-</programlisting>
-
-<para>The following structures are used for lists of subkeys or values:</para>
-
-<programlisting>
-/* container for registry subkey names */
-typedef struct key_list_s {
-	TALLOC_CTX	*ctx;
-	uint32      num_subkeys;
-	REG_KEY     **subkeys;
-} REG_KEY_LIST;
-
-/* container for registry values */
-typedef struct val_list_s {
-	TALLOC_CTX *ctx;
-    uint32 num_vals;
-    REG_VAL **vals;
-} REG_VAL_LIST;
-</programlisting>
-
-<para>
-And this structure is used for an instance of a registry (a registry file that's opened, a remote registry pipe we're connected to, etc).
-</para>
-
-<programlisting>
-typedef struct reg_handle_s {
-	REGISTRY_OPS *functions;
-	REG_KEY *root; /* NULL if not available */
-	void *backend_data;
-} REG_HANDLE;
-</programlisting>
-
-</sect1>
-
-<sect1>
-	<title>External interface</title>
-
-<programlisting>
-REG_HANDLE *reg_open(char *backend, char *location, BOOL try_full_load);
-REG_KEY *reg_open_key(REG_KEY *parent, char *name);
-REG_VAL *reg_key_get_val(REG_KEY *key, char *name);
-REG_VAL_LIST *reg_key_get_vals(REG_KEY *key);
-REG_KEY_LIST *reg_key_get_subkeys(REG_KEY *key);
-BOOL reg_key_del(REG_KEY *key);
-BOOL reg_val_del(REG_VAL *val);
-BOOL reg_key_add(REG_KEY *parent, REG_KEY *key);
-BOOL reg_val_add(REG_KEY *parent, REG_VAL *val):
-BOOL reg_val_update(REG_VAL *val);
-BOOL reg_key_update(REG_KEY *key);
-void reg_free_key(REG_KEY *key);
-void reg_free_val(REG_VAL *val);
-void reg_free(REG_HANDLE *h);
-void reg_free_key_list(REG_KEY_LIST *list):
-void reg_free_val_list(REG_VAL_LIST *list):
-</programlisting>
-
-</sect1>
-
-<sect1>
-	<title>Utility functions</title>
-
-	<para>The following helper functions are available:</para>
-
-	<programlisting>
-void reg_key_list_init( REG_KEY_LIST *ctr );
-int reg_key_list_addkey( REG_KEY_LIST *ctr, const char *keyname );
-int reg_key_list_numkeys( REG_KEY_LIST *ctr );
-char* reg_key_list_specific_key( REG_KEY_LIST *ctr, uint32 key_index );
-void reg_key_list_destroy( REG_KEY_LIST *ctr );
-void reg_val_list_init( REG_VAL_LIST *ctr );
-int reg_val_list_numvals( REG_VAL_LIST *ctr );
-void free_registry_value( REG_VAL *val );
-uint8* regval_data_p( REG_VAL *val );
-int regval_size( REG_VAL *val );
-char* regval_name( REG_VAL *val );
-uint32 regval_type( REG_VAL *val );
-TALLOC_CTX* reg_val_list_getctx( REG_VAL_LIST *val );
-int reg_val_list_addvalue( REG_VAL_LIST *ctr, const char *name, uint16 type,
-                         const char *data_p, size_t size );
-int reg_val_list_copyvalue( REG_VAL_LIST *ctr, REG_VAL *val );
-int reg_val_list_delvalue( REG_VAL_LIST *ctr, const char *name );
-void reg_val_list_destroy( REG_VAL_LIST *ctr );
-</programlisting>
-
-</sect1>
-
-<sect1>
-	<title>Writing backends</title>
-
-<para>There are basically two ways of reading data from the registry: loading 
-it all into memory and then working in this copy in memory, or 
-re-reading/re-opening it every time necessary.</para>
-
-<para>This interface aims to support both types. </para>
-
-<para>A registry backend should provide the following functions:</para>
-
-<programlisting>
-typedef struct {
-	REG_HANDLE *(*open_registry) (const char *location, BOOL try_complete_load);
-	REG_KEY *(*open_root_key) (REG_HANDLE *);
-	REG_KEY *(*open_key_rel) (REG_KEY *parent, const char *name);
-	/* if open_key_abs is set to NULL, a default implementation will be provided. */
-	REG_KEY *(*open_key_abs) (REG_HANDLE *, const char *name);
-	REG_KEY_LIST *(*get_subkeys) (REG_KEY *);
-    REG_VAL_LIST *(*get_values) (REG_KEY *);
-	BOOL (*add_key)(REG_KEY *, REG_KEY *);
-	BOOL (*update_key)(REG_KEY *);
-	BOOL (*del_key)(REG_KEY *);
-	BOOL (*add_value)(REG_KEY *, REG_VAL *);
-	BOOL (*update_value)(REG_VAL *);
-	BOOL (*del_value)(REG_VAL *);
-	REG_VAL *(*get_value) (REG_KEY *, const char *name);
-	/* It is not guaranteed that no data has been stored before save() 
-	 * has been called. This function is only useful for backends that 
-	 * store the data in memory and then write out the whole registry at once */
-	BOOL (*save)(REG_HANDLE *, const char *location);
-	BOOL (*close_registry) (REG_HANDLE *);
-	void (*free_key)(REG_KEY *);
-	void (*free_value)(REG_VAL *);
-} REGISTRY_OPS;
-</programlisting>
-
-<para>open_root_key() is optional. It's only called if the 
-	<parameter>root</parameter> field of the REG_HANDLE struct is NULL.</para>
-
-<para>open_key_abs() is optional. If it's NULL, the frontend will 
-	provide a replacement, using open_key_rel().</para>
-
-<para>get_values() and get_value() are optional. They're only called if 
-the <parameter>values</parameter> field of the REG_KEY struct is NULL.</para>
-
-<para>get_subkeys() and get_key() are optional. THey're only called 
-	if the <parameter>subkeys</parameter> field of the REG_KEY struct is NULL.</para>
-
-</sect1>
-
-<sect1><title>Memory allocation</title>
-
-<para>Okay, so who's responsible for what parts of the memory? </para>
-
-<para>The memory is basically maintained by the backends. When the user 
-is finished using a particular structure, it should call the related free
-function for the structure it's freeing.</para>
-
-<para>The backend should then decide what to do with the structure. It may 
-choose to free it, or, if it's maintaining single copies of everything in 
-memory, may choose to ignore the free and free it when the registry is closed.
-</para>
-
-</sect1>
-
-</chapter>
diff --git a/docs/Samba3-Developers-Guide/windows-debug.xml b/docs/Samba3-Developers-Guide/windows-debug.xml
deleted file mode 100644
index db0560c6e1..0000000000
--- a/docs/Samba3-Developers-Guide/windows-debug.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
-<chapter id="windows-debug">
-	<chapterinfo>
-		&author.jelmer;
-		&author.tridge;
-	</chapterinfo>
-
-	<title>Finding useful information on windows</title>
-
-	<sect1><title>Netlogon debugging output</title>
-
-	<procedure>
-		<step><para>stop netlogon service on PDC</para></step>
-		<step><para>rename original netlogon.dll to netlogon.dll.original</para></step>
-		<step><para>copy checked version of netlogon.dll to system32 directory</para></step>
-		<step><para>set HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters\DBFlag to 0x20000004</para></step>
-		<step><para>start netlogon service on PDC</para></step>
-	</procedure>
-</sect1>
-</chapter>
diff --git a/docs/configure.in b/docs/configure.in
index a6d975494e..69dd067e2e 100644
--- a/docs/configure.in
+++ b/docs/configure.in
@@ -1,39 +1,11 @@
-AC_INIT(settings.xsl.in)
-
-PAPERSIZE=""
-ULINK_IN_FOOTNOTE="0"
-ULINK_SHOW="1"
-
-DOCROP="0"
+AC_INIT(xslt/latex.xsl)
 
 AC_ARG_WITH(samba-sources,
 [ --with-samba-sources=DIR Specify path to Samba sources],
 [ test "$withval" && SPECIFIED_SOURCEDIR="$withval" ])
 
-AC_ARG_ENABLE(crop,
-[ --enable-crop            Whether to use a crop template],
-[ test "$enableval" && DOCROP="1" ])
-
-PAPERSIZE="a4paper"
-
-AC_ARG_WITH(papersize,
-[ --with-papersize         Specify papersize (a4paper,letter) ],
-[ test "$withval" && PAPERSIZE="$withval" ])
-
-AC_ARG_ENABLE(printable,
-[ --enable-printable       Printable output (expand ulinks, etc)],
-[ if test "$enableval"; then
- ULINK_IN_FOOTNOTE="1"
- ULINK_SHOW="0"
- fi ])
-
-
 DOC_BUILD_DATE=`date '+%d-%m-%Y'`
 AC_SUBST(DOC_BUILD_DATE)
-AC_SUBST(PAPERSIZE)
-AC_SUBST(ULINK_IN_FOOTNOTE)
-AC_SUBST(ULINK_SHOW)
-AC_SUBST(DOCROP)
 AC_SUBST(SAMBASOURCEDIR)
 
 DOCS_TARGET_REQUIRE_PROGRAM(XSLTPROC, xsltproc, ALL)
@@ -99,4 +71,4 @@ fi
 
 AC_SUBST(TARGETS)
 
-AC_OUTPUT( Makefile.settings settings.xsl )
+AC_OUTPUT( Makefile.settings)
diff --git a/docs/settings.xsl.in b/docs/settings.xsl.in
deleted file mode 100644
index f9deddf438..0000000000
--- a/docs/settings.xsl.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-				version="1.1">
-
-<xsl:param name="papersize"><xsl:text>@PAPERSIZE@</xsl:text></xsl:param>
-<xsl:param name="docrop"><xsl:text>@DOCROP@</xsl:text></xsl:param>
-<xsl:param name="ulink.footnotes"><xsl:text>@ULINK_IN_FOOTNOTE@</xsl:text></xsl:param>
-<xsl:param name="ulink.show"><xsl:text>@ULINK_SHOW@</xsl:text></xsl:param>
-</xsl:stylesheet>
diff --git a/docs/xslt/docbook2pearson.xsl b/docs/xslt/docbook2pearson.xsl
index 4a4158fa40..ebe2a955a2 100644
--- a/docs/xslt/docbook2pearson.xsl
+++ b/docs/xslt/docbook2pearson.xsl
@@ -10,8 +10,6 @@
 	exclude-result-prefixes="doc"
 	version="1.1">
 
-	<xsl:import href="../settings.xsl"/>
-
 	<!-- TODO <entry></entry> -> <entry><p/></entry> -->
 
 	<xsl:output method="xml"
diff --git a/docs/xslt/expand-sambadoc.xsl b/docs/xslt/expand-sambadoc.xsl
index 37e70cca5a..e118a3255b 100644
--- a/docs/xslt/expand-sambadoc.xsl
+++ b/docs/xslt/expand-sambadoc.xsl
@@ -9,7 +9,6 @@
 	xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"
 	version="1.1">
 
-	<xsl:import href="../settings.xsl"/>
 	<xsl:import href="strip-references.xsl"/>
 	<xsl:import href="expand-smbconfdoc.xsl"/>
 
@@ -117,7 +116,7 @@
 				<xsl:attribute name="role"><xsl:text>html</xsl:text></xsl:attribute>
 				<xsl:element name="imagedata">
 					<xsl:attribute name="fileref">
-						<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+						<xsl:text>images/</xsl:text><xsl:value-of select="text()"/><xsl:text>.png</xsl:text></xsl:attribute>
 					<xsl:attribute name="scale">
 						<xsl:choose>
 							<xsl:when test="@scale != ''">
@@ -135,7 +134,7 @@
 			<xsl:element name="imageobject">
 				<xsl:element name="imagedata">
 					<xsl:attribute name="fileref">
-						<xsl:text>images/</xsl:text><xsl:value-of select="imagefile"/><xsl:text>.png</xsl:text></xsl:attribute>
+						<xsl:text>images/</xsl:text><xsl:value-of select="text()"/><xsl:text>.png</xsl:text></xsl:attribute>
 					<xsl:attribute name="scale">
 						<xsl:choose>
 							<xsl:when test="@scale != ''">
diff --git a/docs/xslt/fo.xsl b/docs/xslt/fo.xsl
index f9a78395da..f095f5df8f 100644
--- a/docs/xslt/fo.xsl
+++ b/docs/xslt/fo.xsl
@@ -3,19 +3,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
-<xsl:import href="../settings.xsl"/>
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
 
-<xsl:param name="paper.type">
-  <xsl:choose>
-	<xsl:when test="$papersize = 'a4paper'">
-	  <xsl:text>A4</xsl:text>
-	</xsl:when>
-	<xsl:when test="$papersize = 'letter'">
-	  <xsl:text>USletter</xsl:text>
-	</xsl:when>
-  </xsl:choose>
-</xsl:param>
-
-
 </xsl:stylesheet>
diff --git a/docs/xslt/html-chunk.xsl b/docs/xslt/html-chunk.xsl
index e98a3df8dc..00b310610a 100644
--- a/docs/xslt/html-chunk.xsl
+++ b/docs/xslt/html-chunk.xsl
@@ -3,8 +3,6 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="../settings.xsl"/>
-
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
 <xsl:import href="html-common.xsl"/>
 <xsl:param name="chunk.first.sections" select="1"/>
diff --git a/docs/xslt/html.xsl b/docs/xslt/html.xsl
index bb07516ad2..8481a86d24 100644
--- a/docs/xslt/html.xsl
+++ b/docs/xslt/html.xsl
@@ -3,8 +3,6 @@
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-<xsl:import href="../settings.xsl"/>
-
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
 <xsl:import href="html-common.xsl"/>
 
diff --git a/docs/xslt/latex.xsl b/docs/xslt/latex.xsl
index cc817427de..0e2574de20 100644
--- a/docs/xslt/latex.xsl
+++ b/docs/xslt/latex.xsl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:import href="../settings.xsl"/>
 <xsl:import href="http://db2latex.sourceforge.net/xsl/docbook.xsl"/>
 <xsl:import href="strip-references.xsl"/>
 
@@ -62,6 +61,8 @@
 <xsl:param name="latex.documentclass">sambadoc</xsl:param>
 <xsl:param name="latex.documentclass.book">openright,twoside</xsl:param>
 <xsl:param name="latex.babel.language">english</xsl:param>
+<xsl:variable name="ulink.footnotes" select="1"/>
+<xsl:variable name="ulink.show" select="0"/>
 
 <xsl:template match="smbconfblock/smbconfoption">
 	<xsl:value-of select="@name"/>
@@ -85,13 +86,17 @@
 
 <xsl:template match="smbconfoption">
 	<xsl:text>\smbconfoption{</xsl:text>
-	<xsl:value-of select="@name"/>
+	<xsl:call-template name="scape">
+		<xsl:with-param name="string" select="@name"/>
+	</xsl:call-template>
 	<xsl:text>}</xsl:text>
 
 	<xsl:choose>
 		<xsl:when test="text() != ''">
 			<xsl:text> = </xsl:text>
-			<xsl:value-of select="text()"/>
+			<xsl:call-template name="scape">
+				<xsl:with-param name="string" select="text()"/>
+			</xsl:call-template>
 		</xsl:when>
 	</xsl:choose>
 </xsl:template>
@@ -104,7 +109,9 @@
 
 <xsl:template match="smbconfsection">
 	<xsl:text>\smbconfsection{</xsl:text>
-		<xsl:value-of select="translate(@name, '$','x')"/>
+	<xsl:call-template name="scape">
+		<xsl:with-param name="string" select="@name"/>
+	</xsl:call-template>
 	<xsl:text>}</xsl:text>
 </xsl:template>
 
diff --git a/docs/xslt/man.xsl b/docs/xslt/man.xsl
index 94bb646ee4..91e6ebc9a8 100644
--- a/docs/xslt/man.xsl
+++ b/docs/xslt/man.xsl
@@ -3,8 +3,6 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version='1.0'>
 
-<xsl:import href="../settings.xsl"/>
-
 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
 
 <xsl:param name="chunk.section.depth" select="0"/>
diff --git a/docs/xslt/smb.conf-html.xsl b/docs/xslt/smb.conf-html.xsl
index dd28553d4f..ebf07d9161 100644
--- a/docs/xslt/smb.conf-html.xsl
+++ b/docs/xslt/smb.conf-html.xsl
@@ -11,7 +11,6 @@
 	version="1.1"
 	extension-element-prefixes="exsl">
 
-	<xsl:import href="../settings.xsl"/>
 	<xsl:import href="html-common.xsl"/>
 
 	<xsl:output method="xml" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" indent="yes" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"/>