merge from 2.2
[samba.git] / docs / docbook / projdoc / samba-doc.sgml
index fa58399bf1e92f396bde4a0794fd0f8a9d9349bf..7f3f09f1f3957b54324423608ffe3a698edd503a 100644 (file)
@@ -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;