merge upstream 3.4.0

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

1 files changed, 18 insertions, 5 deletions

diff --git a/docs/htmldocs/manpages/eventlogadm.8.html b/docs/htmldocs/manpages/eventlogadm.8.html
index 66d3097908..8d677f4055 100644
--- a/docs/htmldocs/manpages/eventlogadm.8.html
+++ b/docs/htmldocs/manpages/eventlogadm.8.html
@@ -6,10 +6,14 @@
 		 </p></div><div class="cmdsynopsis"><p><code class="literal">eventlogadm</code> [<code class="option">-d</code>] [<code class="option">-h</code>]  <code class="option">-o</code>
 		<code class="literal">write</code>
 		<em class="replaceable"><code>EVENTLOG</code></em>
-		 </p></div></div><div class="refsect1" lang="en"><a name="id2483393"></a><h2>DESCRIPTION</h2><p>This tool is part of the <a class="citerefentry" href="samba.1.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(1)</span></a> suite.</p><p><code class="literal">eventlogadm</code> is a filter that accepts
+		 </p></div><div class="cmdsynopsis"><p><code class="literal">eventlogadm</code> [<code class="option">-d</code>] [<code class="option">-h</code>]  <code class="option">-o</code>
+		<code class="literal">dump</code>
+		<em class="replaceable"><code>EVENTLOG</code></em>
+		<em class="replaceable"><code>RECORD_NUMBER</code></em>
+		 </p></div></div><div class="refsect1" lang="en"><a name="id2483560"></a><h2>DESCRIPTION</h2><p>This tool is part of the <a class="citerefentry" href="samba.1.html"><span class="citerefentry"><span class="refentrytitle">samba</span>(1)</span></a> suite.</p><p><code class="literal">eventlogadm</code> is a filter that accepts
 	formatted event log records on standard input and writes them
 	to the Samba event log store. Windows client can then manipulate
-	these record using the usual administration tools.</p></div><div class="refsect1" lang="en"><a name="id2483538"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">-d</code></span></dt><dd><p>
+	these record using the usual administration tools.</p></div><div class="refsect1" lang="en"><a name="id2483589"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term"><code class="option">-d</code></span></dt><dd><p>
 		The <code class="literal">-d</code> option causes <code class="literal">eventlogadm</code> to emit debugging
 		information.
 		</p></dd><dt><span class="term">
@@ -29,9 +33,18 @@
 		The <code class="literal">-o write</code> reads event log
 		records from standard input and writes them to the Samba
 		event log store named by EVENTLOG.
+		</p></dd><dt><span class="term">
+		<code class="option">-o</code>
+		<code class="literal">write</code>
+		<em class="replaceable"><code>EVENTLOG</code></em>
+		<em class="replaceable"><code>RECORD_NUMBER</code></em>
+		</span></dt><dd><p>
+		The <code class="literal">-o dump</code> reads event log
+		records from a EVENTLOG tdb and dumps them to standard
+		output on screen.
 		</p></dd><dt><span class="term"><code class="option">-h</code></span></dt><dd><p>
 		Print usage information.
-		</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2483654"></a><h2>EVENTLOG RECORD FORMAT</h2><p>For the write operation, <code class="literal">eventlogadm</code>
+		</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2483740"></a><h2>EVENTLOG RECORD FORMAT</h2><p>For the write operation, <code class="literal">eventlogadm</code>
 	expects to be able to read structured records from standard
 	input. These records are a sequence of lines, with the record key
 	and data separated by a colon character. Records are separated
@@ -80,7 +93,7 @@
 		eventlog. There may be more than one string in a record.
 		</p></li><li><p>
 		<code class="literal">DAT</code> - This field should be left unset.
-		</p></li></ul></div></div><div class="refsect1" lang="en"><a name="id2481525"></a><h2>EXAMPLES</h2><p>An example of the record format accepted by <code class="literal">eventlogadm</code>:</p><pre class="programlisting">
+		</p></li></ul></div></div><div class="refsect1" lang="en"><a name="id2481612"></a><h2>EXAMPLES</h2><p>An example of the record format accepted by <code class="literal">eventlogadm</code>:</p><pre class="programlisting">
 	LEN: 0
 	RS1: 1699505740
 	RCN: 0
@@ -103,7 +116,7 @@
 	tail -f /var/log/messages | \\
 		my_program_to_parse_into_eventlog_records | \\
 	      	eventlogadm SystemLogEvents
-	</pre></div><div class="refsect1" lang="en"><a name="id2481575"></a><h2>VERSION</h2><p>This man page is correct for version 3.0.25 of the Samba suite.</p></div><div class="refsect1" lang="en"><a name="id2481586"></a><h2>AUTHOR</h2><p> The original Samba software and related utilities were
+	</pre></div><div class="refsect1" lang="en"><a name="id2481661"></a><h2>VERSION</h2><p>This man page is correct for version 3.0.25 of the Samba suite.</p></div><div class="refsect1" lang="en"><a name="id2481672"></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></div></div></body></html>