From 57d93d21f345ef5892b33a7a7370762373b9421f Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Thu, 21 Jun 2001 14:27:41 +0000
Subject: merge from 2.2 (This used to be commit
 5932471a03e74ef7fcc71e22dbb52c530332a713)

---
 docs/docbook/Makefile.in            | 2 +-
 docs/docbook/projdoc/samba-doc.sgml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs/docbook')

diff --git a/docs/docbook/Makefile.in b/docs/docbook/Makefile.in
index 0c043d77e3..4733ef98b4 100644
--- a/docs/docbook/Makefile.in
+++ b/docs/docbook/Makefile.in
@@ -58,7 +58,7 @@ HOWTOSRC=projdoc/DOMAIN_MEMBER.sgml projdoc/NT_Security.sgml \
 	projdoc/msdfs_setup.sgml projdoc/printer_driver2.sgml \
 	projdoc/UNIX_INSTALL.sgml projdoc/winbind.sgml projdoc/OS2-Client-HOWTO.sgml \
 	projdoc/Samba-PDC-HOWTO.sgml projdoc/ENCRYPTION.sgml \
-	projdoc/CVS-Access.sgml
+	projdoc/CVS-Access.sgml projdoc/Integrating-with-Windows.sgml
 
 FAQSRC=faq/samba-pdc-faq.sgml
 
diff --git a/docs/docbook/projdoc/samba-doc.sgml b/docs/docbook/projdoc/samba-doc.sgml
index fa58399bf1..7f3f09f1f3 100644
--- a/docs/docbook/projdoc/samba-doc.sgml
+++ b/docs/docbook/projdoc/samba-doc.sgml
@@ -9,6 +9,7 @@
 <!ENTITY OS2-Client SYSTEM "OS2-Client-HOWTO.sgml">
 <!ENTITY Samba-PDC-HOWTO SYSTEM "Samba-PDC-HOWTO.sgml">
 <!ENTITY CVS-Access SYSTEM "CVS-Access.sgml">
+<!ENTITY IntegratingWithWindows SYSTEM "Integrating-with-Windows.sgml">
 ]>
 
 <book id="Samba-Project-Documentation">
@@ -42,6 +43,7 @@ Cheers, jerry
 </dedication>
 
 &UNIX-INSTALL;
+&IntegratingWithWindows;
 &ENCRYPTION;
 &MS-Dfs-Setup;
 &PRINTER-DRIVER2;
-- 
cgit