2024-12-24 21:34:56 +03:00 · 0001-01-01 00:00:00 +00:00 · 0001-01-01 00:00:00 +00:00 · 01fde1a40b
commit 01fde1a40b
parent f65d0d5c36
28 changed files with 2368 additions and 2231 deletions
--- a/docs/faq/FAQ-ClientApp.html
+++ b/docs/faq/FAQ-ClientApp.html
@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 3. Specific client application problems</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-Install.html" title="Chapter 2. Compiling and installing Samba on a Unix host"><link rel="next" href="FAQ-errors.html" title="Chapter 4. Common errors"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. Specific client application problems</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-Install.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-errors.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-ClientApp"></a>Chapter 3. Specific client application problems</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-ClientApp.html#id2868727">MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</a></dt><dt><a href="FAQ-ClientApp.html#id2815168">How to use a Samba share as an administrative share for MS Office, etc.</a></dt><dt><a href="FAQ-ClientApp.html#id2874026">Microsoft Access database opening errors</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2868727"></a>MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</h2></div></div><div></div></div><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 3. Specific client application problems</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-Install.html" title="Chapter 2. Compiling and installing Samba on a Unix host"><link rel="next" href="FAQ-errors.html" title="Chapter 4. Common errors"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. Specific client application problems</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-Install.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-errors.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-ClientApp"></a>Chapter 3. Specific client application problems</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-ClientApp.html#id2818225">MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</a></dt><dt><a href="FAQ-ClientApp.html#id2818256">How to use a Samba share as an administrative share for MS Office, etc.</a></dt><dt><a href="FAQ-ClientApp.html#id2816621">Microsoft Access database opening errors</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2818225"></a>MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</h2></div></div><div></div></div><p>
 When installing MS Office on a Samba drive for which you have admin
 user permissions, ie. admin users = username, you will find the
 setup program unable to complete the installation.
@ -10,7 +10,7 @@ rdonly by trying to open it for writing.
 Admin users can always open a file for writing, as they run as root.
 You just have to install as a non-admin user and then use "chown -R"
 to fix the owner.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2815168"></a>How to use a Samba share as an administrative share for MS Office, etc.</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2818256"></a>How to use a Samba share as an administrative share for MS Office, etc.</h2></div></div><div></div></div><p>
 Microsoft Office products can be installed as an administrative installation
 from which the application can either be run off the administratively installed
 product that resides on a shared resource, or from which that product can be
@ -45,7 +45,7 @@ set the following parameters on the share containing it:
 	public = yes
 </pre></li><li><p>Now you are ready to run the setup program from the Microsoft Windows
 workstation as follows: <b class="command">\\"Server_Name"\MSOP95\msoffice\setup</b>
-</p></li></ul></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2874026"></a>Microsoft Access database opening errors</h2></div></div><div></div></div><p>
+</p></li></ul></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2816621"></a>Microsoft Access database opening errors</h2></div></div><div></div></div><p>
 Here are some notes on running MS-Access on a Samba drive from <a href="stefank@esi.com.au" target="_top">Stefan Kjellberg</a>
 </p><table class="simplelist" border="0" summary="Simple list"><tr><td>Opening a database in 'exclusive' mode does NOT work. Samba ignores r/w/share modes on file open.</td></tr><tr><td>Make sure that you open the database as 'shared' and to 'lock modified records'</td></tr><tr><td>Of course locking must be enabled for the particular share (smb.conf)</td></tr></table><p>
 </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="FAQ-Install.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="samba-faq.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="FAQ-errors.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 2. Compiling and installing Samba on a Unix host </td><td width="20%" align="center"><a accesskey="h" href="samba-faq.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 4. Common errors</td></tr></table></div></body></html>
--- a/docs/faq/FAQ-Install.html
+++ b/docs/faq/FAQ-Install.html
@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 2. Compiling and installing Samba on a Unix host</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-general.html" title="Chapter 1. General Information"><link rel="next" href="FAQ-ClientApp.html" title="Chapter 3. Specific client application problems"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Compiling and installing Samba on a Unix host</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-general.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-ClientApp.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-Install"></a>Chapter 2. Compiling and installing Samba on a Unix host</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-Install.html#id2868750">My client reports "cannot locate specified share name" or similar</a></dt><dt><a href="FAQ-Install.html#id2818341">Why are my file's timestamps off by an hour, or by a few hours?</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2868750"></a>My client reports "cannot locate specified share name" or similar</h2></div></div><div></div></div><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 2. Compiling and installing Samba on a Unix host</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-general.html" title="Chapter 1. General Information"><link rel="next" href="FAQ-ClientApp.html" title="Chapter 3. Specific client application problems"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. Compiling and installing Samba on a Unix host</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-general.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-ClientApp.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-Install"></a>Chapter 2. Compiling and installing Samba on a Unix host</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-Install.html#id2818381">My client reports "cannot locate specified share name" or similar</a></dt><dt><a href="FAQ-Install.html#id2818303">Why are my file's timestamps off by an hour, or by a few hours?</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2818381"></a>My client reports "cannot locate specified share name" or similar</h2></div></div><div></div></div><p>
 This message indicates that your client CAN locate the specified
 server, which is a good start, but that it cannot find a service of
 the name you gave.
@ -7,7 +7,7 @@ The first step is to check the exact name of the service you are
 trying to connect to (consult your system administrator). Assuming it
 exists and you specified it correctly (read your client's docs on how
 to specify a service name correctly), read on:
-</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Many clients cannot accept or use service names longer than eight characters.</td></tr><tr><td>Many clients cannot accept or use service names containing spaces.</td></tr><tr><td>Some servers (not Samba though) are case sensitive with service names.</td></tr><tr><td>Some clients force service names into upper case.</td></tr></table></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2818341"></a>Why are my file's timestamps off by an hour, or by a few hours?</h2></div></div><div></div></div><p>
+</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Many clients cannot accept or use service names longer than eight characters.</td></tr><tr><td>Many clients cannot accept or use service names containing spaces.</td></tr><tr><td>Some servers (not Samba though) are case sensitive with service names.</td></tr><tr><td>Some clients force service names into upper case.</td></tr></table></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2818303"></a>Why are my file's timestamps off by an hour, or by a few hours?</h2></div></div><div></div></div><p>
 This is from Paul Eggert eggert@twinsun.com.
 </p><p>
 Most likely it's a problem with your time zone settings.
--- a/docs/faq/FAQ-errors.html
+++ b/docs/faq/FAQ-errors.html
@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 4. Common errors</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-ClientApp.html" title="Chapter 3. Specific client application problems"><link rel="next" href="FAQ-features.html" title="Chapter 5. Features"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 4. Common errors</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-ClientApp.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-features.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-errors"></a>Chapter 4. Common errors</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-errors.html#id2815122">Not listening for calling name</a></dt><dt><a href="FAQ-errors.html#id2874876">System Error 1240</a></dt><dt><a href="FAQ-errors.html#id2874916">smbclient ignores -N !</a></dt><dt><a href="FAQ-errors.html#id2874971">The data on the CD-Drive I've shared seems to be corrupted!</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2815122"></a>Not listening for calling name</h2></div></div><div></div></div><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 4. Common errors</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-ClientApp.html" title="Chapter 3. Specific client application problems"><link rel="next" href="FAQ-features.html" title="Chapter 5. Features"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 4. Common errors</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-ClientApp.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-features.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-errors"></a>Chapter 4. Common errors</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-errors.html#id2817184">Not listening for calling name</a></dt><dt><a href="FAQ-errors.html#id2817226">System Error 1240</a></dt><dt><a href="FAQ-errors.html#id2816174">smbclient ignores -N !</a></dt><dt><a href="FAQ-errors.html#id2816225">The data on the CD-Drive I've shared seems to be corrupted!</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2817184"></a>Not listening for calling name</h2></div></div><div></div></div><p>
 </p><pre class="programlisting">
 Session request failed (131,129) with myname=HOBBES destname=CALVIN
 Not listening for calling name
@ -14,7 +14,7 @@ global section of smb.conf.
 It can also be a problem with reverse DNS lookups not functioning 
 correctly, leading to the remote host identity not being able to
 be confirmed, but that is less likely.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2874876"></a>System Error 1240</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2817226"></a>System Error 1240</h2></div></div><div></div></div><p>
 System error 1240 means that the client is refusing to talk
 to a non-encrypting server. Microsoft changed WinNT in service
 pack 3 to refuse to connect to servers that do not support
@ -24,7 +24,7 @@ SMB password encryption.
 the samba HOWTO Collection</td></tr><tr><td>disable this behaviour in NT. See the section about 
 Windows NT in the chapter "Portability" of the samba HOWTO collection
 </td></tr></table><p>
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2874916"></a>smbclient ignores -N !</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2816174"></a>smbclient ignores -N !</h2></div></div><div></div></div><p>
 &#8220;<span class="quote">When getting the list of shares available on a host using the command
 <b class="command">smbclient -N -L</b>
 the program always prompts for the password if the server is a Samba server.
@ -42,7 +42,7 @@ This will set both the username and password to null, which is
 an anonymous login for SMB. Using -N would only set the password
 to null, and this is not accepted as an anonymous login for most
 SMB servers.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2874971"></a>The data on the CD-Drive I've shared seems to be corrupted!</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2816225"></a>The data on the CD-Drive I've shared seems to be corrupted!</h2></div></div><div></div></div><p>
 Some OSes (notably Linux) default to auto detection of file type on
 cdroms and do cr/lf translation. This is a very bad idea when use with
 Samba. It causes all sorts of stuff ups.
--- a/docs/faq/FAQ-features.html
+++ b/docs/faq/FAQ-features.html
@ -1,7 +1,7 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 5. Features</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-errors.html" title="Chapter 4. Common errors"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 5. Features</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-errors.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-features"></a>Chapter 5. Features</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-features.html#id2875179">How can I use samba as a fax server?</a></dt><dd><dl><dt><a href="FAQ-features.html#id2874300">Tools for printing faxes</a></dt><dt><a href="FAQ-features.html#id2874353">Making the fax-server</a></dt><dt><a href="FAQ-features.html#id2874445">Installing the client drivers</a></dt><dt><a href="FAQ-features.html#id2874838">Example smb.conf</a></dt></dl></dd><dt><a href="FAQ-features.html#id2814744">Samba doesn't work well together with DHCP!</a></dt><dt><a href="FAQ-features.html#id2814866">How can I assign NetBIOS names to clients with DHCP?</a></dt><dt><a href="FAQ-features.html#id2883464">How do I convert between unix and dos text formats?</a></dt><dt><a href="FAQ-features.html#id2883493">Does samba have wins replication support?</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2875179"></a>How can I use samba as a fax server?</h2></div></div><div></div></div><p>Contributor: <a href="mailto:zuber@berlin.snafu.de" target="_top">Gerhard Zuber</a></p><p>Requirements:
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 5. Features</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="FAQ-errors.html" title="Chapter 4. Common errors"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 5. Features</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="FAQ-errors.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-features"></a>Chapter 5. Features</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-features.html#id2816095">How can I use samba as a fax server?</a></dt><dd><dl><dt><a href="FAQ-features.html#id2816474">Tools for printing faxes</a></dt><dt><a href="FAQ-features.html#id2816526">Making the fax-server</a></dt><dt><a href="FAQ-features.html#id2882877">Installing the client drivers</a></dt><dt><a href="FAQ-features.html#id2882962">Example smb.conf</a></dt></dl></dd><dt><a href="FAQ-features.html#id2882986">Samba doesn't work well together with DHCP!</a></dt><dt><a href="FAQ-features.html#id2883112">How can I assign NetBIOS names to clients with DHCP?</a></dt><dt><a href="FAQ-features.html#id2883160">How do I convert between unix and dos text formats?</a></dt><dt><a href="FAQ-features.html#id2883189">Does samba have wins replication support?</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2816095"></a>How can I use samba as a fax server?</h2></div></div><div></div></div><p>Contributor: <a href="mailto:zuber@berlin.snafu.de" target="_top">Gerhard Zuber</a></p><p>Requirements:
 </p><table class="simplelist" border="0" summary="Simple list"><tr><td>UNIX box (Linux preferred) with SAMBA and a faxmodem</td></tr><tr><td>ghostscript package</td></tr><tr><td>mgetty+sendfax package</td></tr><tr><td>pbm package (portable bitmap tools)</td></tr></table><p>
 </p><p>First, install and configure the required packages. Be sure to read the mgetty+sendfax 
-manual carefully.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2874300"></a>Tools for printing faxes</h3></div></div><div></div></div><p>Your incomed faxes are in:
+manual carefully.</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2816474"></a>Tools for printing faxes</h3></div></div><div></div></div><p>Your incomed faxes are in:
 <tt class="filename">/var/spool/fax/incoming</tt>. Print it with:</p><pre class="programlisting">
 for i in *
 do
@ -15,7 +15,7 @@ for printing to HP lasers.
 If you want to produce files for displaying and printing with Windows, use
 some tools from the pbm-package like the following command: <b class="command">g3cat $i | g3topbm - |  ppmtopcx - &gt;$i.pcx</b>
 and view it with your favourite Windows tool (maybe paintbrush)
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2874353"></a>Making the fax-server</h3></div></div><div></div></div><p>fetch the file <tt class="filename">mgetty+sendfax/frontends/winword/faxfilter</tt> and place it in <tt class="filename">/usr/local/etc/mgetty+sendfax/</tt>(replace /usr/local/ with whatever place you installed mgetty+sendfax)</p><p>prepare your faxspool file as mentioned in this file
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2816526"></a>Making the fax-server</h3></div></div><div></div></div><p>fetch the file <tt class="filename">mgetty+sendfax/frontends/winword/faxfilter</tt> and place it in <tt class="filename">/usr/local/etc/mgetty+sendfax/</tt>(replace /usr/local/ with whatever place you installed mgetty+sendfax)</p><p>prepare your faxspool file as mentioned in this file
 edit fax/faxspool.in and reinstall or change the final
 /usr/local/bin/faxspool too.
 </p><pre class="programlisting">
@ -33,7 +33,7 @@ lp3|fax:\
        :sd=/usr/spool/lp3:\
        :if=/usr/local/etc/mgetty+sendfax/faxfilter:sh:sf:mx#0:\
        :lf=/usr/spool/lp3/fax-log:
-</pre><p>Now, edit your <tt class="filename">smb.conf</tt> so you have a smb based printer named "fax"</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2874445"></a>Installing the client drivers</h3></div></div><div></div></div><p>
+</pre><p>Now, edit your <tt class="filename">smb.conf</tt> so you have a smb based printer named "fax"</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2882877"></a>Installing the client drivers</h3></div></div><div></div></div><p>
 Now you have a printer called "fax" which can be used via
 TCP/IP-printing (lpd-system) or via SAMBA (windows printing).
 </p><p>
@ -72,7 +72,7 @@ uses the found number as the fax-destination-number.
 Now print your fax through the fax-printer and it will be
 queued for later transmission. Use faxrunq for sending the
 queue out.
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2874838"></a>Example smb.conf</h3></div></div><div></div></div><pre class="programlisting">
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2882962"></a>Example smb.conf</h3></div></div><div></div></div><pre class="programlisting">
 [global]
 printcap name = /etc/printcap
 print command = /usr/bin/lpr -r -P %p %s
@ -88,7 +88,7 @@ queue out.
    create mode = 0700
    browseable = yes
    guest ok = no
-</pre></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2814744"></a>Samba doesn't work well together with DHCP!</h2></div></div><div></div></div><p>
+</pre></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2882986"></a>Samba doesn't work well together with DHCP!</h2></div></div><div></div></div><p>
 We wish to help those folks who wish to use the ISC DHCP Server and provide
 sample configuration settings. Most operating systems today come ship with
 the ISC DHCP Server. ISC DHCP is available from:
@ -148,7 +148,7 @@ Server provides only a sub-set of rfc1533 functionality this is hardly an issue
 in those sites that already have a large investment and commitment to Unix
 systems and technologies. The current state of the art of the DHCP Server
 specification in covered in rfc2132.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2814866"></a>How can I assign NetBIOS names to clients with DHCP?</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2883112"></a>How can I assign NetBIOS names to clients with DHCP?</h2></div></div><div></div></div><p>
 SMB network clients need to be configured so that all standard TCP/IP name to
 address resolution works correctly. Once this has been achieved the SMB
 environment provides additional tools and services that act as helper agents in
@ -163,13 +163,13 @@ This can be done, but needs a few NT registry hacks and you need to be able to
 speak UNICODE, which is of course no problem for a True Wizzard(tm) :)
 Instructions on how to do this (including a small util for less capable
 Wizzards) can be found at
-</p><p><a href="http://www.unixtools.org/~nneul/sw/nt/dhcp-netbios-hostname.html" target="_top">http://www.unixtools.org/~nneul/sw/nt/dhcp-netbios-hostname.html</a></p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2883464"></a>How do I convert between unix and dos text formats?</h2></div></div><div></div></div><p>
+</p><p><a href="http://www.unixtools.org/~nneul/sw/nt/dhcp-netbios-hostname.html" target="_top">http://www.unixtools.org/~nneul/sw/nt/dhcp-netbios-hostname.html</a></p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2883160"></a>How do I convert between unix and dos text formats?</h2></div></div><div></div></div><p>
 Jim barry has written an <a href="ftp://samba.org/pub/samba/contributed/fixcrlf.zip" target="_top">
 excellent drag-and-drop cr/lf converter for
 windows</a>. Just drag your file onto the icon and it converts the file.
 </p><p>
 The utilities unix2dos and dos2unix(in the mtools package) should do 
 the job under unix.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2883493"></a>Does samba have wins replication support?</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2883189"></a>Does samba have wins replication support?</h2></div></div><div></div></div><p>
 At the time of writing there is currently being worked on a wins replication implementation(wrepld).
 </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="FAQ-errors.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="samba-faq.html">Up</a></td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Chapter 4. Common errors </td><td width="20%" align="center"><a accesskey="h" href="samba-faq.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
--- a/docs/faq/FAQ-general.html
+++ b/docs/faq/FAQ-general.html
@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 1. General Information</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="samba-faq.html" title="Samba FAQ"><link rel="next" href="FAQ-Install.html" title="Chapter 2. Compiling and installing Samba on a Unix host"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. General Information</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="samba-faq.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-Install.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-general"></a>Chapter 1. General Information</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-general.html#id2882842">What do the version numbers mean?</a></dt><dt><a href="FAQ-general.html#id2883252">What platforms are supported?</a></dt><dt><a href="FAQ-general.html#id2868767">How do I subscribe to the Samba Mailing Lists?</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2882842"></a>What do the version numbers mean?</h2></div></div><div></div></div><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Chapter 1. General Information</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="up" href="samba-faq.html" title="Samba FAQ"><link rel="previous" href="samba-faq.html" title="Samba FAQ"><link rel="next" href="FAQ-Install.html" title="Chapter 2. Compiling and installing Samba on a Unix host"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. General Information</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="samba-faq.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-Install.html">Next</a></td></tr></table><hr></div><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="FAQ-general"></a>Chapter 1. General Information</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><a href="FAQ-general.html#id2814586">What do the version numbers mean?</a></dt><dt><a href="FAQ-general.html#id2814212">What platforms are supported?</a></dt><dt><a href="FAQ-general.html#id2817416">How do I subscribe to the Samba Mailing Lists?</a></dt></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2814586"></a>What do the version numbers mean?</h2></div></div><div></div></div><p>
 It is not recommended that you run a version of Samba with the word
 "alpha" in its name unless you know what you are doing and are willing
 to do some debugging. Many, many people just get the latest
@ -37,11 +37,11 @@ The above system means that whenever someone looks at the samba ftp
 site they will be able to grab the highest numbered release without an
 alpha in the name and be sure of getting the current recommended
 version.
-</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2883252"></a>What platforms are supported?</h2></div></div><div></div></div><p>
+</p></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2814212"></a>What platforms are supported?</h2></div></div><div></div></div><p>
 Many different platforms have run Samba successfully. The platforms
 most widely used and thus best tested are Linux and SunOS.</p><p>
 At time of writing, there is support (or has been support for in earlier 
 versions):
-</p><table class="simplelist" border="0" summary="Simple list"><tr><td>A/UX 3.0</td></tr><tr><td>AIX</td></tr><tr><td>Altos Series 386/1000</td></tr><tr><td>Amiga</td></tr><tr><td>Apollo Domain/OS sr10.3</td></tr><tr><td>BSDI </td></tr><tr><td>B.O.S. (Bull Operating System)</td></tr><tr><td>Cray, Unicos 8.0</td></tr><tr><td>Convex</td></tr><tr><td>DGUX. </td></tr><tr><td>DNIX.</td></tr><tr><td>FreeBSD</td></tr><tr><td>HP-UX</td></tr><tr><td>Intergraph. </td></tr><tr><td>Linux with/without shadow passwords and quota</td></tr><tr><td>LYNX 2.3.0</td></tr><tr><td>MachTen (a unix like system for Macintoshes)</td></tr><tr><td>Motorola 88xxx/9xx range of machines</td></tr><tr><td>NetBSD</td></tr><tr><td>NEXTSTEP Release 2.X, 3.0 and greater (including OPENSTEP for Mach).</td></tr><tr><td>OS/2 using EMX 0.9b</td></tr><tr><td>OSF1</td></tr><tr><td>QNX 4.22</td></tr><tr><td>RiscIX. </td></tr><tr><td>RISCOs 5.0B</td></tr><tr><td>SEQUENT. </td></tr><tr><td>SCO (including: 3.2v2, European dist., OpenServer 5)</td></tr><tr><td>SGI.</td></tr><tr><td>SMP_DC.OSx v1.1-94c079 on Pyramid S series</td></tr><tr><td>SONY NEWS, NEWS-OS (4.2.x and 6.1.x)</td></tr><tr><td>SUNOS 4</td></tr><tr><td>SUNOS 5.2, 5.3, and 5.4 (Solaris 2.2, 2.3, and '2.4 and later')</td></tr><tr><td>Sunsoft ISC SVR3V4</td></tr><tr><td>SVR4</td></tr><tr><td>System V with some berkely extensions (Motorola 88k R32V3.2).</td></tr><tr><td>ULTRIX.</td></tr><tr><td>UNIXWARE</td></tr><tr><td>UXP/DS</td></tr></table></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2868767"></a>How do I subscribe to the Samba Mailing Lists?</h2></div></div><div></div></div><p>
+</p><table class="simplelist" border="0" summary="Simple list"><tr><td>A/UX 3.0</td></tr><tr><td>AIX</td></tr><tr><td>Altos Series 386/1000</td></tr><tr><td>Amiga</td></tr><tr><td>Apollo Domain/OS sr10.3</td></tr><tr><td>BSDI </td></tr><tr><td>B.O.S. (Bull Operating System)</td></tr><tr><td>Cray, Unicos 8.0</td></tr><tr><td>Convex</td></tr><tr><td>DGUX. </td></tr><tr><td>DNIX.</td></tr><tr><td>FreeBSD</td></tr><tr><td>HP-UX</td></tr><tr><td>Intergraph. </td></tr><tr><td>Linux with/without shadow passwords and quota</td></tr><tr><td>LYNX 2.3.0</td></tr><tr><td>MachTen (a unix like system for Macintoshes)</td></tr><tr><td>Motorola 88xxx/9xx range of machines</td></tr><tr><td>NetBSD</td></tr><tr><td>NEXTSTEP Release 2.X, 3.0 and greater (including OPENSTEP for Mach).</td></tr><tr><td>OS/2 using EMX 0.9b</td></tr><tr><td>OSF1</td></tr><tr><td>QNX 4.22</td></tr><tr><td>RiscIX. </td></tr><tr><td>RISCOs 5.0B</td></tr><tr><td>SEQUENT. </td></tr><tr><td>SCO (including: 3.2v2, European dist., OpenServer 5)</td></tr><tr><td>SGI.</td></tr><tr><td>SMP_DC.OSx v1.1-94c079 on Pyramid S series</td></tr><tr><td>SONY NEWS, NEWS-OS (4.2.x and 6.1.x)</td></tr><tr><td>SUNOS 4</td></tr><tr><td>SUNOS 5.2, 5.3, and 5.4 (Solaris 2.2, 2.3, and '2.4 and later')</td></tr><tr><td>Sunsoft ISC SVR3V4</td></tr><tr><td>SVR4</td></tr><tr><td>System V with some berkely extensions (Motorola 88k R32V3.2).</td></tr><tr><td>ULTRIX.</td></tr><tr><td>UNIXWARE</td></tr><tr><td>UXP/DS</td></tr></table></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2817416"></a>How do I subscribe to the Samba Mailing Lists?</h2></div></div><div></div></div><p>
 Look at <a href="http://samba.org/samba/archives.html" target="_top">the samba mailing list page</a>
 </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="samba-faq.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="samba-faq.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="FAQ-Install.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Samba FAQ </td><td width="20%" align="center"><a accesskey="h" href="samba-faq.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. Compiling and installing Samba on a Unix host</td></tr></table></div></body></html>
--- a/docs/faq/samba-faq.html
+++ b/docs/faq/samba-faq.html
@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Samba FAQ</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="next" href="FAQ-general.html" title="Chapter 1. General Information"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Samba FAQ</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-general.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="Samba-FAQ"></a>Samba FAQ</h1></div><div><div class="author"><h3 class="author"><span class="surname">Samba Team</span></h3></div></div><div><p class="pubdate">October 2002</p></div></div><div></div><hr></div><div class="dedication" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id2882190"></a>Dedication</h2></div></div><div></div></div><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>Samba FAQ</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"><link rel="home" href="samba-faq.html" title="Samba FAQ"><link rel="next" href="FAQ-general.html" title="Chapter 1. General Information"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Samba FAQ</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="FAQ-general.html">Next</a></td></tr></table><hr></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="Samba-FAQ"></a>Samba FAQ</h1></div><div><div class="author"><h3 class="author"><span class="surname">Samba Team</span></h3></div></div><div><p class="pubdate">October 2002</p></div></div><div></div><hr></div><div class="dedication" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id2881422"></a>Dedication</h2></div></div><div></div></div><p>
 This is the Frequently Asked Questions (FAQ) document for
 Samba, the free and very popular SMB server product. An SMB server
 allows file and printer connections from clients such as Windows,
@ -7,4 +7,4 @@ corrections to the samba documentation mailinglist at
 <a href="mailto:samba-doc@samba.org" target="_top">samba-doc@samba.org</a>. 
 This FAQ was based on the old Samba FAQ by Dan Shearer and Paul Blackman, 
 and the old samba text documents which were mostly written by John Terpstra.
-</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="FAQ-general.html">General Information</a></dt><dd><dl><dt><a href="FAQ-general.html#id2882842">What do the version numbers mean?</a></dt><dt><a href="FAQ-general.html#id2883252">What platforms are supported?</a></dt><dt><a href="FAQ-general.html#id2868767">How do I subscribe to the Samba Mailing Lists?</a></dt></dl></dd><dt>2. <a href="FAQ-Install.html">Compiling and installing Samba on a Unix host</a></dt><dd><dl><dt><a href="FAQ-Install.html#id2868750">My client reports "cannot locate specified share name" or similar</a></dt><dt><a href="FAQ-Install.html#id2818341">Why are my file's timestamps off by an hour, or by a few hours?</a></dt></dl></dd><dt>3. <a href="FAQ-ClientApp.html">Specific client application problems</a></dt><dd><dl><dt><a href="FAQ-ClientApp.html#id2868727">MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</a></dt><dt><a href="FAQ-ClientApp.html#id2815168">How to use a Samba share as an administrative share for MS Office, etc.</a></dt><dt><a href="FAQ-ClientApp.html#id2874026">Microsoft Access database opening errors</a></dt></dl></dd><dt>4. <a href="FAQ-errors.html">Common errors</a></dt><dd><dl><dt><a href="FAQ-errors.html#id2815122">Not listening for calling name</a></dt><dt><a href="FAQ-errors.html#id2874876">System Error 1240</a></dt><dt><a href="FAQ-errors.html#id2874916">smbclient ignores -N !</a></dt><dt><a href="FAQ-errors.html#id2874971">The data on the CD-Drive I've shared seems to be corrupted!</a></dt></dl></dd><dt>5. <a href="FAQ-features.html">Features</a></dt><dd><dl><dt><a href="FAQ-features.html#id2875179">How can I use samba as a fax server?</a></dt><dd><dl><dt><a href="FAQ-features.html#id2874300">Tools for printing faxes</a></dt><dt><a href="FAQ-features.html#id2874353">Making the fax-server</a></dt><dt><a href="FAQ-features.html#id2874445">Installing the client drivers</a></dt><dt><a href="FAQ-features.html#id2874838">Example smb.conf</a></dt></dl></dd><dt><a href="FAQ-features.html#id2814744">Samba doesn't work well together with DHCP!</a></dt><dt><a href="FAQ-features.html#id2814866">How can I assign NetBIOS names to clients with DHCP?</a></dt><dt><a href="FAQ-features.html#id2883464">How do I convert between unix and dos text formats?</a></dt><dt><a href="FAQ-features.html#id2883493">Does samba have wins replication support?</a></dt></dl></dd></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="FAQ-general.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> Chapter 1. General Information</td></tr></table></div></body></html>
+</p></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="FAQ-general.html">General Information</a></dt><dd><dl><dt><a href="FAQ-general.html#id2814586">What do the version numbers mean?</a></dt><dt><a href="FAQ-general.html#id2814212">What platforms are supported?</a></dt><dt><a href="FAQ-general.html#id2817416">How do I subscribe to the Samba Mailing Lists?</a></dt></dl></dd><dt>2. <a href="FAQ-Install.html">Compiling and installing Samba on a Unix host</a></dt><dd><dl><dt><a href="FAQ-Install.html#id2818381">My client reports "cannot locate specified share name" or similar</a></dt><dt><a href="FAQ-Install.html#id2818303">Why are my file's timestamps off by an hour, or by a few hours?</a></dt></dl></dd><dt>3. <a href="FAQ-ClientApp.html">Specific client application problems</a></dt><dd><dl><dt><a href="FAQ-ClientApp.html#id2818225">MS Office Setup reports "Cannot change properties of '\\MSOFFICE\\SETUP.INI'"</a></dt><dt><a href="FAQ-ClientApp.html#id2818256">How to use a Samba share as an administrative share for MS Office, etc.</a></dt><dt><a href="FAQ-ClientApp.html#id2816621">Microsoft Access database opening errors</a></dt></dl></dd><dt>4. <a href="FAQ-errors.html">Common errors</a></dt><dd><dl><dt><a href="FAQ-errors.html#id2817184">Not listening for calling name</a></dt><dt><a href="FAQ-errors.html#id2817226">System Error 1240</a></dt><dt><a href="FAQ-errors.html#id2816174">smbclient ignores -N !</a></dt><dt><a href="FAQ-errors.html#id2816225">The data on the CD-Drive I've shared seems to be corrupted!</a></dt></dl></dd><dt>5. <a href="FAQ-features.html">Features</a></dt><dd><dl><dt><a href="FAQ-features.html#id2816095">How can I use samba as a fax server?</a></dt><dd><dl><dt><a href="FAQ-features.html#id2816474">Tools for printing faxes</a></dt><dt><a href="FAQ-features.html#id2816526">Making the fax-server</a></dt><dt><a href="FAQ-features.html#id2882877">Installing the client drivers</a></dt><dt><a href="FAQ-features.html#id2882962">Example smb.conf</a></dt></dl></dd><dt><a href="FAQ-features.html#id2882986">Samba doesn't work well together with DHCP!</a></dt><dt><a href="FAQ-features.html#id2883112">How can I assign NetBIOS names to clients with DHCP?</a></dt><dt><a href="FAQ-features.html#id2883160">How do I convert between unix and dos text formats?</a></dt><dt><a href="FAQ-features.html#id2883189">Does samba have wins replication support?</a></dt></dl></dd></dl></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="FAQ-general.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> Chapter 1. General Information</td></tr></table></div></body></html>
--- a/docs/htmldocs/Samba-Developers-Guide.html
+++ b/docs/htmldocs/Samba-Developers-Guide.html
--- a/docs/htmldocs/Samba-HOWTO-Collection.html
+++ b/docs/htmldocs/Samba-HOWTO-Collection.html
--- a/docs/htmldocs/net.8.html
+++ b/docs/htmldocs/net.8.html
@ -24,7 +24,7 @@
 		Defaults to trying 445 first, then 139.
 		</p></dd><dt><span class="term">-n &lt;primary NetBIOS name&gt;</span></dt><dd><p>This option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
-to setting the <a class="indexterm" name="id2796721"></a><i class="parameter"><tt>netbios name</tt></i> parameter in the <tt class="filename">smb.conf</tt> file. 
+to setting the <a class="indexterm" name="id2796900"></a><a href="#"><i class="parameter"><tt>netbios name</tt></i></a> parameter in the <tt class="filename">smb.conf</tt> file. 
 However, a command
 line setting will take precedence over settings in
 <tt class="filename">smb.conf</tt>.</p></dd><dt><span class="term">-s &lt;configuration file&gt;</span></dt><dd><p>The file specified contains the 
@ -53,11 +53,18 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796870"></a><i class="parameter"><tt>log level</tt></i> parameter
-in the <tt class="filename">smb.conf</tt> file.</p></dd></dl></div></div><div class="refsect1" lang="en"><h2>COMMANDS</h2><div class="refsect2" lang="en"><h3>TIME</h3><p>The <b class="command">NET TIME</b> command allows you to view the time on a remote server
+override the <a class="indexterm" name="id2797170"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
+in the <tt class="filename">smb.conf</tt> file.</p></dd></dl></div></div><div class="refsect1" lang="en"><h2>COMMANDS</h2><div class="refsect2" lang="en"><h3>CHANGESECRETPW</h3><p>This command allows the Samba machine account password to be set from an external application
+to a machine account password that has already been stored in Active Directory. DO NOT USE this command
+unless you know exactly what you are doing. The use of this command requires that the force flag (-f)
+be used also. There will be NO command prompt. Whatever information is piped into stdin, either by
+typing at the command line or otherwise, will be stored as the literal machine password. Do NOT use
+this without care and attention as it will overwrite a legitimate machine password without warning.
+YOU HAVE BEEN WARNED.
+</p></div><div class="refsect2" lang="en"><h3>TIME</h3><p>The <b class="command">NET TIME</b> command allows you to view the time on a remote server
 	or synchronise the time on the local server with the time on the remote server.</p><div class="refsect3" lang="en"><h4>TIME</h4><p>Without any options, the <b class="command">NET TIME</b> command 
 displays the time on the remote server.
-</p></div><div class="refsect3" lang="en"><h4>TIME SYSTEM</h4><p> Displays the time on the remote server in a format ready for <b class="command">/bin/date</b></p></div><div class="refsect3" lang="en"><h4>TIME SET</h4><p>Tries to set the date and time of the local server to that on 
+</p></div><div class="refsect3" lang="en"><h4>TIME SYSTEM</h4><p>Displays the time on the remote server in a format ready for <b class="command">/bin/date</b></p></div><div class="refsect3" lang="en"><h4>TIME SET</h4><p>Tries to set the date and time of the local server to that on 
 the remote server using <b class="command">/bin/date</b>. </p></div><div class="refsect3" lang="en"><h4>TIME ZONE</h4><p>Displays the timezone in hours from GMT on the remote computer.</p></div></div><div class="refsect2" lang="en"><h3>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [options]</h3><p>
 Join a domain.  If the account already exists on the server, and 
 [TYPE] is MEMBER, the machine will attempt to join automatically. 
@ -102,8 +109,8 @@ can be controlled using 'NET CACHE'.</p><p>All the timeout parameters support th
 List all current items in the cache.
 </p></div><div class="refsect3" lang="en"><h4>CACHE FLUSH</h4><p>Remove all the current items from the cache.</p></div></div><div class="refsect2" lang="en"><h3>GETLOCALSID [DOMAIN]</h3><p>Print the SID of the specified domain, or if the parameter is
 omitted, the SID of the domain the local server is in.</p></div><div class="refsect2" lang="en"><h3>SETLOCALSID S-1-5-21-x-y-z</h3><p>Sets domain sid for the local server to the specified SID.</p></div><div class="refsect2" lang="en"><h3>GROUPMAP</h3><p>Manage the mappings between Windows group SIDs and UNIX groups.
-Parameters take the for &quot;parameter=value&quot;.  Common options include:</p><div class="itemizedlist"><ul type="disc"><li><p>unixgroup - Name of the UNIX group</p></li><li><p>ntgroup - Name of the Windows NT group (must be
-  resolvable to a SID</p></li><li><p>rid - Unsigned 32-bit integer</p></li><li><p>sid - Full SID in the form of &quot;S-1-...&quot;</p></li><li><p>type - Type of the group; either 'domain', 'local',
+Parameters take the for "parameter=value".  Common options include:</p><div class="itemizedlist"><ul type="disc"><li><p>unixgroup - Name of the UNIX group</p></li><li><p>ntgroup - Name of the Windows NT group (must be
+  resolvable to a SID</p></li><li><p>rid - Unsigned 32-bit integer</p></li><li><p>sid - Full SID in the form of "S-1-..."</p></li><li><p>type - Type of the group; either 'domain', 'local',
  or 'builtin'</p></li><li><p>comment - Freeform text description of the group</p></li></ul></div><div class="refsect3" lang="en"><h4>GROUPMAP ADD</h4><p>Add a new group mapping entry</p><p>net groupmap add {rid=int|sid=string} unixgroup=string [type={domain|local|builtin}] [ntgroup=string] [comment=string]</p></div><div class="refsect3" lang="en"><h4>GROUPMAP DELETE</h4><p>Delete a group mapping entry</p><p>net groupmap delete {ntgroup=string|sid=SID}</p></div><div class="refsect3" lang="en"><h4>GROUPMAP MODIFY</h4><p>Update en existing group entry</p><p>net groupmap modify {ntgroup=string|sid=SID} [unixgroup=string] [comment=string] [type={domain|local}</p></div><div class="refsect3" lang="en"><h4>GROUPMAP LIST</h4><p>List existing group mapping entries</p><p>net groupmap list [verbose] [ntgroup=string] [sid=SID]</p></div></div><div class="refsect2" lang="en"><h3>MAXRID</h3><p>Prints out the highest RID currently in use on the local
 server (by the active 'passdb backend').
 </p></div><div class="refsect2" lang="en"><h3>RPC INFO</h3><p>Print information about the domain of the remote server,
@ -129,7 +136,7 @@ local server. Can only be run an a BDC.
 </p></div><div class="refsect2" lang="en"><h3>GETSID</h3><p>Fetch domain SID and store it in the local <tt class="filename">secrets.tdb</tt>. </p></div><div class="refsect2" lang="en"><h3>ADS LEAVE</h3><p>Make the remote host leave the domain it is part of. </p></div><div class="refsect2" lang="en"><h3>ADS STATUS</h3><p>Print out status of machine account of the local machine in ADS.
 Prints out quite some debug info. Aimed at developers, regular 
 users should use <b class="command">NET ADS TESTJOIN</b>.</p></div><div class="refsect2" lang="en"><h3>ADS PRINTER</h3><div class="refsect3" lang="en"><h4>ADS PRINTER INFO [<i class="replaceable"><tt>PRINTER</tt></i>] [<i class="replaceable"><tt>SERVER</tt></i>]</h4><p>
-Lookup info for <i class="replaceable"><tt>PRINTER</tt></i> on <i class="replaceable"><tt>SERVER</tt></i>. The printer name defaults to &quot;*&quot;, the 
+Lookup info for <i class="replaceable"><tt>PRINTER</tt></i> on <i class="replaceable"><tt>SERVER</tt></i>. The printer name defaults to "*", the 
 server name defaults to the local host.</p></div><div class="refsect3" lang="en"><h4>ADS PRINTER PUBLISH <i class="replaceable"><tt>PRINTER</tt></i></h4><p>Publish specified printer using ADS.</p></div><div class="refsect3" lang="en"><h4>ADS PRINTER REMOVE <i class="replaceable"><tt>PRINTER</tt></i></h4><p>Remove specified printer from ADS directory.</p></div></div><div class="refsect2" lang="en"><h3>ADS SEARCH <i class="replaceable"><tt>EXPRESSION</tt></i> <i class="replaceable"><tt>ATTRIBUTES...</tt></i></h3><p>Perform a raw LDAP search on a ADS server and dump the results. The 
 expression is a standard LDAP search expression, and the 
 attributes are a list of LDAP fields to show in the results.</p><p>Example: <b class="userinput"><tt>net ads search '(objectCategory=group)' sAMAccountName</tt></b>
--- a/docs/htmldocs/nmbd.8.html
+++ b/docs/htmldocs/nmbd.8.html
@ -4,12 +4,12 @@
 	those produced by SMB/CIFS clients such as Windows 95/98/ME, 
 	Windows NT, Windows 2000, Windows XP and LanManager clients. It also
 	participates in the browsing protocols which make up the 
-	Windows &quot;Network Neighborhood&quot; view.</p><p>SMB/CIFS clients, when they start up, may wish to 
+	Windows "Network Neighborhood" view.</p><p>SMB/CIFS clients, when they start up, may wish to 
 	locate an SMB/CIFS server. That is, they wish to know what 
 	IP number a specified host is using.</p><p>Amongst other services, <b class="command">nmbd</b> will 
 	listen for such requests, and if its own NetBIOS name is 
 	specified it will respond with the IP number of the host it 
-	is running on.  Its &quot;own NetBIOS name&quot; is by
+	is running on.  Its "own NetBIOS name" is by
 	default the primary DNS name of the host it is running on, 
 	but this can be overridden with the <span class="emphasis"><em>-n</em></span> 
 	option (see OPTIONS below). Thus <b class="command">nmbd</b> will 
@ -42,7 +42,7 @@
 		</p></dd><dt><span class="term">-S</span></dt><dd><p>If specified, this parameter causes
 		<b class="command">nmbd</b> to log to standard output rather
 		than a file.</p></dd><dt><span class="term">-i</span></dt><dd><p>If this parameter is specified it causes the
-		server to run &quot;interactively&quot;, not as a daemon, even if the
+		server to run "interactively", not as a daemon, even if the
 		server is executed on the command line of a shell. Setting this
 		parameter negates the implicit daemon mode when run from the
 		command line. <b class="command">nmbd</b> also logs to standard
@ -51,7 +51,7 @@
 </p></dd><dt><span class="term">-H &lt;filename&gt;</span></dt><dd><p>NetBIOS lmhosts file.  The lmhosts 
 		file is a list of NetBIOS names to IP addresses that 
 		is loaded by the nmbd server and used via the name 
-		resolution mechanism <a class="indexterm" name="id2796904"></a><i class="parameter"><tt>name resolve order</tt></i> described in <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> to resolve any 
+		resolution mechanism <a class="indexterm" name="id2797065"></a><a href="#"><i class="parameter"><tt>name resolve order</tt></i></a> described in <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> to resolve any 
 		NetBIOS name queries needed by the server. Note 
 		that the contents of this file are <span class="emphasis"><em>NOT</em></span> 
 		used by <b class="command">nmbd</b> to answer any name queries. 
@ -80,9 +80,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2797084"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2797372"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd><dt><span class="term">-p &lt;UDP port number&gt;</span></dt><dd><p>UDP port number is a positive integer value.
 		This option changes the default UDP port number (normally 137)
@ -104,13 +104,13 @@ never removed by the client.
 		configuration file. Other common places that systems
 		install this file are <tt class="filename">/usr/samba/lib/smb.conf</tt>
 		and <tt class="filename">/etc/samba/smb.conf</tt>.</p><p>When run as a WINS server (see the
-			<a class="indexterm" name="id2797295"></a><i class="parameter"><tt>wins support</tt></i>
+			<a class="indexterm" name="id2797588"></a><a href="#"><i class="parameter"><tt>wins support</tt></i></a>
 		parameter in the <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> man page),
 		<b class="command">nmbd</b>
 		will store the WINS database in the file <tt class="filename">wins.dat</tt>
 		in the <tt class="filename">var/locks</tt> directory configured under
 		wherever Samba was configured to install itself.</p><p>If <b class="command">nmbd</b> is acting as a <span class="emphasis"><em>
-				browse master</em></span> (see the <a class="indexterm" name="id2797358"></a><i class="parameter"><tt>local master</tt></i>
+				browse master</em></span> (see the <a class="indexterm" name="id2797657"></a><a href="#"><i class="parameter"><tt>local master</tt></i></a>
 		parameter in the <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> man page, <b class="command">nmbd</b>
 		will store the browsing database in the file <tt class="filename">browse.dat
 		</tt> in the <tt class="filename">var/locks</tt> directory
--- a/docs/htmldocs/nmblookup.1.html
+++ b/docs/htmldocs/nmblookup.1.html
@ -6,9 +6,9 @@
 	are done over UDP.</p></div><div class="refsect1" lang="en"><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-M</span></dt><dd><p>Searches for a master browser by looking 
 		up the  NetBIOS name <i class="replaceable"><tt>name</tt></i> with a 
 		type of <tt class="constant">0x1d</tt>. If <i class="replaceable"><tt>
-		name</tt></i> is &quot;-&quot; then it does a lookup on the special name 
+		name</tt></i> is "-" then it does a lookup on the special name 
 		<tt class="constant">__MSBROWSE__</tt>. Please note that in order to 
-		use the name &quot;-&quot;, you need to make sure &quot;-&quot; isn't parsed as an 
+		use the name "-", you need to make sure "-" isn't parsed as an 
 		argument, e.g. use : 
 		<b class="userinput"><tt>nmblookup -M -- -</tt></b>.</p></dd><dt><span class="term">-R</span></dt><dd><p>Set the recursion desired bit in the packet 
 		to do a recursive lookup. This is used when sending a name 
@ -28,7 +28,7 @@
 		</p></dd><dt><span class="term">-A</span></dt><dd><p>Interpret <i class="replaceable"><tt>name</tt></i> as 
 		an IP Address and do a node status query on this address.</p></dd><dt><span class="term">-n &lt;primary NetBIOS name&gt;</span></dt><dd><p>This option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
-to setting the <a class="indexterm" name="id2796756"></a><i class="parameter"><tt>netbios name</tt></i> parameter in the <tt class="filename">smb.conf</tt> file. 
+to setting the <a class="indexterm" name="id2799960"></a><a href="#"><i class="parameter"><tt>netbios name</tt></i></a> parameter in the <tt class="filename">smb.conf</tt> file. 
 However, a command
 line setting will take precedence over settings in
 <tt class="filename">smb.conf</tt>.</p></dd><dt><span class="term">-i &lt;scope&gt;</span></dt><dd><p>This specifies a NetBIOS scope that
@ -73,9 +73,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2797037"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2800366"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd><dt><span class="term">-T</span></dt><dd><p>This causes any IP addresses found in the 
 		lookup to be looked up via a reverse DNS lookup into a 
--- a/docs/htmldocs/ntlm_auth.1.html
+++ b/docs/htmldocs/ntlm_auth.1.html
@ -31,9 +31,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796746"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2799954"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd><dt><span class="term">-h|--help</span></dt><dd><p>Print a summary of command line options.
 </p></dd></dl></div></div><div class="refsect1" lang="en"><h2>VERSION</h2><p>This man page is correct for version 3.0 of the Samba 
--- a/docs/htmldocs/pdbedit.8.html
+++ b/docs/htmldocs/pdbedit.8.html
@ -31,7 +31,7 @@ Home Directory: \\BERSERKER\samba
 HomeDir Drive:  
 Logon Script:   
 Profile Path:   \\BERSERKER\profile
-</pre></dd><dt><span class="term">-w</span></dt><dd><p>This option sets the &quot;smbpasswd&quot; listing format.
+</pre></dd><dt><span class="term">-w</span></dt><dd><p>This option sets the "smbpasswd" listing format.
 		It will make pdbedit list the users in the database, printing
 		out the account fields in a format compatible with the
 		<tt class="filename">smbpasswd</tt> file format. (see the
@ -44,18 +44,18 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
 		operations and <span class="emphasis"><em>optional</em></span> in list
 		operations.</p></dd><dt><span class="term">-f fullname</span></dt><dd><p>This option can be used while adding or
 		modifing a user account. It will specify the user's full
-		name. </p><p>Example: <b class="command">-f &quot;Simo Sorce&quot;</b></p></dd><dt><span class="term">-h homedir</span></dt><dd><p>This option can be used while adding or
+		name. </p><p>Example: <b class="command">-f "Simo Sorce"</b></p></dd><dt><span class="term">-h homedir</span></dt><dd><p>This option can be used while adding or
 		modifing a user account. It will specify the user's home
-		directory network path.</p><p>Example: <b class="command">-h &quot;\\\\BERSERKER\\sorce&quot;</b>
+		directory network path.</p><p>Example: <b class="command">-h "\\\\BERSERKER\\sorce"</b>
 		</p></dd><dt><span class="term">-D drive</span></dt><dd><p>This option can be used while adding or
 		modifing a user account. It will specify the windows drive
-		letter to be used to map the home directory.</p><p>Example: <b class="command">-d &quot;H:&quot;</b>
+		letter to be used to map the home directory.</p><p>Example: <b class="command">-d "H:"</b>
 		</p></dd><dt><span class="term">-S script</span></dt><dd><p>This option can be used while adding or
 		modifing a user account. It will specify the user's logon
-		script path.</p><p>Example: <b class="command">-s &quot;\\\\BERSERKER\\netlogon\\sorce.bat&quot;</b>
+		script path.</p><p>Example: <b class="command">-s "\\\\BERSERKER\\netlogon\\sorce.bat"</b>
 		</p></dd><dt><span class="term">-p profile</span></dt><dd><p>This option can be used while adding or
 		modifing a user account. It will specify the user's profile
-		directory.</p><p>Example: <b class="command">-p &quot;\\\\BERSERKER\\netlogon&quot;</b>
+		directory.</p><p>Example: <b class="command">-p "\\\\BERSERKER\\netlogon"</b>
 		</p></dd><dt><span class="term">-G SID|rid</span></dt><dd><p>
 		This option can be used while adding or modifying a user account. It 
 		will specify the users' new primary group SID (Security Identifier) or 
@ -65,7 +65,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX
 		rid. </p><p>Example: <b class="command">-U S-1-5-21-2447931902-1787058256-3961074038-5004</b></p></dd><dt><span class="term">-c account-control</span></dt><dd><p>This option can be used while adding or modifying a user
 		account. It will specify the users' account control property. Possible
 		flags that can be set are: N, D, H, L, X.				
-		</p><p>Example: <b class="command">-c &quot;[X          ]&quot;</b></p></dd><dt><span class="term">-a</span></dt><dd><p>This option is used to add a user into the
+		</p><p>Example: <b class="command">-c "[X          ]"</b></p></dd><dt><span class="term">-a</span></dt><dd><p>This option is used to add a user into the
 		database. This command needs a user name specified with
 		the -u switch. When adding a new user, pdbedit will also
 		ask for the password to be used.</p><p>Example: <b class="command">pdbedit -a -u sorce</b>
@ -94,12 +94,12 @@ retype new password
 		applies to the group mapping instead of the user database.</p><p>This option will ease migration from one passdb backend to
 		another and will ease backing up.</p></dd><dt><span class="term">-b passdb-backend</span></dt><dd><p>Use a different default passdb backend. </p><p>Example: <b class="command">pdbedit -b xml:/root/pdb-backup.xml -l</b></p></dd><dt><span class="term">-P account-policy</span></dt><dd><p>Display an account policy</p><p>Valid policies are: minimum password age, reset count minutes, disconnect time,
 		user must logon to change password, password history, lockout duration, min password length,
-		maximum password age and bad lockout attempt.</p><p>Example: <b class="command">pdbedit -P &quot;bad lockout attempt&quot;</b></p><pre class="programlisting">
+		maximum password age and bad lockout attempt.</p><p>Example: <b class="command">pdbedit -P "bad lockout attempt"</b></p><pre class="programlisting">
 account policy value for bad lockout attempt is 0
 </pre></dd><dt><span class="term">-C account-policy-value</span></dt><dd><p>Sets an account policy to a specified value. 
 		This option may only be used in conjunction
 		with the <i class="parameter"><tt>-P</tt></i> option.
-		</p><p>Example: <b class="command">pdbedit -P &quot;bad lockout attempt&quot; -C 3</b></p><pre class="programlisting">
+		</p><p>Example: <b class="command">pdbedit -P "bad lockout attempt" -C 3</b></p><pre class="programlisting">
 account policy value for bad lockout attempt was 0
 account policy value for bad lockout attempt is now 3
 </pre></dd><dt><span class="term">-h|--help</span></dt><dd><p>Print a summary of command line options.
@ -123,9 +123,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2797533"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2800732"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd></dl></div></div><div class="refsect1" lang="en"><h2>NOTES</h2><p>This command may be used only by root.</p></div><div class="refsect1" lang="en"><h2>VERSION</h2><p>This man page is correct for version 3.0 of 
 	the Samba suite.</p></div><div class="refsect1" lang="en"><h2>SEE ALSO</h2><p><a href="smbpasswd.5.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(5)</span></a>, <a href="samba.7.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(7)</span></a></p></div><div class="refsect1" lang="en"><h2>AUTHOR</h2><p>The original Samba software and related utilities 
--- a/docs/htmldocs/rpcclient.1.html
+++ b/docs/htmldocs/rpcclient.1.html
@ -5,9 +5,9 @@
 	have now written scripts around it to manage Windows NT clients from 
 	their UNIX workstation. </p></div><div class="refsect1" lang="en"><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">server</span></dt><dd><p>NetBIOS name of Server to which to connect. 
 		The server can be  any SMB/CIFS server.  The name is 
-		resolved using the <a class="indexterm" name="id2852375"></a><i class="parameter"><tt>name resolve order</tt></i> line from <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>.</p></dd><dt><span class="term">-c|--command='command string'</span></dt><dd><p>execute semicolon separated commands (listed 
+		resolved using the <a class="indexterm" name="id2799808"></a><a href="#"><i class="parameter"><tt>name resolve order</tt></i></a> line from <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a>.</p></dd><dt><span class="term">-c|--command='command string'</span></dt><dd><p>execute semicolon separated commands (listed 
 		below)) </p></dd><dt><span class="term">-I IP-address</span></dt><dd><p><i class="replaceable"><tt>IP address</tt></i> is the address of the server to connect to. 
-		It should be specified in standard &quot;a.b.c.d&quot; notation. </p><p>Normally the client would attempt to locate a named 
+		It should be specified in standard "a.b.c.d" notation. </p><p>Normally the client would attempt to locate a named 
 		SMB/CIFS server by looking it up via the NetBIOS name resolution 
 		mechanism described above in the <i class="parameter"><tt>name resolve order</tt></i> 
 		parameter above. Using this parameter will force the client
@ -35,9 +35,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796778"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2800110"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd><dt><span class="term">-N</span></dt><dd><p>If specified, this parameter suppresses the normal
 password prompt from the client to the user. This is useful when
@ -70,7 +70,7 @@ via the <b class="command">ps</b> command.  To be safe always allow
 <b class="command">rpcclient</b> to prompt for a password and type
 it in directly. </p></dd><dt><span class="term">-n &lt;primary NetBIOS name&gt;</span></dt><dd><p>This option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
-to setting the <a class="indexterm" name="id2796983"></a><i class="parameter"><tt>netbios name</tt></i> parameter in the <tt class="filename">smb.conf</tt> file. 
+to setting the <a class="indexterm" name="id2800321"></a><a href="#"><i class="parameter"><tt>netbios name</tt></i></a> parameter in the <tt class="filename">smb.conf</tt> file. 
 However, a command
 line setting will take precedence over settings in
 <tt class="filename">smb.conf</tt>.</p></dd><dt><span class="term">-i &lt;scope&gt;</span></dt><dd><p>This specifies a NetBIOS scope that
@ -108,10 +108,10 @@ Help File Name:\
 Language Monitor Name:\
 Default Data Type:\
 Comma Separated list of Files
-</pre><p>Any empty fields should be enter as the string &quot;NULL&quot;. </p><p>Samba does not need to support the concept of Print Monitors
+</pre><p>Any empty fields should be enter as the string "NULL". </p><p>Samba does not need to support the concept of Print Monitors
 		since these only apply to local printers whose driver can make
 		use of a bi-directional link for communication.  This field should 
-		be &quot;NULL&quot;.   On a remote NT print server, the Print Monitor for a 
+		be "NULL".   On a remote NT print server, the Print Monitor for a 
 		driver must already be installed prior to adding the driver or 
 		else the RPC will fail. </p></dd><dt><span class="term">addprinter &lt;printername&gt; 
 		&lt;sharename&gt; &lt;drivername&gt; &lt;port&gt;</span></dt><dd><p>
@ -155,9 +155,9 @@ Comma Separated list of Files
 		Execute a GetPrinterDriverDirectory()
 		RPC to retrieve the SMB share name and subdirectory for 
 		storing printer driver files for a given architecture.  Possible 
-		values for <i class="parameter"><tt>arch</tt></i> are &quot;Windows 4.0&quot; 
-		(for Windows 95/98), &quot;Windows NT x86&quot;, &quot;Windows NT PowerPC&quot;, &quot;Windows
-		Alpha_AXP&quot;, and &quot;Windows NT R4000&quot;. </p></dd><dt><span class="term">getprinter &lt;printername&gt;</span></dt><dd><p>Retrieve the current printer information.  This command 
+		values for <i class="parameter"><tt>arch</tt></i> are "Windows 4.0" 
+		(for Windows 95/98), "Windows NT x86", "Windows NT PowerPC", "Windows
+		Alpha_AXP", and "Windows NT R4000". </p></dd><dt><span class="term">getprinter &lt;printername&gt;</span></dt><dd><p>Retrieve the current printer information.  This command 
 		corresponds to the GetPrinter() MS Platform SDK function. 
 		</p></dd><dt><span class="term">getprintprocdir</span></dt><dd><p>Get
 		print processor
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
--- a/docs/htmldocs/smbcacls.1.html
+++ b/docs/htmldocs/smbcacls.1.html
@ -10,10 +10,10 @@
 		only the ones specified on the command line.  All other ACLs are 
 		erased. Note that the ACL specified must contain at least a revision,
 		type, owner and group for the call to succeed. </p></dd><dt><span class="term">-U username</span></dt><dd><p>Specifies a username used to connect to the 
-		specified service.  The username may be of the form &quot;username&quot; in 
+		specified service.  The username may be of the form "username" in 
 		which case the user is prompted to enter in a password and the 
 		workgroup specified in the <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> file is 
-		used, or &quot;username%password&quot;  or &quot;DOMAIN\username%password&quot; and the 
+		used, or "username%password"  or "DOMAIN\username%password" and the 
 		password and workgroup names are used as provided. </p></dd><dt><span class="term">-C name</span></dt><dd><p>The owner of a file or directory can be changed 
 		to the name given using the <i class="parameter"><tt>-C</tt></i> option.  
 		The name can be a sid in the form S-1-x-y-z or a name resolved 
@ -48,9 +48,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796911"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2800108"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd></dl></div></div><div class="refsect1" lang="en"><h2>ACL FORMAT</h2><p>The format of an ACL is one or more ACL entries separated by 
 	either commas or newlines.  An ACL entry is one of the following: </p><pre class="programlisting"> 
--- a/docs/htmldocs/smbmount.8.html
+++ b/docs/htmldocs/smbmount.8.html
@ -1,14 +1,14 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>smbmount</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="smbmount.8"></a><div class="titlepage"><div></div><div></div></div><div class="refnamediv"><h2>Name</h2><p>smbmount &#8212; mount an smbfs filesystem</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><tt class="command">smbmount</tt>  {service} {mount-point} [-o options]</p></div></div><div class="refsect1" lang="en"><h2>DESCRIPTION</h2><p><b class="command">smbmount</b> mounts a Linux SMB filesystem. It 
 	is usually invoked as <b class="command">mount.smbfs</b> by
 	the <a href="mount.8.html"><span class="citerefentry"><span class="refentrytitle">mount</span>(8)</span></a> command when using the 
-	&quot;-t smbfs&quot; option. This command only works in Linux, and the kernel must
+	"-t smbfs" option. This command only works in Linux, and the kernel must
 	support the smbfs filesystem. </p><p>Options to <b class="command">smbmount</b> are specified as a comma-separated
 	list of key=value pairs. It is possible to send options other
 	than those listed here, assuming that smbfs supports them. If
 	you get mount failures, check your kernel log for errors on
 	unknown options.</p><p><b class="command">smbmount</b> is a daemon. After mounting it keeps running until
 	the mounted smbfs is umounted. It will log things that happen
-	when in daemon mode using the &quot;machine name&quot; smbmount, so
+	when in daemon mode using the "machine name" smbmount, so
 	typically this output will end up in <tt class="filename">log.smbmount</tt>. The <b class="command">
 	smbmount</b> process may also be called mount.smbfs.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p> <b class="command">smbmount</b> 
 	calls <a href="smbmnt.8.html"><span class="citerefentry"><span class="refentrytitle">smbmnt</span>(8)</span></a> to do the actual mount. You 
@ -16,8 +16,8 @@
 	that it can be found. </p></div></div><div class="refsect1" lang="en"><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">username=&lt;arg&gt;</span></dt><dd><p>specifies the username to connect as. If
 		this is not given, then the environment variable <tt class="envar">
 		USER</tt> is used. This option can also take the
-		form &quot;user%password&quot; or &quot;user/workgroup&quot; or
-		&quot;user/workgroup%password&quot; to allow the password and workgroup
+		form "user%password" or "user/workgroup" or
+		"user/workgroup%password" to allow the password and workgroup
 		to be specified as part of the username.</p></dd><dt><span class="term">password=&lt;arg&gt;</span></dt><dd><p>specifies the SMB password. If this
 		option is not given then the environment variable
 		<tt class="envar">PASSWD</tt> is used. If it can find
--- a/docs/htmldocs/smbpasswd.5.html
+++ b/docs/htmldocs/smbpasswd.5.html
@ -19,8 +19,8 @@
 		Note that this password hash is regarded as weak as it is
 		vulnerable to dictionary attacks and if two users choose the 
 		same password this entry will be identical (i.e. the password 
-		is not &quot;salted&quot; as the UNIX password is). If the user has a 
-		null password this field will contain the characters &quot;NO PASSWORD&quot; 
+		is not "salted" as the UNIX password is). If the user has a 
+		null password this field will contain the characters "NO PASSWORD" 
 		as the start of the hex string. If the hex string is equal to 
 		32 'X' characters then the user's account is marked as 
 		<tt class="constant">disabled</tt> and the user will not be able to 
@ -43,7 +43,7 @@
 		password and uses a much higher quality hashing algorithm. 
 		However, it is still the case that if two users choose the same 
 		password this entry will be identical (i.e. the password is 
-		not &quot;salted&quot; as the UNIX password is). </p><p><span class="emphasis"><em>WARNING !!</em></span>. Note that, due to 
+		not "salted" as the UNIX password is). </p><p><span class="emphasis"><em>WARNING !!</em></span>. Note that, due to 
 		the challenge-response nature of the SMB/CIFS authentication
 		protocol, anyone with a knowledge of this password hash will 
 		be able to impersonate the user on the network. For this
@ -59,7 +59,7 @@
 		13 characters in length (including the '[' and ']' characters).
 		The contents of this field may be any of the following characters:
 		</p><div class="itemizedlist"><ul type="disc"><li><p><span class="emphasis"><em>U</em></span> - This means 
-			this is a &quot;User&quot; account, i.e. an ordinary user. Only User 
+			this is a "User" account, i.e. an ordinary user. Only User 
 			and Workstation Trust accounts are currently supported 
 			in the smbpasswd file. </p></li><li><p><span class="emphasis"><em>N</em></span> - This means the
 			account has no password (the passwords in the fields LANMAN 
@ -68,12 +68,12 @@
 			null passwords</tt></i> parameter is set in the 
 			<a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> config file. </p></li><li><p><span class="emphasis"><em>D</em></span> - This means the account 
 			is disabled and no SMB/CIFS logins  will be allowed for this user. </p></li><li><p><span class="emphasis"><em>W</em></span> - This means this account 
-			is a &quot;Workstation Trust&quot; account. This kind of account is used 
+			is a "Workstation Trust" account. This kind of account is used 
 			in the Samba PDC code stream to allow Windows NT Workstations 
 			and Servers to join a Domain hosted by a Samba PDC. </p></li></ul></div><p>Other flags may be added as the code is extended in future.
 		The rest of this field space is filled in with spaces. </p></dd><dt><span class="term">Last Change Time</span></dt><dd><p>This field consists of the time the account was 
 		last modified. It consists of the characters 'LCT-' (standing for 
-		&quot;Last Change Time&quot;) followed by a numeric encoding of the UNIX time 
+		"Last Change Time") followed by a numeric encoding of the UNIX time 
 		in seconds since the epoch (1970) that the last change was made. 
 		</p></dd></dl></div><p>All other colon separated fields are ignored at this time.</p></div><div class="refsect1" lang="en"><h2>VERSION</h2><p>This man page is correct for version 3.0 of 
 	the Samba suite.</p></div><div class="refsect1" lang="en"><h2>SEE ALSO</h2><p><a href="smbpasswd.8.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(8)</span></a>, <a href="Samba.7.html"><span class="citerefentry"><span class="refentrytitle">Samba</span>(7)</span></a>, and
--- a/docs/htmldocs/smbpasswd.8.html
+++ b/docs/htmldocs/smbpasswd.8.html
@ -16,7 +16,7 @@
 	for their new password twice, to ensure that the new password
 	was typed correctly. No passwords will be echoed on the screen 
 	whilst being typed. If you have a blank SMB password (specified by 
-	the string &quot;NO PASSWORD&quot; in the smbpasswd file) then just press 
+	the string "NO PASSWORD" in the smbpasswd file) then just press 
 	the &lt;Enter&gt; key when asked for your old password. </p><p>smbpasswd can also be used by a normal user to change their
 	SMB password on remote machines, such as Windows NT Primary Domain 
 	Controllers.   See the (<i class="parameter"><tt>-r</tt></i>) and <i class="parameter"><tt>-U</tt></i> options 
@ -64,10 +64,10 @@
 		HUGE amounts of log data, most of which is extremely cryptic. 
 		</p></dd><dt><span class="term">-n</span></dt><dd><p>This option specifies that the username following 
 		should have their password set to null (i.e. a blank password) in 
-		the local smbpasswd file. This is done by writing the string &quot;NO 
-		PASSWORD&quot; as the first part of the first password stored in the 
+		the local smbpasswd file. This is done by writing the string "NO 
+		PASSWORD" as the first part of the first password stored in the 
 		smbpasswd file. </p><p>Note that to allow users to logon to a Samba server once 
-		the password has been set to &quot;NO PASSWORD&quot; in the smbpasswd
+		the password has been set to "NO PASSWORD" in the smbpasswd
 		file the administrator must set the following parameter in the [global]
 		section of the <tt class="filename">smb.conf</tt> file : </p><p><b class="command">null passwords = yes</b></p><p>This option is only available when running smbpasswd as 
 		root.</p></dd><dt><span class="term">-r remote machine name</span></dt><dd><p>This option allows a user to specify what machine 
@ -89,7 +89,7 @@
 		a real password database so it is not possible to change passwords 
 		specifying a Win95/98  machine as remote machine target. </p></dd><dt><span class="term">-R name resolve order</span></dt><dd><p>This option allows the user of smbpasswd to determine
 		what name resolution services to use when looking up the NetBIOS
-		name of the host being connected to. </p><p>The options are :&quot;lmhosts&quot;, &quot;host&quot;, &quot;wins&quot; and &quot;bcast&quot;. They
+		name of the host being connected to. </p><p>The options are :"lmhosts", "host", "wins" and "bcast". They
 		 cause names to be resolved as follows: </p><div class="itemizedlist"><ul type="disc"><li><p><tt class="constant">lmhosts</tt>: Lookup an IP 
            address in the Samba lmhosts file. If the line in lmhosts has 
            no name type attached to the NetBIOS name (see the <a href="lmhosts.5.html"><span class="citerefentry"><span class="refentrytitle">lmhosts</span>(5)</span></a> for details) then
@ -127,7 +127,7 @@
 		has been configured to use the experimental
 		<b class="command">--with-ldapsam</b> option. The <i class="parameter"><tt>-w</tt></i> 
 		switch is used to specify the password to be used with the 
-		<a class="indexterm" name="id2797339"></a><i class="parameter"><tt>ldap admin dn</tt></i>.  Note that the password is stored in
+		<a class="indexterm" name="id2800537"></a><a href="#"><i class="parameter"><tt>ldap admin dn</tt></i></a>.  Note that the password is stored in
 		the <tt class="filename">secrets.tdb</tt> and is keyed off 
 		of the admin's DN.  This means that if the value of <i class="parameter"><tt>ldap
 		admin dn</tt></i> ever changes, the password will need to be 
@ -147,7 +147,7 @@
 	smbd</b> running on the local machine by specifying either <i class="parameter"><tt>allow
 	hosts</tt></i> or <i class="parameter"><tt>deny hosts</tt></i> entry in 
 	the <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> file and neglecting to 
-	allow &quot;localhost&quot; access to the smbd. </p><p>In addition, the smbpasswd command is only useful if Samba
+	allow "localhost" access to the smbd. </p><p>In addition, the smbpasswd command is only useful if Samba
 	has been set up to use encrypted passwords. </p></div><div class="refsect1" lang="en"><h2>VERSION</h2><p>This man page is correct for version 3.0 of the Samba suite.</p></div><div class="refsect1" lang="en"><h2>SEE ALSO</h2><p><a href="smbpasswd.5.html"><span class="citerefentry"><span class="refentrytitle">smbpasswd</span>(5)</span></a>, <a href="Samba.7.html"><span class="citerefentry"><span class="refentrytitle">Samba</span>(7)</span></a>.</p></div><div class="refsect1" lang="en"><h2>AUTHOR</h2><p>The original Samba software and related utilities 
 	were created by Andrew Tridgell. Samba is now developed
 	by the Samba Team as an Open Source project similar 
--- a/docs/htmldocs/smbsh.1.html
+++ b/docs/htmldocs/smbsh.1.html
@ -33,7 +33,7 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2802215"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2796897"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-R &lt;name resolve order&gt;</span></dt><dd><p>This option is used to determine what naming 
 services and in what order to resolve 
 host names to IP addresses. The option takes a space-separated 
@ -66,9 +66,9 @@ resolution methods as it depends on the target host
 being on a locally connected subnet.
 </p></li></ul></div><p>If this parameter is not set then the name resolve order 
 defined in the <tt class="filename">smb.conf</tt> file parameter  
-(<a class="indexterm" name="id2796281"></a><i class="parameter"><tt>name resolve order</tt></i>) will be used.
+(<a class="indexterm" name="id2797172"></a><a href="#"><i class="parameter"><tt>name resolve order</tt></i></a>) will be used.
 </p><p>The default order is lmhosts, host, wins, bcast. Without 
-this parameter or any entry in the <a class="indexterm" name="id2796300"></a><i class="parameter"><tt>name resolve order</tt></i> parameter of the <tt class="filename">smb.conf</tt> file, the name 
+this parameter or any entry in the <a class="indexterm" name="id2797198"></a><a href="#"><i class="parameter"><tt>name resolve order</tt></i></a> parameter of the <tt class="filename">smb.conf</tt> file, the name 
 resolution methods will be attempted in this order. </p></dd><dt><span class="term">-L libdir</span></dt><dd><p>This parameter specifies the location of the 
 		shared libraries used by <b class="command">smbsh</b>. The default
 		value is specified at compile time.
--- a/docs/htmldocs/smbtar.1.html
+++ b/docs/htmldocs/smbtar.1.html
@ -2,7 +2,7 @@
 	directly to UNIX tape drives</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><tt class="command">smbtar</tt>  [-r] [-i] [-a] [-v] {-s server} [-p password] [-x services] [-X] [-N filename] [-b blocksize] [-d directory] [-l loglevel] [-u user] [-t tape] {filenames}</p></div></div><div class="refsect1" lang="en"><h2>DESCRIPTION</h2><p>This tool is part of the <a href="Samba.7.html"><span class="citerefentry"><span class="refentrytitle">Samba</span>(7)</span></a> suite.</p><p><b class="command">smbtar</b> is a very small shell script on top 
 	of <a href="smbclient.1.html"><span class="citerefentry"><span class="refentrytitle">smbclient</span>(1)</span></a> which dumps SMB shares directly to tape.</p></div><div class="refsect1" lang="en"><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-s server</span></dt><dd><p>The SMB/CIFS server that the share resides 
 		upon.</p></dd><dt><span class="term">-x service</span></dt><dd><p>The share name on the server to connect to. 
-		The default is &quot;backup&quot;.</p></dd><dt><span class="term">-X</span></dt><dd><p>Exclude mode. Exclude filenames... from tar 
+		The default is "backup".</p></dd><dt><span class="term">-X</span></dt><dd><p>Exclude mode. Exclude filenames... from tar 
 		create or restore. </p></dd><dt><span class="term">-d directory</span></dt><dd><p>Change to initial <i class="parameter"><tt>directory
 		</tt></i> before restoring / backing up files. </p></dd><dt><span class="term">-v</span></dt><dd><p>Verbose mode.</p></dd><dt><span class="term">-p password</span></dt><dd><p>The password to use to access a share. 
 		Default: none </p></dd><dt><span class="term">-u user</span></dt><dd><p>The user id to connect as. Default: 
--- a/docs/htmldocs/smbtree.1.html
+++ b/docs/htmldocs/smbtree.1.html
@ -1,6 +1,6 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>smbtree</title><link rel="stylesheet" href="samba.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.60.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="smbtree.1"></a><div class="titlepage"><div></div><div></div></div><div class="refnamediv"><h2>Name</h2><p>smbtree &#8212; A text based smb network browser
 	</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><tt class="command">smbtree</tt>  [-b] [-D] [-S]</p></div></div><div class="refsect1" lang="en"><h2>DESCRIPTION</h2><p>This tool is part of the <a href="Samba.7.html"><span class="citerefentry"><span class="refentrytitle">Samba</span>(7)</span></a> suite.</p><p><b class="command">smbtree</b> is a smb browser program 
-	in text mode. It is similar to the &quot;Network Neighborhood&quot; found 
+	in text mode. It is similar to the "Network Neighborhood" found 
 	on Windows computers. It prints a tree with all 
 	the known domains, the servers in those domains and 
 	the shares on the servers.
@ -31,9 +31,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796642"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2799845"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd><dt><span class="term">-N</span></dt><dd><p>If specified, this parameter suppresses the normal
 password prompt from the client to the user. This is useful when
--- a/docs/htmldocs/swat.8.html
+++ b/docs/htmldocs/swat.8.html
@ -33,9 +33,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796724"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2796899"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd><dt><span class="term">-h|--help</span></dt><dd><p>Print a summary of command line options.
 </p></dd></dl></div></div><div class="refsect1" lang="en"><h2>INSTALLATION</h2><p>Swat is included as binary package with most distributions. The 
@ -60,7 +60,7 @@ never removed by the client.
 		and <tt class="filename">/etc/inetd.conf</tt> you need to send a 
 		HUP signal to inetd. To do this use <b class="command">kill -1 PID
 		</b> where PID is the process ID of the inetd daemon. </p></div></div><div class="refsect1" lang="en"><h2>LAUNCHING</h2><p>To launch SWAT just run your favorite web browser and 
-	point it at &quot;http://localhost:901/&quot;.</p><p>Note that you can attach to SWAT from any IP connected 
+	point it at "http://localhost:901/".</p><p>Note that you can attach to SWAT from any IP connected 
 	machine but connecting from a remote machine leaves your 
 	connection open to password sniffing as passwords will be sent 
 	in the clear over the wire. </p></div><div class="refsect1" lang="en"><h2>FILES</h2><div class="variablelist"><dl><dt><span class="term"><tt class="filename">/etc/inetd.conf</tt></span></dt><dd><p>This file must contain suitable startup 
--- a/docs/htmldocs/vfstest.1.html
+++ b/docs/htmldocs/vfstest.1.html
@ -28,9 +28,9 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796651"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2799859"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
-<tt class="constant">&quot;.client&quot;</tt> will be appended. The log file is
+<tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
 </p></dd></dl></div></div><div class="refsect1" lang="en"><h2>COMMANDS</h2><p><span class="emphasis"><em>VFS COMMANDS</em></span></p><div class="itemizedlist"><ul type="disc"><li><p><b class="command">load &lt;module.so&gt;</b> - Load specified VFS module </p></li><li><p><b class="command">populate &lt;char&gt; &lt;size&gt;</b> - Populate a data buffer with the specified data
 		</p></li><li><p><b class="command">showdata [&lt;offset&gt; &lt;len&gt;]</b> - Show data currently in data buffer
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@ -69,7 +69,7 @@ amounts of log data, and should only be used when
 investigating a problem. Levels above 3 are designed for 
 use only by developers and generate HUGE amounts of log
 data, most of which is extremely cryptic.</p><p>Note that specifying this parameter here will 
-override the <a class="indexterm" name="id2796344"></a><i class="parameter"><tt>log level</tt></i> parameter
+override the <a class="indexterm" name="id2800127"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
 in the <tt class="filename">smb.conf</tt> file.</p></dd><dt><span class="term">-l|--logfile=logbasename</span></dt><dd><p>File name for log/debug files. The extension
 <tt class="constant">".client"</tt> will be appended. The log file is
 never removed by the client.
@ -108,15 +108,15 @@ never removed by the client.
 	and group rids. </p></div><div class="refsect1" lang="en"><h2>CONFIGURATION</h2><p>Configuration of the <b class="command">winbindd</b> daemon 
 	is done through configuration parameters in the <a href="smb.conf.5.html"><span class="citerefentry"><span class="refentrytitle">smb.conf</span>(5)</span></a> file.  All parameters should be specified in the 
 	[global] section of smb.conf. </p><div class="itemizedlist"><ul type="disc"><li><p>
-		<a class="indexterm" name="id2798898"></a><i class="parameter"><tt>winbind separator</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2798916"></a><i class="parameter"><tt>idmap uid</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2798934"></a><i class="parameter"><tt>idmap gid</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2798952"></a><i class="parameter"><tt>winbind cache time</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2798970"></a><i class="parameter"><tt>winbind enum users</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2798988"></a><i class="parameter"><tt>winbind enum groups</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2799006"></a><i class="parameter"><tt>template homedir</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2799025"></a><i class="parameter"><tt>template shell</tt></i></p></li><li><p>
-		<a class="indexterm" name="id2799043"></a><i class="parameter"><tt>winbind use default domain</tt></i></p></li></ul></div></div><div class="refsect1" lang="en"><h2>EXAMPLE SETUP</h2><p>To setup winbindd for user and group lookups plus 
+		<a class="indexterm" name="id2800484"></a><a href="#"><i class="parameter"><tt>winbind separator</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800509"></a><a href="#"><i class="parameter"><tt>idmap uid</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800532"></a><a href="#"><i class="parameter"><tt>idmap gid</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800556"></a><a href="#"><i class="parameter"><tt>winbind cache time</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800581"></a><a href="#"><i class="parameter"><tt>winbind enum users</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800606"></a><a href="#"><i class="parameter"><tt>winbind enum groups</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800630"></a><a href="#"><i class="parameter"><tt>template homedir</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800655"></a><a href="#"><i class="parameter"><tt>template shell</tt></i></a></p></li><li><p>
+		<a class="indexterm" name="id2800679"></a><a href="#"><i class="parameter"><tt>winbind use default domain</tt></i></a></p></li></ul></div></div><div class="refsect1" lang="en"><h2>EXAMPLE SETUP</h2><p>To setup winbindd for user and group lookups plus 
 	authentication from a domain controller use something like the 
 	following setup. This was tested on a RedHat 6.2 Linux box. </p><p>In <tt class="filename">/etc/nsswitch.conf</tt> put the 
 	following:
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@ -109,6 +109,11 @@ Note that specifying this parameter here will override the \fIlog level\fR param

 .SH "COMMANDS"

+.SS "CHANGESECRETPW"
+
+.PP
+This command allows the Samba machine account password to be set from an external application to a machine account password that has already been stored in Active Directory\&. DO NOT USE this command unless you know exactly what you are doing\&. The use of this command requires that the force flag (-f) be used also\&. There will be NO command prompt\&. Whatever information is piped into stdin, either by typing at the command line or otherwise, will be stored as the literal machine password\&. Do NOT use this without care and attention as it will overwrite a legitimate machine password without warning\&. YOU HAVE BEEN WARNED\&.
+
 .SS "TIME"

 .PP
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@ -506,6 +506,18 @@ Here is a list of all global parameters\&. See the section of each parameter for
 \(bu
 \fIclient ntlmv2 auth\fR

+.TP
+\(bu
+\fIclient plaintext auth\fR
+
+.TP
+\(bu
+\fIclient schannel\fR
+
+.TP
+\(bu
+\fIclient signing\fR
+
 .TP
 \(bu
 \fIclient use spnego\fR
@ -540,11 +552,11 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIdefault service\fR
+\fIdefault\fR

 .TP
 \(bu
-\fIdefault\fR
+\fIdefault service\fR

 .TP
 \(bu
@ -670,6 +682,10 @@ Here is a list of all global parameters\&. See the section of each parameter for
 \(bu
 \fIkeepalive\fR

+.TP
+\(bu
+\fIkernel change notify\fR
+
 .TP
 \(bu
 \fIkernel oplocks\fR
@ -694,6 +710,14 @@ Here is a list of all global parameters\&. See the section of each parameter for
 \(bu
 \fIldap filter\fR

+.TP
+\(bu
+\fIldap group suffix\fR
+
+.TP
+\(bu
+\fIldap idmap suffix\fR
+
 .TP
 \(bu
 \fIldap machine suffix\fR
@ -718,10 +742,6 @@ Here is a list of all global parameters\&. See the section of each parameter for
 \(bu
 \fIldap suffix\fR

-.TP
-\(bu
-\fIldap trust ids\fR
-
 .TP
 \(bu
 \fIldap user suffix\fR
@ -744,11 +764,11 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIlock directory\fR
+\fIlock dir\fR

 .TP
 \(bu
-\fIlock dir\fR
+\fIlock directory\fR

 .TP
 \(bu
@ -936,11 +956,11 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIpasswd chat debug\fR
+\fIpasswd chat\fR

 .TP
 \(bu
-\fIpasswd chat\fR
+\fIpasswd chat debug\fR

 .TP
 \(bu
@ -968,11 +988,11 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIpreload modules\fR
+\fIpreload\fR

 .TP
 \(bu
-\fIpreload\fR
+\fIpreload modules\fR

 .TP
 \(bu
@ -1016,7 +1036,7 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIroot directory\fR
+\fIroot\fR

 .TP
 \(bu
@ -1024,7 +1044,7 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIroot\fR
+\fIroot directory\fR

 .TP
 \(bu
@ -1034,6 +1054,10 @@ Here is a list of all global parameters\&. See the section of each parameter for
 \(bu
 \fIserver schannel\fR

+.TP
+\(bu
+\fIserver signing\fR
+
 .TP
 \(bu
 \fIserver string\fR
@ -1084,11 +1108,11 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIsyslog only\fR
+\fIsyslog\fR

 .TP
 \(bu
-\fIsyslog\fR
+\fIsyslog only\fR

 .TP
 \(bu
@ -1152,11 +1176,11 @@ Here is a list of all global parameters\&. See the section of each parameter for

 .TP
 \(bu
-\fIutmp directory\fR
+\fIutmp\fR

 .TP
 \(bu
-\fIutmp\fR
+\fIutmp directory\fR

 .TP
 \(bu
@ -1235,6 +1259,10 @@ Here is a list of all service parameters\&. See the section on each parameter fo

 .TP 3
 \(bu
+\fIacl compatibility\fR
+
+.TP
+\(bu
 \fIadmin users\fR

 .TP
@ -1309,6 +1337,10 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 \(bu
 \fIdeny hosts\fR

+.TP
+\(bu
+\fIdirectory\fR
+
 .TP
 \(bu
 \fIdirectory mask\fR
@ -1321,10 +1353,6 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 \(bu
 \fIdirectory security mask\fR

-.TP
-\(bu
-\fIdirectory\fR
-
 .TP
 \(bu
 \fIdont descend\fR
@ -1563,11 +1591,11 @@ Here is a list of all service parameters\&. See the section on each parameter fo

 .TP
 \(bu
-\fIpreexec close\fR
+\fIpreexec\fR

 .TP
 \(bu
-\fIpreexec\fR
+\fIpreexec close\fR

 .TP
 \(bu
@ -1585,6 +1613,10 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 \(bu
 \fIprint command\fR

+.TP
+\(bu
+\fIprinter\fR
+
 .TP
 \(bu
 \fIprinter admin\fR
@ -1593,10 +1625,6 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 \(bu
 \fIprinter name\fR

-.TP
-\(bu
-\fIprinter\fR
-
 .TP
 \(bu
 \fIprinting\fR
@ -1635,11 +1663,11 @@ Here is a list of all service parameters\&. See the section on each parameter fo

 .TP
 \(bu
-\fIroot preexec close\fR
+\fIroot preexec\fR

 .TP
 \(bu
-\fIroot preexec\fR
+\fIroot preexec close\fR

 .TP
 \(bu
@ -1677,6 +1705,10 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 \(bu
 \fIuse client driver\fR

+.TP
+\(bu
+\fIuser\fR
+
 .TP
 \(bu
 \fIusername\fR
@ -1685,21 +1717,17 @@ Here is a list of all service parameters\&. See the section on each parameter fo
 \(bu
 \fIusers\fR

-.TP
-\(bu
-\fIuser\fR
-
 .TP
 \(bu
 \fIuse sendfile\fR

 .TP
 \(bu
-\fIvalid users\fR
+\fI-valid\fR

 .TP
 \(bu
-\fI-valid\fR
+\fIvalid users\fR

 .TP
 \(bu
@ -1711,11 +1739,11 @@ Here is a list of all service parameters\&. See the section on each parameter fo

 .TP
 \(bu
-\fIvfs objects\fR
+\fIvfs object\fR

 .TP
 \(bu
-\fIvfs object\fR
+\fIvfs objects\fR

 .TP
 \(bu
@ -1763,6 +1791,17 @@ Default: \fBNone\fR\&.
 Example: \fBabort shutdown script = /sbin/shutdown -c\fR


+.TP
+acl compatibility (S)
+This parameter specifies what OS ACL semantics should be compatible with\&. Possible values are \fBwinnt\fR for Windows NT 4, \fBwin2k\fR for Windows 2000 and above and \fBauto\fR\&. If you specify \fBauto\fR, the value for this parameter will be based upon the version of the client\&. There should be no reason to change this parameter from the default\&.
+
+
+Default: \fBacl compatibility = Auto\fR
+
+
+Example: \fBacl compatibility = win2k\fR
+
+
 .TP
 add group script (G)
 This is the full pathname to a script that will be run \fBAS ROOT\fR by \fBsmbd\fR(8) when a new group is requested\&. It will expand any \fI%g\fR to the group name passed\&. This script is only useful for installations using the Windows NT domain administration tools\&. The script is free to create a group with an arbitrary name to circumvent unix group name restrictions\&. In that case the script must print the numeric gid of the created group on stdout\&.
@ -2145,6 +2184,36 @@ Note that some sites (particularly those following 'best practice' security poli
 Default : \fBclient ntlmv2 auth = no\fR


+.TP
+client plaintext auth (G)
+Specifies whether a client should send a plaintext password if the server does not support encrypted passwords\&.
+
+
+Default: \fBclient plaintext auth = yes\fR
+
+
+.TP
+client schannel (G)
+This controls whether the client offers or even demands the use of the netlogon schannel\&. \fIclient schannel = no\fR does not offer the schannel, \fIserver schannel = auto\fR offers the schannel but does not enforce it, and \fIserver schannel = yes\fR denies access if the server is not able to speak netlogon schannel\&.
+
+
+Default: \fBclient schannel = auto\fR
+
+
+Example: \fBclient schannel = yes\fR
+
+
+.TP
+client signing (G)
+This controls whether the client offers or requires the server it talks to to use SMB signing\&. Possible values are \fBauto\fR, \fBmandatory\fR and \fBdisabled\fR\&.
+
+
+When set to auto, SMB signing is offered, but not enforced\&. When set to mandatory, SMB signing is required and if set to disabled, SMB signing is not offered either\&.
+
+
+Default: \fBclient signing = auto\fR
+
+
 .TP
 client use spnego (G)
 This variable controls controls whether samba clients will try to use Simple and Protected NEGOciation (as specified by rfc2478) with WindowsXP and Windows2000 servers to agree upon an authentication mechanism\&. SPNEGO client support for SMB Signing is currently broken, so you might want to turn this option off when operating with Windows 2003 domain controllers in particular\&.
@ -2318,6 +2387,11 @@ Note that the parameter \fI debug timestamp\fR must be on for this to have an ef
 Default: \fBdebug uid = no\fR


+.TP
+default (G)
+A synonym for \fI default service\fR\&.
+
+
 .TP
 default case (S)
 See the section on NAME MANGLING\&. Also note the \fIshort preserve case\fR parameter\&.
@ -2373,11 +2447,6 @@ Example:
 .fi


-.TP
-default (G)
-A synonym for \fI default service\fR\&.
-
-
 .TP
 delete group script (G)
 This is the full pathname to a script that will be run \fBAS ROOT\fR \fBsmbd\fR(8) when a group is requested to be deleted\&. It will expand any \fI%g\fR to the group name passed\&. This script is only useful for installations using the Windows NT domain administration tools\&.
@ -2534,6 +2603,11 @@ or perhaps (on Sys V based systems):
 Note that you may have to replace the command names with full path names on some systems\&.


+.TP
+directory (S)
+Synonym for \fIpath\fR\&.
+
+
 .TP
 directory mask (S)
 This parameter is the octal modes which are used when converting DOS modes to UNIX modes when creating UNIX directories\&.
@ -2594,11 +2668,6 @@ Default: \fBdirectory security mask = 0777\fR
 Example: \fBdirectory security mask = 0700\fR


-.TP
-directory (S)
-Synonym for \fIpath\fR\&.
-
-
 .TP
 disable netbios (G)
 Enabling this parameter will disable netbios support in Samba\&. Netbios is the only available form of browsing in all windows versions except for 2000 and XP\&.
@ -3270,7 +3339,7 @@ The purpose of the idmap backend parameter is to allow idmap to NOT use the loca
 Default: \fBidmap backend = <empty string>\fR


-Example: \fBidmap backend = ldapsam://ldapslave.example.com\fR
+Example: \fBidmap backend = ldap:ldap://ldapslave.example.com\fR


 .TP
@ -3417,6 +3486,17 @@ Default: \fBkeepalive = 300\fR
 Example: \fBkeepalive = 600\fR


+.TP
+kernel change notify (G)
+This parameter specifies whether Samba should ask the kernel for change notifications in directories so that SMB clients can refresh whenever the data on the server changes\&.
+
+
+This parameter is only usd when your kernel supports change notification to user programs, using the F_NOTIFY fcntl\&.
+
+
+Default: \fBYes\fR
+
+
 .TP
 kernel oplocks (G)
 For UNIXes that support kernel based \fIoplocks\fR (currently only IRIX and the Linux 2\&.4 kernel), this parameter allows the use of them to be turned on or off\&.
@ -3480,6 +3560,28 @@ This parameter specifies the RFC 2254 compliant LDAP search filter\&. The defaul
 Default: \fBldap filter = (&(uid=%u)(objectclass=sambaAccount))\fR


+.TP
+ldap group suffix (G)
+This parameters specifies the suffix that is used for groups when these are added to the LDAP directory\&. If this parameter is unset, the value of \fIldap suffix\fR will be used instead\&.
+
+
+Default: \fBnone\fR
+
+
+Example: \fBdc=samba,ou=Groups\fR
+
+
+.TP
+ldap idmap suffix (G)
+This parameters specifies the suffix that is used when storing idmap mappings\&. If this parameter is unset, the value of \fIldap suffix\fR will be used instead\&.
+
+
+Default: \fBnone\fR
+
+
+Example: \fBdc=samba,ou=Idmap\fR
+
+
 .TP
 ldap machine suffix (G)
 It specifies where machines should be added to the ldap tree\&.
@ -3558,20 +3660,9 @@ Specifies where user and machine accounts are added to the tree\&. Can be overri
 Default: \fBnone\fR


-.TP
-ldap trust ids (G)
-Normally, Samba validates each entry in the LDAP server against getpwnam()\&. This allows LDAP to be used for Samba with the unix system using NIS (for example) and also ensures that Samba does not present accounts that do not otherwise exist\&.
-
-
-This option is used to disable this functionality, and instead to rely on the presence of the appropriate attributes in LDAP directly, which can result in a significant performance boost in some situations\&. Setting this option to yes effectivly assumes that the local machine is running \fBnss_ldap\fR against the same LDAP server\&.
-
-
-Default: \fBldap trust ids = No\fR
-
-
 .TP
 ldap user suffix (G)
-It specifies where users are added to the tree\&.
+This parameter specifies where users are added to the tree\&. If this parameter is not specified, the value from \fBldap suffix\fR\&.


 Default: \fBnone\fR
@ -3650,6 +3741,11 @@ Setting this value to \fBno\fR will cause \fBnmbd\fR \fBnever\fR to become a loc
 Default: \fBlocal master = yes\fR


+.TP
+lock dir (G)
+Synonym for \fI lock directory\fR\&.
+
+
 .TP
 lock directory (G)
 This option specifies the directory where lock files will be placed\&. The lock files are used to implement the \fImax connections\fR option\&.
@ -3661,11 +3757,6 @@ Default: \fBlock directory = ${prefix}/var/locks\fR
 Example: \fBlock directory = /var/run/samba/locks\fR


-.TP
-lock dir (G)
-Synonym for \fI lock directory\fR\&.
-
-
 .TP
 locking (S)
 This controls whether or not locking will be performed by the server in response to lock requests from the client\&.
@ -4796,17 +4887,6 @@ Example: \fBpassdb backend = ldapsam:ldaps://ldap.example.com\fR
 Example: \fBpassdb backend = mysql:my_plugin_args tdbsam\fR


-.TP
-passwd chat debug (G)
-This boolean specifies if the passwd chat script parameter is run in \fBdebug\fR mode\&. In this mode the strings passed to and received from the passwd chat are printed in the \fBsmbd\fR(8) log with a \fIdebug level\fR of 100\&. This is a dangerous option as it will allow plaintext passwords to be seen in the \fBsmbd\fR log\&. It is available to help Samba admins debug their \fIpasswd chat\fR scripts when calling the \fIpasswd program\fR and should be turned off after this has been done\&. This option has no effect if the \fIpam password change\fR paramter is set\&. This parameter is off by default\&.
-
-
-See also \fIpasswd chat\fR , \fIpam password change\fR , \fIpasswd program\fR \&.
-
-
-Default: \fBpasswd chat debug = no\fR
-
-
 .TP
 passwd chat (G)
 This string controls the \fB"chat"\fR conversation that takes places between \fBsmbd\fR(8) and the local password changing program to change the user's password\&. The string describes a sequence of response-receive pairs that \fBsmbd\fR(8) uses to determine what to send to the \fIpasswd program\fR and what to expect back\&. If the expected output is not received then the password is not changed\&.
@ -4836,6 +4916,17 @@ Default: \fBpasswd chat = *new*password* %n\\n *new*password* %n\\n *changed*\fR
 Example: \fBpasswd chat = "*Enter OLD password*" %o\\n "*Enter NEW password*" %n\\n "*Reenter NEW password*" %n\\n "*Password changed*"\fR


+.TP
+passwd chat debug (G)
+This boolean specifies if the passwd chat script parameter is run in \fBdebug\fR mode\&. In this mode the strings passed to and received from the passwd chat are printed in the \fBsmbd\fR(8) log with a \fIdebug level\fR of 100\&. This is a dangerous option as it will allow plaintext passwords to be seen in the \fBsmbd\fR log\&. It is available to help Samba admins debug their \fIpasswd chat\fR scripts when calling the \fIpasswd program\fR and should be turned off after this has been done\&. This option has no effect if the \fIpam password change\fR paramter is set\&. This parameter is off by default\&.
+
+
+See also \fIpasswd chat\fR , \fIpam password change\fR , \fIpasswd program\fR \&.
+
+
+Default: \fBpasswd chat debug = no\fR
+
+
 .TP
 passwd program (G)
 The name of a program that can be used to set UNIX user passwords\&. Any occurrences of \fI%u\fR will be replaced with the user name\&. The user name is checked for existence before calling the password changing program\&.
@ -5006,14 +5097,6 @@ Default: \fBnone (no command executed)\fR
 Example: \fBpostexec = echo \"%u disconnected from %S from %m (%I)\" >> /tmp/log\fR


-.TP
-preexec close (S)
-This boolean option controls whether a non-zero return code from \fIpreexec \fR should close the service being connected to\&.
-
-
-Default: \fBpreexec close = no\fR
-
-
 .TP
 preexec (S)
 This option specifies a command to be run whenever the service is connected to\&. It takes the usual substitutions\&.
@ -5037,6 +5120,14 @@ Default: \fBnone (no command executed)\fR
 Example: \fBpreexec = echo \"%u connected to %S from %m (%I)\" >> /tmp/log\fR


+.TP
+preexec close (S)
+This boolean option controls whether a non-zero return code from \fIpreexec \fR should close the service being connected to\&.
+
+
+Default: \fBpreexec close = no\fR
+
+
 .TP
 prefered master (G)
 Synonym for \fI preferred master\fR for people who cannot spell :-)\&.
@ -5059,20 +5150,6 @@ See also \fIos level\fR\&.
 Default: \fBpreferred master = auto\fR


-.TP
-preload modules (G)
-This is a list of paths to modules that should be loaded into smbd before a client connects\&. This improves the speed of smbd when reacting to new connections somewhat\&.
-
-
-It is recommended to only use this option on heavy-performance servers\&.
-
-
-Default: \fBpreload modules = \fR
-
-
-Example: \fBpreload modules = /usr/lib/samba/passdb/mysql.so+++ \fR
-
-
 .TP
 preload (G)
 This is a list of services that you want to be automatically added to the browse lists\&. This is most useful for homes and printers services that would otherwise not be visible\&.
@ -5087,6 +5164,17 @@ Default: \fBno preloaded services\fR
 Example: \fBpreload = fred lp colorlp\fR


+.TP
+preload modules (G)
+This is a list of paths to modules that should be loaded into smbd before a client connects\&. This improves the speed of smbd when reacting to new connections somewhat\&.
+
+
+Default: \fBpreload modules = \fR
+
+
+Example: \fBpreload modules = /usr/lib/samba/passdb/mysql.so+++ \fR
+
+
 .TP
 preserve case (S)
 This controls if new filenames are created with the case that the client passes, or if they are forced to be the \fIdefault case \fR\&.
@ -5109,6 +5197,11 @@ Note that a printable service will ALWAYS allow writing to the service path (use
 Default: \fBprintable = no\fR


+.TP
+printcap (G)
+Synonym for \fI printcap name\fR\&.
+
+
 .TP
 printcap name (S)
 This parameter may be used to override the compiled-in default printcap name used by the server (usually \fI /etc/printcap\fR)\&. See the discussion of the [printers] section above for reasons why you might want to do this\&.
@ -5144,11 +5237,6 @@ Default: \fBprintcap name = /etc/printcap\fR
 Example: \fBprintcap name = /etc/myprintcap\fR


-.TP
-printcap (G)
-Synonym for \fI printcap name\fR\&.
-
-
 .TP
 print command (S)
 After a print job has finished spooling to a service, this command will be used via a \fBsystem()\fR call to process the spool file\&. Typically the command specified will submit the spool file to the host's printing subsystem, but there is no requirement that this be the case\&. The server will not remove the spool file, so whatever command you specify should remove the spool file when it has been processed, otherwise you will need to manually remove old spool files\&.
@ -5217,6 +5305,11 @@ For printing = CUPS : If SAMBA is compiled against libcups, then printcap = cups
 Example: \fBprint command = /usr/local/samba/bin/myprintscript %p %s\fR


+.TP
+printer (S)
+Synonym for \fI printer name\fR\&.
+
+
 .TP
 printer admin (S)
 This is a list of users that can do anything to printers via the remote administration interfaces offered by MS-RPC (usually using a NT workstation)\&. Note that the root user always has admin rights\&.
@ -5242,11 +5335,6 @@ Default: \fBnone (but may be \fBlp\fR on many systems)\fR
 Example: \fBprinter name = laserwriter\fR


-.TP
-printer (S)
-Synonym for \fI printer name\fR\&.
-
-
 .TP
 printing (S)
 This parameters controls how printer status information is interpreted on your system\&. It also affects the default values for the \fIprint command\fR, \fIlpq command\fR, \fIlppause command \fR, \fIlpresume command\fR, and \fIlprm command\fR if specified in the [global] section\&.
@ -5490,6 +5578,16 @@ The security advantage of using restrict anonymous = 2 is removed by setting \fI
 Default: \fBrestrict anonymous = 0\fR


+.TP
+root (G)
+Synonym for \fIroot directory"\fR\&.
+
+
+.TP
+root dir (G)
+Synonym for \fIroot directory"\fR\&.
+
+
 .TP
 root directory (G)
 The server will \fBchroot()\fR (i\&.e\&. Change its root directory) to this directory on startup\&. This is not strictly necessary for secure operation\&. Even without it the server will deny access to files not in one of the service entries\&. It may also check for, and deny access to, soft links to other parts of the filesystem, or attempts to use "\&.\&." in file names to access other directories (depending on the setting of the \fIwide links\fR parameter)\&.
@ -5504,11 +5602,6 @@ Default: \fBroot directory = /\fR
 Example: \fBroot directory = /homes/smb\fR


-.TP
-root dir (G)
-Synonym for \fIroot directory"\fR\&.
-
-
 .TP
 root postexec (S)
 This is the same as the \fIpostexec\fR parameter except that the command is run as root\&. This is useful for unmounting filesystems (such as CDROMs) after a connection is closed\&.
@ -5520,17 +5613,6 @@ See also \fI postexec\fR\&.
 Default: \fBroot postexec = <empty string>\fR


-.TP
-root preexec close (S)
-This is the same as the \fIpreexec close \fR parameter except that the command is run as root\&.
-
-
-See also \fI preexec\fR and \fIpreexec close\fR\&.
-
-
-Default: \fBroot preexec close = no\fR
-
-
 .TP
 root preexec (S)
 This is the same as the \fIpreexec\fR parameter except that the command is run as root\&. This is useful for mounting filesystems (such as CDROMs) when a connection is opened\&.
@ -5543,31 +5625,14 @@ Default: \fBroot preexec = <empty string>\fR


 .TP
-root (G)
-Synonym for \fIroot directory"\fR\&.
+root preexec close (S)
+This is the same as the \fIpreexec close \fR parameter except that the command is run as root\&.


-.TP
-security mask (S)
-This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a file using the native NT security dialog box\&.
+See also \fI preexec\fR and \fIpreexec close\fR\&.


-This parameter is applied as a mask (AND'ed with) to the changed permission bits, thus preventing any bits not in this mask from being modified\&. Essentially, zero bits in this mask may be treated as a set of bits the user is not allowed to change\&.
-
-
-If not set explicitly this parameter is 0777, allowing a user to modify all the user/group/world permissions on a file\&.
-
-
-\fBNote\fR that users who can access the Samba server through other means can easily bypass this restriction, so it is primarily useful for standalone "appliance" systems\&. Administrators of most normal systems will probably want to leave it set to \fB0777\fR\&.
-
-
-See also the \fIforce directory security mode\fR, \fIdirectory security mask\fR, \fIforce security mode\fR parameters\&.
-
-
-Default: \fBsecurity mask = 0777\fR
-
-
-Example: \fBsecurity mask = 0770\fR
+Default: \fBroot preexec close = no\fR


 .TP
@ -5714,6 +5779,29 @@ Default: \fBsecurity = USER\fR
 Example: \fBsecurity = DOMAIN\fR


+.TP
+security mask (S)
+This parameter controls what UNIX permission bits can be modified when a Windows NT client is manipulating the UNIX permission on a file using the native NT security dialog box\&.
+
+
+This parameter is applied as a mask (AND'ed with) to the changed permission bits, thus preventing any bits not in this mask from being modified\&. Essentially, zero bits in this mask may be treated as a set of bits the user is not allowed to change\&.
+
+
+If not set explicitly this parameter is 0777, allowing a user to modify all the user/group/world permissions on a file\&.
+
+
+\fBNote\fR that users who can access the Samba server through other means can easily bypass this restriction, so it is primarily useful for standalone "appliance" systems\&. Administrators of most normal systems will probably want to leave it set to \fB0777\fR\&.
+
+
+See also the \fIforce directory security mode\fR, \fIdirectory security mask\fR, \fIforce security mode\fR parameters\&.
+
+
+Default: \fBsecurity mask = 0777\fR
+
+
+Example: \fBsecurity mask = 0770\fR
+
+
 .TP
 server schannel (G)
 This controls whether the server offers or even demands the use of the netlogon schannel\&. \fIserver schannel = no\fR does not offer the schannel, \fIserver schannel = auto\fR offers the schannel but does not enforce it, and \fIserver schannel = yes\fR denies access if the client is not able to speak netlogon schannel\&. This is only the case for Windows NT4 before SP4\&.
@ -5728,6 +5816,17 @@ Default: \fBserver schannel = auto\fR
 Example: \fBserver schannel = yes\fR


+.TP
+server signing (G)
+This controls whether the server offers or requires the client it talks to to use SMB signing\&. Possible values are \fBauto\fR, \fBmandatory\fR and \fBdisabled\fR\&.
+
+
+When set to auto, SMB signing is offered, but not enforced\&. When set to mandatory, SMB signing is required and if set to disabled, SMB signing is not offered either\&.
+
+
+Default: \fBclient signing = False\fR
+
+
 .TP
 server string (G)
 This controls what string will show up in the printer comment box in print manager and next to the IPC connection in \fBnet view\fR\&. It can be any string that you wish to show to your users\&.
@ -6092,14 +6191,6 @@ See also the \fIstrict sync\fR parameter\&.
 Default: \fBsync always = no\fR


-.TP
-syslog only (G)
-If this parameter is set then Samba debug messages are logged into the system syslog only, and not to the debug log files\&.
-
-
-Default: \fBsyslog only = no\fR
-
-
 .TP
 syslog (G)
 This parameter maps how Samba debug messages are logged onto the system syslog logging levels\&. Samba debug level zero maps onto syslog \fBLOG_ERR\fR, debug level one maps onto \fBLOG_WARNING\fR, debug level two maps onto \fBLOG_NOTICE\fR, debug level three maps onto LOG_INFO\&. All higher levels are mapped to \fB LOG_DEBUG\fR\&.
@ -6111,6 +6202,14 @@ This parameter sets the threshold for sending messages to syslog\&. Only message
 Default: \fBsyslog = 1\fR


+.TP
+syslog only (G)
+If this parameter is set then Samba debug messages are logged into the system syslog only, and not to the debug log files\&.
+
+
+Default: \fBsyslog only = no\fR
+
+
 .TP
 template homedir (G)
 When filling out the user information for a Windows NT user, the \fBwinbindd\fR(8) daemon uses this parameter to fill in the home directory for that user\&. If the string \fI%D\fR is present it is substituted with the user's Windows NT domain name\&. If the string \fI%U\fR is present it is substituted with the user's Windows NT user name\&.
@ -6183,7 +6282,7 @@ unix extensions (G)
 This boolean parameter controls whether Samba implments the CIFS UNIX extensions, as defined by HP\&. These extensions enable Samba to better serve UNIX CIFS clients by supporting features such as symbolic links, hard links, etc\&.\&.\&. These extensions require a similarly enabled client, and are of no current use to Windows clients\&.


-Default: \fBunix extensions = no\fR
+Default: \fBunix extensions = yes\fR


 .TP
@ -6236,6 +6335,49 @@ This global parameter determines if the tdb internals of Samba can depend on mma
 Default: \fBuse mmap = yes\fR


+.TP
+user (S)
+Synonym for \fIusername\fR\&.
+
+
+.TP
+username (S)
+Multiple users may be specified in a comma-delimited list, in which case the supplied password will be tested against each username in turn (left to right)\&.
+
+
+The \fIusername\fR line is needed only when the PC is unable to supply its own username\&. This is the case for the COREPLUS protocol or where your users have different WfWg usernames to UNIX usernames\&. In both these cases you may also be better using the \\\\server\\share%user syntax instead\&.
+
+
+The \fIusername\fR line is not a great solution in many cases as it means Samba will try to validate the supplied password against each of the usernames in the \fIusername\fR line in turn\&. This is slow and a bad idea for lots of users in case of duplicate passwords\&. You may get timeouts or security breaches using this parameter unwisely\&.
+
+
+Samba relies on the underlying UNIX security\&. This parameter does not restrict who can login, it just offers hints to the Samba server as to what usernames might correspond to the supplied password\&. Users can login as whoever they please and they will be able to do no more damage than if they started a telnet session\&. The daemon runs as the user that they log in as, so they cannot do anything that user cannot do\&.
+
+
+To restrict a service to a particular set of users you can use the \fIvalid users \fR parameter\&.
+
+
+If any of the usernames begin with a '@' then the name will be looked up first in the NIS netgroups list (if Samba is compiled with netgroup support), followed by a lookup in the UNIX groups database and will expand to a list of all users in the group of that name\&.
+
+
+If any of the usernames begin with a '+' then the name will be looked up only in the UNIX groups database and will expand to a list of all users in the group of that name\&.
+
+
+If any of the usernames begin with a '&' then the name will be looked up only in the NIS netgroups database (if Samba is compiled with netgroup support) and will expand to a list of all users in the netgroup group of that name\&.
+
+
+Note that searching though a groups database can take quite some time, and some clients may time out during the search\&.
+
+
+See the section NOTE ABOUT USERNAME/PASSWORD VALIDATION for more information on how this parameter determines access to the services\&.
+
+
+Default: \fBThe guest account if a guest service, else <empty string>.\fR
+
+
+Examples:\fBusername = fred, mary, jack, jane, @users, @pcgroup\fR
+
+
 .TP
 username level (G)
 This option helps Samba to try and 'guess' at the real UNIX username, as many DOS clients send an all-uppercase username\&. By default Samba tries all lowercase, followed by the username with the first letter capitalized, and fails if the username is not found on the UNIX machine\&.
@ -6316,54 +6458,11 @@ Default: \fBno username map\fR
 Example: \fBusername map = /usr/local/samba/lib/users.map\fR


-.TP
-username (S)
-Multiple users may be specified in a comma-delimited list, in which case the supplied password will be tested against each username in turn (left to right)\&.
-
-
-The \fIusername\fR line is needed only when the PC is unable to supply its own username\&. This is the case for the COREPLUS protocol or where your users have different WfWg usernames to UNIX usernames\&. In both these cases you may also be better using the \\\\server\\share%user syntax instead\&.
-
-
-The \fIusername\fR line is not a great solution in many cases as it means Samba will try to validate the supplied password against each of the usernames in the \fIusername\fR line in turn\&. This is slow and a bad idea for lots of users in case of duplicate passwords\&. You may get timeouts or security breaches using this parameter unwisely\&.
-
-
-Samba relies on the underlying UNIX security\&. This parameter does not restrict who can login, it just offers hints to the Samba server as to what usernames might correspond to the supplied password\&. Users can login as whoever they please and they will be able to do no more damage than if they started a telnet session\&. The daemon runs as the user that they log in as, so they cannot do anything that user cannot do\&.
-
-
-To restrict a service to a particular set of users you can use the \fIvalid users \fR parameter\&.
-
-
-If any of the usernames begin with a '@' then the name will be looked up first in the NIS netgroups list (if Samba is compiled with netgroup support), followed by a lookup in the UNIX groups database and will expand to a list of all users in the group of that name\&.
-
-
-If any of the usernames begin with a '+' then the name will be looked up only in the UNIX groups database and will expand to a list of all users in the group of that name\&.
-
-
-If any of the usernames begin with a '&' then the name will be looked up only in the NIS netgroups database (if Samba is compiled with netgroup support) and will expand to a list of all users in the netgroup group of that name\&.
-
-
-Note that searching though a groups database can take quite some time, and some clients may time out during the search\&.
-
-
-See the section NOTE ABOUT USERNAME/PASSWORD VALIDATION for more information on how this parameter determines access to the services\&.
-
-
-Default: \fBThe guest account if a guest service, else <empty string>.\fR
-
-
-Examples:\fBusername = fred, mary, jack, jane, @users, @pcgroup\fR
-
-
 .TP
 users (S)
 Synonym for \fI username\fR\&.


-.TP
-user (S)
-Synonym for \fIusername\fR\&.
-
-
 .TP
 use sendfile (S)
 If this parameter is \fByes\fR, and Samba was built with the --with-sendfile-support option, and the underlying operating system supports sendfile system call, then some SMB read calls (mainly ReadAndX and ReadRaw) will use the more efficient sendfile system call for files that are exclusively oplocked\&. This may make more efficient use of the system CPU's and cause Samba to be faster\&. This is off by default as it's effects are unknown as yet\&.
@ -6380,17 +6479,6 @@ This variable controls controls whether samba will try to use Simple and Protect
 Default: \fBuse spnego = yes\fR


-.TP
-utmp directory (G)
-This parameter is only available if Samba has been configured and compiled with the option \fB --with-utmp\fR\&. It specifies a directory pathname that is used to store the utmp or utmpx files (depending on the UNIX system) that record user connections to a Samba server\&. See also the \fIutmp\fR parameter\&. By default this is not set, meaning the system will use whatever utmp file the native system is set to use (usually \fI/var/run/utmp\fR on Linux)\&.
-
-
-Default: \fBno utmp directory\fR
-
-
-Example: \fButmp directory = /var/run/utmp\fR
-
-
 .TP
 utmp (G)
 This boolean parameter is only available if Samba has been configured and compiled with the option \fB --with-utmp\fR\&. If set to \fByes\fR then Samba will attempt to add utmp or utmpx records (depending on the UNIX system) whenever a connection is made to a Samba server\&. Sites may use this to record the user connecting to a Samba share\&.
@ -6405,6 +6493,28 @@ See also the \fI utmp directory\fR parameter\&.
 Default: \fButmp = no\fR


+.TP
+utmp directory (G)
+This parameter is only available if Samba has been configured and compiled with the option \fB --with-utmp\fR\&. It specifies a directory pathname that is used to store the utmp or utmpx files (depending on the UNIX system) that record user connections to a Samba server\&. See also the \fIutmp\fR parameter\&. By default this is not set, meaning the system will use whatever utmp file the native system is set to use (usually \fI/var/run/utmp\fR on Linux)\&.
+
+
+Default: \fBno utmp directory\fR
+
+
+Example: \fButmp directory = /var/run/utmp\fR
+
+
+.TP
+-valid (S)
+This parameter indicates whether a share is valid and thus can be used\&. When this parameter is set to false, the share will be in no way visible nor accessible\&.
+
+
+This option should not be used by regular users but might be of help to developers\&. Samba uses this option internally to mark shares as deleted\&.
+
+
+Default: \fBTrue\fR
+
+
 .TP
 valid users (S)
 This is a list of users that should be allowed to login to this service\&. Names starting with '@', '+' and '&' are interpreted using the same rules as described in the \fIinvalid users\fR parameter\&.
@ -6425,17 +6535,6 @@ Default: \fBNo valid users list (anyone can login) \fR
 Example: \fBvalid users = greg, @pcusers\fR


-.TP
-valid (S)
-This parameter indicates whether a share is valid and thus can be used\&. When this parameter is set to false, the share will be in no way visible nor accessible\&.
-
-
-This option should not be used by regular users but might be of help to developers\&. Samba uses this option internally to mark shares as deleted\&.
-
-
-Default: \fBTrue\fR
-
-
 .TP
 veto files (S)
 This is a list of files and directories that are neither visible nor accessible\&. Each entry in the list must be separated by a '/', which allows spaces to be included in the entry\&. '*' and '?' can be used to specify multiple files or directories as in DOS wildcards\&.
@ -6487,6 +6586,11 @@ You might want to do this on files that you know will be heavily contended for b
 Example: \fBveto oplock files = /*.SEM/\fR


+.TP
+vfs object (S)
+Synonym for \fIvfs objects\fR \&.
+
+
 .TP
 vfs objects (S)
 This parameter specifies the backend names which are used for Samba VFS I/O operations\&. By default, normal disk I/O operations are used but these can be overloaded with one or more VFS objects\&.
@ -6498,11 +6602,6 @@ Default: \fBno value\fR
 Example: \fBvfs objects = extd_audit recycle\fR


-.TP
-vfs object (S)
-Synonym for \fIvfs objects\fR \&.
-
-
 .TP
 volume (S)
 This allows you to override the volume label returned for a share\&. Useful for CDROMs with installation programs that insist on a particular volume label\&.
@ -6527,7 +6626,7 @@ winbind cache time (G)
 This parameter specifies the number of seconds the \fBwinbindd\fR(8) daemon will cache user and group information before querying a Windows NT server again\&.


-Default: \fBwinbind cache type = 15\fR
+Default: \fBwinbind cache type = 300\fR


 .TP
--- a/docs/manpages/smbsh.1
+++ b/docs/manpages/smbsh.1
@ -19,7 +19,7 @@
 ..
 .TH "SMBSH" 1 "" "" ""
 .SH NAME
-smbsh \- Allows access to Windows NT filesystem using UNIX commands
+smbsh \- Allows access to remote SMB shares using UNIX commands
 .SH "SYNOPSIS"

 .nf