--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html	Wed Jan 08 19:13:57 2020 +0100
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html	Mon Jan 13 19:23:08 2020 +0100
@@ -87,22 +87,10 @@
 <td>Private method to get the conflict entries.</td>
 </tr>
 <tr>
-<td><a href="#HgConflictsListDialog.__procFinished">__procFinished</a></td>
-<td>Private slot connected to the finished signal.</td>
-</tr>
-<tr>
 <td><a href="#HgConflictsListDialog.__processOutputLine">__processOutputLine</a></td>
 <td>Private method to process the lines of output.</td>
 </tr>
 <tr>
-<td><a href="#HgConflictsListDialog.__readStderr">__readStderr</a></td>
-<td>Private slot to handle the readyReadStderr signal.</td>
-</tr>
-<tr>
-<td><a href="#HgConflictsListDialog.__readStdout">__readStdout</a></td>
-<td>Private slot to handle the readyReadStdout signal.</td>
-</tr>
-<tr>
 <td><a href="#HgConflictsListDialog.__resizeColumns">__resizeColumns</a></td>
 <td>Private method to resize the list columns.</td>
 </tr>
@@ -119,10 +107,6 @@
 <td>Protected slot implementing a close event handler.</td>
 </tr>
 <tr>
-<td><a href="#HgConflictsListDialog.keyPressEvent">keyPressEvent</a></td>
-<td>Protected slot to handle a key press event.</td>
-</tr>
-<tr>
 <td><a href="#HgConflictsListDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
 <td>Private slot called by a button of the button box clicked.</td>
 </tr>
@@ -139,14 +123,6 @@
 <td>Private slot to open the selected file in an editor.</td>
 </tr>
 <tr>
-<td><a href="#HgConflictsListDialog.on_input_returnPressed">on_input_returnPressed</a></td>
-<td>Private slot to handle the press of the return key in the input field.</td>
-</tr>
-<tr>
-<td><a href="#HgConflictsListDialog.on_passwordCheckBox_toggled">on_passwordCheckBox_toggled</a></td>
-<td>Private slot to handle the password checkbox toggled.</td>
-</tr>
-<tr>
 <td><a href="#HgConflictsListDialog.on_reMergeButton_clicked">on_reMergeButton_clicked</a></td>
 <td>Private slot to re-merge the selected entries.</td>
 </tr>
@@ -159,10 +135,6 @@
 <td>Private slot to mark the selected entries as resolved.</td>
 </tr>
 <tr>
-<td><a href="#HgConflictsListDialog.on_sendButton_clicked">on_sendButton_clicked</a></td>
-<td>Private slot to send the input to the subversion process.</td>
-</tr>
-<tr>
 <td><a href="#HgConflictsListDialog.on_unresolvedButton_clicked">on_unresolvedButton_clicked</a></td>
 <td>Private slot to mark the selected entries as unresolved.</td>
 </tr>
@@ -232,24 +204,6 @@
 <p>
         Private method to get the conflict entries.
 </p>
-<a NAME="HgConflictsListDialog.__procFinished" ID="HgConflictsListDialog.__procFinished"></a>
-<h4>HgConflictsListDialog.__procFinished</h4>
-<b>__procFinished</b>(<i>exitCode, exitStatus</i>)
-
-<p>
-        Private slot connected to the finished signal.
-</p>
-<dl>
-
-<dt><i>exitCode</i></dt>
-<dd>
-exit code of the process (integer)
-</dd>
-<dt><i>exitStatus</i></dt>
-<dd>
-exit status of the process (QProcess.ExitStatus)
-</dd>
-</dl>
 <a NAME="HgConflictsListDialog.__processOutputLine" ID="HgConflictsListDialog.__processOutputLine"></a>
 <h4>HgConflictsListDialog.__processOutputLine</h4>
 <b>__processOutputLine</b>(<i>line</i>)
@@ -264,28 +218,6 @@
 output line to be processed (string)
 </dd>
 </dl>
-<a NAME="HgConflictsListDialog.__readStderr" ID="HgConflictsListDialog.__readStderr"></a>
-<h4>HgConflictsListDialog.__readStderr</h4>
-<b>__readStderr</b>(<i></i>)
-
-<p>
-        Private slot to handle the readyReadStderr signal.
-</p>
-<p>
-        It reads the error output of the process and inserts it into the
-        error pane.
-</p>
-<a NAME="HgConflictsListDialog.__readStdout" ID="HgConflictsListDialog.__readStdout"></a>
-<h4>HgConflictsListDialog.__readStdout</h4>
-<b>__readStdout</b>(<i></i>)
-
-<p>
-        Private slot to handle the readyReadStdout signal.
-</p>
-<p>
-        It reads the output of the process, formats it and inserts it into
-        the contents pane.
-</p>
 <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a>
 <h4>HgConflictsListDialog.__resizeColumns</h4>
 <b>__resizeColumns</b>(<i></i>)
@@ -328,20 +260,6 @@
 close event (QCloseEvent)
 </dd>
 </dl>
-<a NAME="HgConflictsListDialog.keyPressEvent" ID="HgConflictsListDialog.keyPressEvent"></a>
-<h4>HgConflictsListDialog.keyPressEvent</h4>
-<b>keyPressEvent</b>(<i>evt</i>)
-
-<p>
-        Protected slot to handle a key press event.
-</p>
-<dl>
-
-<dt><i>evt</i></dt>
-<dd>
-the key press event (QKeyEvent)
-</dd>
-</dl>
 <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a>
 <h4>HgConflictsListDialog.on_buttonBox_clicked</h4>
 <b>on_buttonBox_clicked</b>(<i>button</i>)
@@ -388,27 +306,6 @@
 <p>
         Private slot to open the selected file in an editor.
 </p>
-<a NAME="HgConflictsListDialog.on_input_returnPressed" ID="HgConflictsListDialog.on_input_returnPressed"></a>
-<h4>HgConflictsListDialog.on_input_returnPressed</h4>
-<b>on_input_returnPressed</b>(<i></i>)
-
-<p>
-        Private slot to handle the press of the return key in the input field.
-</p>
-<a NAME="HgConflictsListDialog.on_passwordCheckBox_toggled" ID="HgConflictsListDialog.on_passwordCheckBox_toggled"></a>
-<h4>HgConflictsListDialog.on_passwordCheckBox_toggled</h4>
-<b>on_passwordCheckBox_toggled</b>(<i>isOn</i>)
-
-<p>
-        Private slot to handle the password checkbox toggled.
-</p>
-<dl>
-
-<dt><i>isOn</i></dt>
-<dd>
-flag indicating the status of the check box (boolean)
-</dd>
-</dl>
 <a NAME="HgConflictsListDialog.on_reMergeButton_clicked" ID="HgConflictsListDialog.on_reMergeButton_clicked"></a>
 <h4>HgConflictsListDialog.on_reMergeButton_clicked</h4>
 <b>on_reMergeButton_clicked</b>(<i></i>)
@@ -430,13 +327,6 @@
 <p>
         Private slot to mark the selected entries as resolved.
 </p>
-<a NAME="HgConflictsListDialog.on_sendButton_clicked" ID="HgConflictsListDialog.on_sendButton_clicked"></a>
-<h4>HgConflictsListDialog.on_sendButton_clicked</h4>
-<b>on_sendButton_clicked</b>(<i></i>)
-
-<p>
-        Private slot to send the input to the subversion process.
-</p>
 <a NAME="HgConflictsListDialog.on_unresolvedButton_clicked" ID="HgConflictsListDialog.on_unresolvedButton_clicked"></a>
 <h4>HgConflictsListDialog.on_unresolvedButton_clicked</h4>
 <b>on_unresolvedButton_clicked</b>(<i></i>)