From 2fb5c7c580a3fff3c7d477b65a1c4852af86433b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 1 Oct 2002 17:16:07 +0000
Subject: merge from HEAD (This used to be commit
 c0ca286e36d49deba6c73690114b0d867cbfd63e)

---
 docs/docbook/devdoc/dev-doc.sgml   | 6 +++++-
 docs/docbook/devdoc/internals.sgml | 1 +
 docs/docbook/devdoc/parsing.sgml   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'docs/docbook/devdoc')

diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.sgml
index c1ffb735ba..5191ddcb93 100644
--- a/docs/docbook/devdoc/dev-doc.sgml
+++ b/docs/docbook/devdoc/dev-doc.sgml
@@ -8,6 +8,8 @@
 <!ENTITY CodingSuggestions SYSTEM "CodingSuggestions.sgml">
 <!ENTITY Tracing SYSTEM "Tracing.sgml">
 <!ENTITY cifsntdomain SYSTEM "cifsntdomain.sgml">
+<!ENTITY printing SYSTEM "printing.sgml">
+<!ENTITY wins SYSTEM "wins.sgml">
 ]>
 
 <book id="Samba-Developer-Documentation">
@@ -25,7 +27,7 @@
 <title>Abstract</title>
 
 <para>
-<emphasis>Last Update</emphasis> : Mon aug 26 12:41:19 CEST 2002
+<emphasis>Last Update</emphasis> : Mon Sep 30 15:23:53 CDT 2002
 </para>
 
 <para>
@@ -58,5 +60,7 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 &unix-smb;
 &Tracing;
 &cifsntdomain;
+&printing;
+&wins;
 
 </book>
diff --git a/docs/docbook/devdoc/internals.sgml b/docs/docbook/devdoc/internals.sgml
index 79524347b6..982cfd2e10 100644
--- a/docs/docbook/devdoc/internals.sgml
+++ b/docs/docbook/devdoc/internals.sgml
@@ -26,6 +26,7 @@ telling if a particular char* is in dos codepage or unix
 codepage. This led to a nightmare of code that tried to cope with
 particular cases without handlingt the general case.
 </para>
+</sect1>
 
 <sect1>
 <title>The new functions</title>
diff --git a/docs/docbook/devdoc/parsing.sgml b/docs/docbook/devdoc/parsing.sgml
index 0121935d26..8d929617f5 100644
--- a/docs/docbook/devdoc/parsing.sgml
+++ b/docs/docbook/devdoc/parsing.sgml
@@ -196,7 +196,7 @@ terminating character, and the rest of the line is ignored.  The lines
   &lt;section&gt;         :==  &lt;section header&gt; { &lt;parameter line&gt; }
   &lt;section header&gt;  :==  '[' NAME ']'
   &lt;parameter line&gt;  :==  NAME '=' VALUE NL
-</programlisting><para>
+</programlisting></para>
 
 <para>Basically, this means that</para>
 
-- 
cgit