diff -r e7764f992a01 -r b51dfacef37f src/eric7/Documentation/Source/eric7.VCS.VersionControl.html
--- a/src/eric7/Documentation/Source/eric7.VCS.VersionControl.html Fri Oct 27 14:07:03 2023 +0200
+++ b/src/eric7/Documentation/Source/eric7.VCS.VersionControl.html Fri Oct 27 14:09:40 2023 +0200
@@ -114,7 +114,7 @@
</tr>
<tr>
<td><a href="#VersionControl._createStatusMonitorThread">_createStatusMonitorThread</a></td>
-<td></td>
+<td>Protected method to create an instance of the VCS status monitor thread.</td>
</tr>
<tr>
<td><a href="#VersionControl._vcsAddProjectCommitMessage">_vcsAddProjectCommitMessage</a></td>
@@ -310,7 +310,7 @@
</tr>
<tr>
<td><a href="#VersionControl.vcsResolved">vcsResolved</a></td>
-<td></td>
+<td>Public method used to resolve conflicts of a file/directory.</td>
</tr>
<tr>
<td><a href="#VersionControl.vcsRevert">vcsRevert</a></td>
@@ -461,6 +461,32 @@
<h4>VersionControl._createStatusMonitorThread</h4>
<b>_createStatusMonitorThread</b>(<i>interval, project</i>)
+<p>
+ Protected method to create an instance of the VCS status monitor
+ thread.
+</p>
+<p>
+ Note: This method should be overwritten in subclasses in order to
+ support VCS status monitoring.
+</p>
+<dl>
+
+<dt><i>interval</i></dt>
+<dd>
+check interval for the monitor thread in seconds
+ (integer)
+</dd>
+<dt><i>project</i></dt>
+<dd>
+reference to the project object
+</dd>
+</dl>
+<dl>
+<dt>Return:</dt>
+<dd>
+reference to the monitor thread (QThread)
+</dd>
+</dl>
<a NAME="VersionControl._vcsAddProjectCommitMessage" ID="VersionControl._vcsAddProjectCommitMessage"></a>
<h4>VersionControl._vcsAddProjectCommitMessage</h4>
<b>_vcsAddProjectCommitMessage</b>(<i>message</i>)
@@ -1613,6 +1639,16 @@
<h4>VersionControl.vcsResolved</h4>
<b>vcsResolved</b>(<i>name</i>)
+<p>
+ Public method used to resolve conflicts of a file/directory.
+</p>
+<dl>
+
+<dt><i>name</i> (str)</dt>
+<dd>
+file/directory name to be resolved
+</dd>
+</dl>
<a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a>
<h4>VersionControl.vcsRevert</h4>
<b>vcsRevert</b>(<i>name</i>)
