syncing up docs, examples, & packaging from 3.0

(This used to be commit dd1348c566b4700ea01bd89639e2d3330c878167)

1 files changed, 13 insertions, 13 deletions

diff --git a/docs/htmldocs/winbindd.8.html b/docs/htmldocs/winbindd.8.html
index 7b2d6e0261..6dd9819c0e 100644
--- a/docs/htmldocs/winbindd.8.html
+++ b/docs/htmldocs/winbindd.8.html
@@ -49,8 +49,8 @@ group:          files winbind
 		package, or the AIX process monitor.
 		</p></dd><dt><span class="term">-S</span></dt><dd><p>If specified, this parameter causes
 		<b class="command">winbindd</b> to log to standard output rather
-		than a file.</p></dd><dt><span class="term">-V</span></dt><dd><p>Prints the version number for 
-<b class="command">smbd</b>.</p></dd><dt><span class="term">-s &lt;configuration file&gt;</span></dt><dd><p>The file specified contains the 
+		than a file.</p></dd><dt><span class="term">-V</span></dt><dd><p>Prints the program version number.
+</p></dd><dt><span class="term">-s &lt;configuration file&gt;</span></dt><dd><p>The file specified contains the 
 configuration details required by the server.  The 
 information in this file includes server-specific
 information such as what printcap file to use, as well 
@@ -63,13 +63,13 @@ not specified is zero.</p><p>The higher this value, the more detail will be
 logged to the log files about the activities of the 
 server. At level 0, only critical errors and serious 
 warnings will be logged. Level 1 is a reasonable level for
-day to day running - it generates a small amount of 
+day-to-day running - it generates a small amount of 
 information about operations carried out.</p><p>Levels above 1 will generate considerable 
 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="id2800127"></a><a href="#"><i class="parameter"><tt>log level</tt></i></a> parameter
+override the <a class="indexterm" name="id2796670"></a><i class="parameter"><tt>log level</tt></i> 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="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 
+		<a class="indexterm" name="id2799169"></a><i class="parameter"><tt>winbind separator</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799187"></a><i class="parameter"><tt>idmap uid</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799205"></a><i class="parameter"><tt>idmap gid</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799223"></a><i class="parameter"><tt>winbind cache time</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799241"></a><i class="parameter"><tt>winbind enum users</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799259"></a><i class="parameter"><tt>winbind enum groups</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799277"></a><i class="parameter"><tt>template homedir</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799295"></a><i class="parameter"><tt>template shell</tt></i></p></li><li><p>
+		<a class="indexterm" name="id2799313"></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 
 	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: