Merge more SGML strictness fixes from HEAD

diff --git a/docs/docbook/devdoc/Tracing.sgml b/docs/docbook/devdoc/Tracing.sgml
index 20515df1673559eb60e505af38c1494b2968acb9..ccf1e1c3c849cecb88ea220461952e51b4f215e5 100644 (file)
--- a/docs/docbook/devdoc/Tracing.sgml
+++ b/docs/docbook/devdoc/Tracing.sgml
@@ -80,11 +80,11 @@ stderr output from this command to a file for later perusal. For
 example, if I'm using a csh style shell:
 </para>
 
-<para><command>strace -f -p 3872 >&amp; strace.out</command></para>
+<para><command>strace -f -p 3872 &gt;&amp; strace.out</command></para>
 
 <para>or with a sh style shell:</para>
 
-<para><command>strace -f -p 3872 > strace.out 2>&amp;1</command></para>
+<para><command>strace -f -p 3872 > strace.out 2&gt;&amp;1</command></para>
 
 <para>
 Note the "-f" option. This is only available on some systems, and

diff --git a/docs/docbook/devdoc/printing.sgml b/docs/docbook/devdoc/printing.sgml
index 2ef64353e1eefcf4e01912849b193dc1ddf4ba8a..363b9fb6e50bab052313d806f21f23387a418753 100644 (file)
--- a/docs/docbook/devdoc/printing.sgml
+++ b/docs/docbook/devdoc/printing.sgml
@@ -28,7 +28,7 @@ Printing Interface to Various Back ends
 
 <para>
 Samba uses a table of function pointers to seven functions.  The
-function prototypes are defined in the <VarName>printif</VarName> structure declared
+function prototypes are defined in the <varname>printif</varname> structure declared
 in <filename>printing.h</filename>.
 </para>
 
@@ -199,7 +199,7 @@ object when the client issues a GetJob(level == 2) request.
 
 <sect1>
 <title>
-ChangeID & Client Caching of Printer Information
+ChangeID and Client Caching of Printer Information
 </title>
 
 <para>
@@ -345,7 +345,7 @@ information</para></listitem>
 </itemizedlist>
 
 <para>
-A <VarName>SPOOL_NOTIFY_INFO</VarName> contains:
+A <varname>SPOOL_NOTIFY_INFO</varname> contains:
 </para>
 
 <itemizedlist>
@@ -359,7 +359,7 @@ in the SPOOL_NOTIFY_INFO_DATA array</para></listitem>
 </itemizedlist>
 
 <para>
-The <VarName>SPOOL_NOTIFY_INFO_DATA</VarName> entries contain:
+The <varname>SPOOL_NOTIFY_INFO_DATA</varname> entries contain:
 </para>
 
 <itemizedlist>

diff --git a/docs/docbook/devdoc/sam.sgml b/docs/docbook/devdoc/sam.sgml
index 654bd5fe9c31fd16a09d62d2b488859239e564c7..84c17d65e26123590d613b0d384f4563ffc3e56a 100644 (file)
--- a/docs/docbook/devdoc/sam.sgml
+++ b/docs/docbook/devdoc/sam.sgml
@@ -27,7 +27,7 @@ accessed.</para>
 For example, when you call 
 </para>
 
-<programlisting><
+<programlisting>
 NTSTATUS sam_get_account_by_name(const SAM_CONTEXT *context, const
 NT_USER_TOKEN *access_token, uint32 access_desired, const char *domain,
 const char *name, SAM_ACCOUNT_HANDLE **account)
@@ -182,7 +182,7 @@ This is where smbd, samtest and whatever end-user replacement we have
 for pdbedit sits.  They use only the SAM interface, and do not get
 'special knowledge' of what is below them.
 </para>
-
+</sect2>
 <sect2>
 <title>SAM Interface</title>