Revert the merge of 3.3.0~pre2 in upstream branch

git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0

1 files changed, 6 insertions, 12 deletions

diff --git a/docs/htmldocs/manpages/smbcontrol.1.html b/docs/htmldocs/manpages/smbcontrol.1.html
index 6c3d2d286d..0648f42d94 100644
--- a/docs/htmldocs/manpages/smbcontrol.1.html
+++ b/docs/htmldocs/manpages/smbcontrol.1.html
@@ -10,19 +10,13 @@ The default configuration file name is determined at
 compile time.</p></dd><dt><span class="term">-i</span></dt><dd><p>Run interactively. Individual commands 
 		of the form destination message-type parameters can be entered 
 		on STDIN. An empty command line or a "q" will quit the 
-		program.</p></dd><dt><span class="term">destination</span></dt><dd><p>One of <em class="parameter"><code>nmbd</code></em>, <em class="parameter"><code>smbd</code></em> or a process ID.</p><p>The <em class="parameter"><code>all</code></em> destination causes the 
-		message to "broadcast" to all running daemons including nmbd and
-		winbind. This is a change for Samba 3.3, prior to this the
-		paramter smbd used to do this.</p><p>The <em class="parameter"><code>smbd</code></em> destination causes the 
-		message to be sent to the smbd daemon specified in the 
-		<code class="filename">smbd.pid</code> file.</p><p>The <em class="parameter"><code>nmbd</code></em> destination causes the 
+		program.</p></dd><dt><span class="term">destination</span></dt><dd><p>One of <em class="parameter"><code>nmbd</code></em>, <em class="parameter"><code>smbd</code></em> or a process ID.</p><p>The <em class="parameter"><code>smbd</code></em> destination causes the 
+		message to "broadcast" to all smbd daemons.</p><p>The <em class="parameter"><code>nmbd</code></em> destination causes the 
 		message to be sent to the nmbd daemon specified in the 
-		<code class="filename">nmbd.pid</code> file.</p><p>The <em class="parameter"><code>winbindd</code></em> destination causes the 
-		message to be sent to the winbind daemon specified in the 
-		<code class="filename">winbindd.pid</code> file.</p><p>If a single process ID is given, the message is sent 
+		<code class="filename">nmbd.pid</code> file.</p><p>If a single process ID is given, the message is sent 
 		to only that process.</p></dd><dt><span class="term">message-type</span></dt><dd><p>Type of message to send. See 
 		the section <code class="constant">MESSAGE-TYPES</code> for details.
-		</p></dd><dt><span class="term">parameters</span></dt><dd><p>any parameters required for the message-type</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2482607"></a><h2>MESSAGE-TYPES</h2><p>Available message types are:</p><div class="variablelist"><dl><dt><span class="term">close-share</span></dt><dd><p>Order smbd to close the client 
+		</p></dd><dt><span class="term">parameters</span></dt><dd><p>any parameters required for the message-type</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2482572"></a><h2>MESSAGE-TYPES</h2><p>Available message types are:</p><div class="variablelist"><dl><dt><span class="term">close-share</span></dt><dd><p>Order smbd to close the client 
 	connections to the named share. Note that this doesn't affect client 
 	connections to any other shares. This message-type takes an argument of the
 	share name for which client connections will be closed, or the
@@ -65,8 +59,8 @@ compile time.</p></dd><dt><span class="term">-i</span></dt><dd><p>Run interactiv
 	to update their local version of the driver. Can only be 
 	sent to smbd.</p></dd><dt><span class="term">reload-config</span></dt><dd><p>Force daemon to reload smb.conf configuration file. Can be sent
 	to <code class="constant">smbd</code>, <code class="constant">nmbd</code>, or <code class="constant">winbindd</code>.
-	</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2478480"></a><h2>VERSION</h2><p>This man page is correct for version 3 of 
-	the Samba suite.</p></div><div class="refsect1" lang="en"><a name="id2478491"></a><h2>SEE ALSO</h2><p><a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a> and <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>.</p></div><div class="refsect1" lang="en"><a name="id2478516"></a><h2>AUTHOR</h2><p>The original Samba software and related utilities 
+	</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2478445"></a><h2>VERSION</h2><p>This man page is correct for version 3 of 
+	the Samba suite.</p></div><div class="refsect1" lang="en"><a name="id2478456"></a><h2>SEE ALSO</h2><p><a class="citerefentry" href="nmbd.8.html"><span class="citerefentry"><span class="refentrytitle">nmbd</span>(8)</span></a> and <a class="citerefentry" href="smbd.8.html"><span class="citerefentry"><span class="refentrytitle">smbd</span>(8)</span></a>.</p></div><div class="refsect1" lang="en"><a name="id2478481"></a><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 
 	to the way the Linux kernel is developed.</p><p>The original Samba man pages were written by Karl Auer.