From 556d1ca2d20c42c7ee5934631331f0a019203f06 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 22 Nov 2002 00:32:24 +0000
Subject: Sync docbook directory with HEAD.

Sorry but there are way too many changes to track down all the commit
messages and list them here.  Most of the changes look like updates
and cleanups from Jelmer though.
(This used to be commit 75615648d0ace3bde6a2ef2dad562094f1b25d00)
---
 docs/docbook/devdoc/dev-doc.sgml  | 2 ++
 docs/docbook/devdoc/unix-smb.sgml | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'docs/docbook/devdoc')

diff --git a/docs/docbook/devdoc/dev-doc.sgml b/docs/docbook/devdoc/dev-doc.sgml
index adc25e83bd..e256dbe3a2 100644
--- a/docs/docbook/devdoc/dev-doc.sgml
+++ b/docs/docbook/devdoc/dev-doc.sgml
@@ -11,6 +11,7 @@
 <!ENTITY printing SYSTEM "printing.sgml">
 <!ENTITY wins SYSTEM "wins.sgml">
 <!ENTITY sam SYSTEM "sam.sgml">
+<!ENTITY encryption SYSTEM "encryption.sgml">
 ]>
 
 <book id="Samba-Developers-Guide">
@@ -64,5 +65,6 @@ url="http://www.fsf.org/licenses/gpl.txt">http://www.fsf.org/licenses/gpl.txt</u
 &printing;
 &wins;
 &sam;
+&encryption;
 
 </book>
diff --git a/docs/docbook/devdoc/unix-smb.sgml b/docs/docbook/devdoc/unix-smb.sgml
index be79698857..aae96edfb7 100644
--- a/docs/docbook/devdoc/unix-smb.sgml
+++ b/docs/docbook/devdoc/unix-smb.sgml
@@ -143,6 +143,11 @@ details.
 
 <sect1>
 <title>Locking</title>
+<para>
+Since samba 2.2, samba supports other types of locking as well. This 
+section is outdated.
+</para>
+
 <para>
 The locking calls available under a DOS/Windows environment are much
 richer than those available in unix. This means a unix server (like
-- 
cgit