1 files changed, 5 insertions, 944 deletions
diff --git a/docs/htmldocs/optional.html b/docs/htmldocs/optional.html
index 20bf1e4e218..3e5177578cd 100644
--- a/docs/htmldocs/optional.html
+++ b/docs/htmldocs/optional.html
@@ -11,7 +11,7 @@ TITLE="SAMBA Project Documentation"
 HREF="samba-howto-collection.html"><LINK
 REL="PREVIOUS"
 TITLE="Samba as a NT4 or Win2k domain member"
-HREF="domain-security.html"><LINK
+HREF="domain-member.html"><LINK
 REL="NEXT"
 TITLE="UNIX Permission Bits and Windows NT Access Control Lists"
 HREF="unix-permissions.html"></HEAD
@@ -42,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="domain-security.html"
+HREF="domain-member.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -75,956 +75,17 @@ CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
 >III. Advanced Configuration</H1
+></DIV
 ><DIV
 CLASS="PARTINTRO"
 ><A
-NAME="AEN1511"
+NAME="AEN1520"
 ></A
 ><H1
 >Introduction</H1
 ><P
 >Samba has several features that you might want or might not want to use. The chapters in this part each cover one specific feature.</P
 ></DIV
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->10. <A
-HREF="unix-permissions.html"
->UNIX Permission Bits and Windows NT Access Control Lists</A
-></DT
-><DD
-><DL
-><DT
->10.1. <A
-HREF="unix-permissions.html#AEN1525"
->Viewing and changing UNIX permissions using the NT 
-	security dialogs</A
-></DT
-><DT
->10.2. <A
-HREF="unix-permissions.html#AEN1531"
->How to view file security on a Samba share</A
-></DT
-><DT
->10.3. <A
-HREF="unix-permissions.html#AEN1542"
->Viewing file ownership</A
-></DT
-><DT
->10.4. <A
-HREF="unix-permissions.html#AEN1562"
->Viewing file or directory permissions</A
-></DT
-><DD
-><DL
-><DT
->10.4.1. <A
-HREF="unix-permissions.html#AEN1577"
->File Permissions</A
-></DT
-><DT
->10.4.2. <A
-HREF="unix-permissions.html#AEN1591"
->Directory Permissions</A
-></DT
-></DL
-></DD
-><DT
->10.5. <A
-HREF="unix-permissions.html#AEN1598"
->Modifying file or directory permissions</A
-></DT
-><DT
->10.6. <A
-HREF="unix-permissions.html#AEN1620"
->Interaction with the standard Samba create mask 
-	parameters</A
-></DT
-><DT
->10.7. <A
-HREF="unix-permissions.html#AEN1673"
->Interaction with the standard Samba file attribute 
-	mapping</A
-></DT
-></DL
-></DD
-><DT
->11. <A
-HREF="groupmapping.html"
->Configuring Group Mapping</A
-></DT
-><DT
->12. <A
-HREF="printing.html"
->Printing Support</A
-></DT
-><DD
-><DL
-><DT
->12.1. <A
-HREF="printing.html#AEN1736"
->Introduction</A
-></DT
-><DT
->12.2. <A
-HREF="printing.html#AEN1758"
->Configuration</A
-></DT
-><DD
-><DL
-><DT
->12.2.1. <A
-HREF="printing.html#AEN1766"
->Creating [print$]</A
-></DT
-><DT
->12.2.2. <A
-HREF="printing.html#AEN1801"
->Setting Drivers for Existing Printers</A
-></DT
-><DT
->12.2.3. <A
-HREF="printing.html#AEN1817"
->Support a large number of printers</A
-></DT
-><DT
->12.2.4. <A
-HREF="printing.html#AEN1832"
->Adding New Printers via the Windows NT APW</A
-></DT
-><DT
->12.2.5. <A
-HREF="printing.html#AEN1862"
->Samba and Printer Ports</A
-></DT
-></DL
-></DD
-><DT
->12.3. <A
-HREF="printing.html#AEN1870"
->The Imprints Toolset</A
-></DT
-><DD
-><DL
-><DT
->12.3.1. <A
-HREF="printing.html#AEN1874"
->What is Imprints?</A
-></DT
-><DT
->12.3.2. <A
-HREF="printing.html#AEN1884"
->Creating Printer Driver Packages</A
-></DT
-><DT
->12.3.3. <A
-HREF="printing.html#AEN1887"
->The Imprints server</A
-></DT
-><DT
->12.3.4. <A
-HREF="printing.html#AEN1891"
->The Installation Client</A
-></DT
-></DL
-></DD
-><DT
->12.4. <A
-HREF="printing.html#AEN1913"
->Diagnosis</A
-></DT
-><DD
-><DL
-><DT
->12.4.1. <A
-HREF="printing.html#AEN1915"
->Introduction</A
-></DT
-><DT
->12.4.2. <A
-HREF="printing.html#AEN1931"
->Debugging printer problems</A
-></DT
-><DT
->12.4.3. <A
-HREF="printing.html#AEN1940"
->What printers do I have?</A
-></DT
-><DT
->12.4.4. <A
-HREF="printing.html#AEN1948"
->Setting up printcap and print servers</A
-></DT
-><DT
->12.4.5. <A
-HREF="printing.html#AEN1976"
->Job sent, no output</A
-></DT
-><DT
->12.4.6. <A
-HREF="printing.html#AEN1987"
->Job sent, strange output</A
-></DT
-><DT
->12.4.7. <A
-HREF="printing.html#AEN1999"
->Raw PostScript printed</A
-></DT
-><DT
->12.4.8. <A
-HREF="printing.html#AEN2002"
->Advanced Printing</A
-></DT
-><DT
->12.4.9. <A
-HREF="printing.html#AEN2005"
->Real debugging</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->13. <A
-HREF="cups-printing.html"
->CUPS Printing Support</A
-></DT
-><DD
-><DL
-><DT
->13.1. <A
-HREF="cups-printing.html#AEN2025"
->Introduction</A
-></DT
-><DT
->13.2. <A
-HREF="cups-printing.html#AEN2032"
->Configuring <TT
-CLASS="FILENAME"
->smb.conf</TT
-> for CUPS</A
-></DT
-><DT
->13.3. <A
-HREF="cups-printing.html#AEN2052"
->CUPS - RAW Print Through Mode</A
-></DT
-><DT
->13.4. <A
-HREF="cups-printing.html#AEN2111"
->CUPS as a network PostScript RIP -- CUPS drivers working on server, Adobe
-PostScript driver with CUPS-PPDs downloaded to clients</A
-></DT
-><DT
->13.5. <A
-HREF="cups-printing.html#AEN2132"
->Windows Terminal Servers (WTS) as CUPS clients</A
-></DT
-><DT
->13.6. <A
-HREF="cups-printing.html#AEN2136"
->Setting up CUPS for driver download</A
-></DT
-><DT
->13.7. <A
-HREF="cups-printing.html#AEN2149"
->Sources of CUPS drivers / PPDs</A
-></DT
-><DD
-><DL
-><DT
->13.7.1. <A
-HREF="cups-printing.html#AEN2176"
-><B
-CLASS="COMMAND"
->cupsaddsmb</B
-></A
-></DT
-></DL
-></DD
-><DT
->13.8. <A
-HREF="cups-printing.html#AEN2205"
->The CUPS Filter Chains</A
-></DT
-><DT
->13.9. <A
-HREF="cups-printing.html#AEN2244"
->CUPS Print Drivers and Devices</A
-></DT
-><DD
-><DL
-><DT
->13.9.1. <A
-HREF="cups-printing.html#AEN2251"
->Further printing steps</A
-></DT
-></DL
-></DD
-><DT
->13.10. <A
-HREF="cups-printing.html#AEN2321"
->Limiting the number of pages users can print</A
-></DT
-><DT
->13.11. <A
-HREF="cups-printing.html#AEN2417"
->Advanced Postscript Printing from MS Windows</A
-></DT
-><DT
->13.12. <A
-HREF="cups-printing.html#AEN2432"
->Auto-Deletion of CUPS spool files</A
-></DT
-></DL
-></DD
-><DT
->14. <A
-HREF="winbind.html"
->Unified Logons between Windows NT and UNIX using Winbind</A
-></DT
-><DD
-><DL
-><DT
->14.1. <A
-HREF="winbind.html#AEN2506"
->Abstract</A
-></DT
-><DT
->14.2. <A
-HREF="winbind.html#AEN2510"
->Introduction</A
-></DT
-><DT
->14.3. <A
-HREF="winbind.html#AEN2523"
->What Winbind Provides</A
-></DT
-><DD
-><DL
-><DT
->14.3.1. <A
-HREF="winbind.html#AEN2530"
->Target Uses</A
-></DT
-></DL
-></DD
-><DT
->14.4. <A
-HREF="winbind.html#AEN2534"
->How Winbind Works</A
-></DT
-><DD
-><DL
-><DT
->14.4.1. <A
-HREF="winbind.html#AEN2539"
->Microsoft Remote Procedure Calls</A
-></DT
-><DT
->14.4.2. <A
-HREF="winbind.html#AEN2543"
->Microsoft Active Directory Services</A
-></DT
-><DT
->14.4.3. <A
-HREF="winbind.html#AEN2546"
->Name Service Switch</A
-></DT
-><DT
->14.4.4. <A
-HREF="winbind.html#AEN2562"
->Pluggable Authentication Modules</A
-></DT
-><DT
->14.4.5. <A
-HREF="winbind.html#AEN2570"
->User and Group ID Allocation</A
-></DT
-><DT
->14.4.6. <A
-HREF="winbind.html#AEN2574"
->Result Caching</A
-></DT
-></DL
-></DD
-><DT
->14.5. <A
-HREF="winbind.html#AEN2577"
->Installation and Configuration</A
-></DT
-><DD
-><DL
-><DT
->14.5.1. <A
-HREF="winbind.html#AEN2582"
->Introduction</A
-></DT
-><DT
->14.5.2. <A
-HREF="winbind.html#AEN2595"
->Requirements</A
-></DT
-><DT
->14.5.3. <A
-HREF="winbind.html#AEN2609"
->Testing Things Out</A
-></DT
-></DL
-></DD
-><DT
->14.6. <A
-HREF="winbind.html#AEN2834"
->Limitations</A
-></DT
-><DT
->14.7. <A
-HREF="winbind.html#AEN2844"
->Conclusion</A
-></DT
-></DL
-></DD
-><DT
->15. <A
-HREF="advancednetworkmanagement.html"
->Advanced Network Manangement</A
-></DT
-><DD
-><DL
-><DT
->15.1. <A
-HREF="advancednetworkmanagement.html#AEN2859"
->Configuring Samba Share Access Controls</A
-></DT
-><DD
-><DL
-><DT
->15.1.1. <A
-HREF="advancednetworkmanagement.html#AEN2869"
->Share Permissions Management</A
-></DT
-></DL
-></DD
-><DT
->15.2. <A
-HREF="advancednetworkmanagement.html#AEN2897"
->Remote Server Administration</A
-></DT
-><DT
->15.3. <A
-HREF="advancednetworkmanagement.html#AEN2914"
->Network Logon Script Magic</A
-></DT
-></DL
-></DD
-><DT
->16. <A
-HREF="policymgmt.html"
->System and Account Policies</A
-></DT
-><DD
-><DL
-><DT
->16.1. <A
-HREF="policymgmt.html#AEN2929"
->Creating and Managing System Policies</A
-></DT
-><DD
-><DL
-><DT
->16.1.1. <A
-HREF="policymgmt.html#AEN2943"
->Windows 9x/Me Policies</A
-></DT
-><DT
->16.1.2. <A
-HREF="policymgmt.html#AEN2955"
->Windows NT4 Style Policy Files</A
-></DT
-><DT
->16.1.3. <A
-HREF="policymgmt.html#AEN2973"
->MS Windows 200x / XP Professional Policies</A
-></DT
-></DL
-></DD
-><DT
->16.2. <A
-HREF="policymgmt.html#AEN3002"
->Managing Account/User Policies</A
-></DT
-><DD
-><DL
-><DT
->16.2.1. <A
-HREF="policymgmt.html#AEN3017"
->With Windows NT4/200x</A
-></DT
-><DT
->16.2.2. <A
-HREF="policymgmt.html#AEN3020"
->With a Samba PDC</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->17. <A
-HREF="profilemgmt.html"
->Desktop Profile Management</A
-></DT
-><DD
-><DL
-><DT
->17.1. <A
-HREF="profilemgmt.html#AEN3035"
->Roaming Profiles</A
-></DT
-><DD
-><DL
-><DT
->17.1.1. <A
-HREF="profilemgmt.html#AEN3042"
->Samba Configuration for Profile Handling</A
-></DT
-><DT
->17.1.2. <A
-HREF="profilemgmt.html#AEN3077"
->Windows Client Profile Configuration Information</A
-></DT
-><DT
->17.1.3. <A
-HREF="profilemgmt.html#AEN3197"
->Sharing Profiles between W9x/Me and NT4/200x/XP workstations</A
-></DT
-><DT
->17.1.4. <A
-HREF="profilemgmt.html#AEN3204"
->Profile Migration from Windows NT4/200x Server to Samba</A
-></DT
-></DL
-></DD
-><DT
->17.2. <A
-HREF="profilemgmt.html#AEN3242"
->Mandatory profiles</A
-></DT
-><DT
->17.3. <A
-HREF="profilemgmt.html#AEN3249"
->Creating/Managing Group Profiles</A
-></DT
-><DT
->17.4. <A
-HREF="profilemgmt.html#AEN3255"
->Default Profile for Windows Users</A
-></DT
-><DD
-><DL
-><DT
->17.4.1. <A
-HREF="profilemgmt.html#AEN3259"
->MS Windows 9x/Me</A
-></DT
-><DT
->17.4.2. <A
-HREF="profilemgmt.html#AEN3271"
->MS Windows NT4 Workstation</A
-></DT
-><DT
->17.4.3. <A
-HREF="profilemgmt.html#AEN3325"
->MS Windows 200x/XP</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->18. <A
-HREF="interdomaintrusts.html"
->Interdomain Trust Relationships</A
-></DT
-><DD
-><DL
-><DT
->18.1. <A
-HREF="interdomaintrusts.html#AEN3386"
->Trust Relationship Background</A
-></DT
-><DT
->18.2. <A
-HREF="interdomaintrusts.html#AEN3395"
->MS Windows NT4 Trust Configuration</A
-></DT
-><DD
-><DL
-><DT
->18.2.1. <A
-HREF="interdomaintrusts.html#AEN3398"
->NT4 as the Trusting Domain</A
-></DT
-><DT
->18.2.2. <A
-HREF="interdomaintrusts.html#AEN3401"
->NT4 as the Trusted Domain</A
-></DT
-></DL
-></DD
-><DT
->18.3. <A
-HREF="interdomaintrusts.html#AEN3405"
->Configuring Samba Domain Trusts</A
-></DT
-><DD
-><DL
-><DT
->18.3.1. <A
-HREF="interdomaintrusts.html#AEN3409"
->Samba3 as the Trusting Domain</A
-></DT
-><DT
->18.3.2. <A
-HREF="interdomaintrusts.html#AEN3416"
->Samba3 as the Trusted Domain</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->19. <A
-HREF="pam.html"
->PAM Configuration for Centrally Managed Authentication</A
-></DT
-><DD
-><DL
-><DT
->19.1. <A
-HREF="pam.html#AEN3440"
->Samba and PAM</A
-></DT
-><DT
->19.2. <A
-HREF="pam.html#AEN3491"
->Distributed Authentication</A
-></DT
-><DT
->19.3. <A
-HREF="pam.html#AEN3496"
->PAM Configuration in smb.conf</A
-></DT
-></DL
-></DD
-><DT
->20. <A
-HREF="vfs.html"
->Stackable VFS modules</A
-></DT
-><DD
-><DL
-><DT
->20.1. <A
-HREF="vfs.html#AEN3531"
->Introduction and configuration</A
-></DT
-><DT
->20.2. <A
-HREF="vfs.html#AEN3540"
->Included modules</A
-></DT
-><DD
-><DL
-><DT
->20.2.1. <A
-HREF="vfs.html#AEN3542"
->audit</A
-></DT
-><DT
->20.2.2. <A
-HREF="vfs.html#AEN3550"
->extd_audit</A
-></DT
-><DT
->20.2.3. <A
-HREF="vfs.html#AEN3554"
->recycle</A
-></DT
-><DT
->20.2.4. <A
-HREF="vfs.html#AEN3591"
->netatalk</A
-></DT
-></DL
-></DD
-><DT
->20.3. <A
-HREF="vfs.html#AEN3598"
->VFS modules available elsewhere</A
-></DT
-><DD
-><DL
-><DT
->20.3.1. <A
-HREF="vfs.html#AEN3602"
->DatabaseFS</A
-></DT
-><DT
->20.3.2. <A
-HREF="vfs.html#AEN3610"
->vscan</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->21. <A
-HREF="msdfs.html"
->Hosting a Microsoft Distributed File System tree on Samba</A
-></DT
-><DD
-><DL
-><DT
->21.1. <A
-HREF="msdfs.html#AEN3626"
->Instructions</A
-></DT
-><DD
-><DL
-><DT
->21.1.1. <A
-HREF="msdfs.html#AEN3661"
->Notes</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->22. <A
-HREF="integrate-ms-networks.html"
->Integrating MS Windows networks with Samba</A
-></DT
-><DD
-><DL
-><DT
->22.1. <A
-HREF="integrate-ms-networks.html#AEN3688"
->Name Resolution in a pure Unix/Linux world</A
-></DT
-><DD
-><DL
-><DT
->22.1.1. <A
-HREF="integrate-ms-networks.html#AEN3704"
-><TT
-CLASS="FILENAME"
->/etc/hosts</TT
-></A
-></DT
-><DT
->22.1.2. <A
-HREF="integrate-ms-networks.html#AEN3720"
-><TT
-CLASS="FILENAME"
->/etc/resolv.conf</TT
-></A
-></DT
-><DT
->22.1.3. <A
-HREF="integrate-ms-networks.html#AEN3731"
-><TT
-CLASS="FILENAME"
->/etc/host.conf</TT
-></A
-></DT
-><DT
->22.1.4. <A
-HREF="integrate-ms-networks.html#AEN3739"
-><TT
-CLASS="FILENAME"
->/etc/nsswitch.conf</TT
-></A
-></DT
-></DL
-></DD
-><DT
->22.2. <A
-HREF="integrate-ms-networks.html#AEN3751"
->Name resolution as used within MS Windows networking</A
-></DT
-><DD
-><DL
-><DT
->22.2.1. <A
-HREF="integrate-ms-networks.html#AEN3763"
->The NetBIOS Name Cache</A
-></DT
-><DT
->22.2.2. <A
-HREF="integrate-ms-networks.html#AEN3768"
->The LMHOSTS file</A
-></DT
-><DT
->22.2.3. <A
-HREF="integrate-ms-networks.html#AEN3776"
->HOSTS file</A
-></DT
-><DT
->22.2.4. <A
-HREF="integrate-ms-networks.html#AEN3781"
->DNS Lookup</A
-></DT
-><DT
->22.2.5. <A
-HREF="integrate-ms-networks.html#AEN3784"
->WINS Lookup</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->23. <A
-HREF="improved-browsing.html"
->Improved browsing in samba</A
-></DT
-><DD
-><DL
-><DT
->23.1. <A
-HREF="improved-browsing.html#AEN3804"
->Overview of browsing</A
-></DT
-><DT
->23.2. <A
-HREF="improved-browsing.html#AEN3810"
->Browsing support in samba</A
-></DT
-><DT
->23.3. <A
-HREF="improved-browsing.html#AEN3825"
->Problem resolution</A
-></DT
-><DT
->23.4. <A
-HREF="improved-browsing.html#AEN3837"
->Browsing across subnets</A
-></DT
-><DD
-><DL
-><DT
->23.4.1. <A
-HREF="improved-browsing.html#AEN3843"
->How does cross subnet browsing work ?</A
-></DT
-></DL
-></DD
-><DT
->23.5. <A
-HREF="improved-browsing.html#AEN3878"
->Setting up a WINS server</A
-></DT
-><DT
->23.6. <A
-HREF="improved-browsing.html#AEN3901"
->Setting up Browsing in a WORKGROUP</A
-></DT
-><DT
->23.7. <A
-HREF="improved-browsing.html#AEN3927"
->Setting up Browsing in a DOMAIN</A
-></DT
-><DT
->23.8. <A
-HREF="improved-browsing.html#BROWSE-FORCE-MASTER"
->Forcing samba to be the master</A
-></DT
-><DT
->23.9. <A
-HREF="improved-browsing.html#AEN3962"
->Making samba the domain master</A
-></DT
-><DT
->23.10. <A
-HREF="improved-browsing.html#AEN3984"
->Note about broadcast addresses</A
-></DT
-><DT
->23.11. <A
-HREF="improved-browsing.html#AEN3987"
->Multiple interfaces</A
-></DT
-></DL
-></DD
-><DT
->24. <A
-HREF="securing-samba.html"
->Securing Samba</A
-></DT
-><DD
-><DL
-><DT
->24.1. <A
-HREF="securing-samba.html#AEN4003"
->Introduction</A
-></DT
-><DT
->24.2. <A
-HREF="securing-samba.html#AEN4006"
->Using host based protection</A
-></DT
-><DT
->24.3. <A
-HREF="securing-samba.html#AEN4016"
->Using interface protection</A
-></DT
-><DT
->24.4. <A
-HREF="securing-samba.html#AEN4025"
->Using a firewall</A
-></DT
-><DT
->24.5. <A
-HREF="securing-samba.html#AEN4032"
->Using a IPC$ share deny</A
-></DT
-><DT
->24.6. <A
-HREF="securing-samba.html#AEN4041"
->Upgrading Samba</A
-></DT
-></DL
-></DD
-><DT
->25. <A
-HREF="unicode.html"
->Unicode/Charsets</A
-></DT
-><DD
-><DL
-><DT
->25.1. <A
-HREF="unicode.html#AEN4056"
->What are charsets and unicode?</A
-></DT
-><DT
->25.2. <A
-HREF="unicode.html#AEN4065"
->Samba and charsets</A
-></DT
-></DL
-></DD
-></DL
-></DIV
-></DIV
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
@@ -1042,7 +103,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="domain-security.html"
+HREF="domain-member.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD