diff -r d133c7edd88a -r f85f686981ad Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Sun Sep 29 18:22:08 2013 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Sun Sep 29 18:23:27 2013 +0200
@@ -104,12 +104,7 @@
<b>__enableOkButton</b>(<i></i>)
<p>
Private method used to enable/disable the OK-button.
-</p><dl>
-<dt><i>text</i></dt>
-<dd>
-ignored
-</dd>
-</dl><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a>
+</p><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a>
<h4>SvnMergeDialog.getParameters</h4>
<b>getParameters</b>(<i></i>)
<p>
@@ -125,12 +120,22 @@
<b>on_tag1Combo_editTextChanged</b>(<i>text</i>)
<p>
Private slot to handle the tag1Combo editTextChanged signal.
-</p><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a>
+</p><dl>
+<dt><i>text</i></dt>
+<dd>
+text of the combo (string)
+</dd>
+</dl><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a>
<h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4>
<b>on_tag2Combo_editTextChanged</b>(<i>text</i>)
<p>
Private slot to handle the tag2Combo editTextChanged signal.
-</p>
+</p><dl>
+<dt><i>text</i></dt>
+<dd>
+text of the combo (string)
+</dd>
+</dl>
<div align="right"><a href="#top">Up</a></div>
<hr />
</body></html>
\ No newline at end of file
