Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html	Sat Nov 01 19:26:28 2014 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgAnnotateDialog.html	Sat Nov 01 19:30:28 2014 +0100
@@ -100,7 +100,7 @@
 <td>Private slot to handle the password checkbox toggled.</td>
 </tr><tr>
 <td><a href="#HgAnnotateDialog.on_sendButton_clicked">on_sendButton_clicked</a></td>
-<td>Private slot to send the input to the subversion process.</td>
+<td>Private slot to send the input to the hg process.</td>
 </tr><tr>
 <td><a href="#HgAnnotateDialog.start">start</a></td>
 <td>Public slot to start the annotate command.</td>
@@ -146,10 +146,10 @@
 author of the change (string)
 </dd><dt><i>date</i></dt>
 <dd>
-date of the tag (string)
+date of the change (string)
 </dd><dt><i>text</i></dt>
 <dd>
-name (path) of the tag (string)
+text of the change (string)
 </dd>
 </dl><a NAME="HgAnnotateDialog.__procFinished" ID="HgAnnotateDialog.__procFinished"></a>
 <h4>HgAnnotateDialog.__procFinished</h4>
@@ -254,7 +254,7 @@
 <h4>HgAnnotateDialog.on_sendButton_clicked</h4>
 <b>on_sendButton_clicked</b>(<i></i>)
 <p>
-        Private slot to send the input to the subversion process.
+        Private slot to send the input to the hg process.
 </p><a NAME="HgAnnotateDialog.start" ID="HgAnnotateDialog.start"></a>
 <h4>HgAnnotateDialog.start</h4>
 <b>start</b>(<i>fn</i>)

--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html	Sat Nov 01 19:26:28 2014 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html	Sat Nov 01 19:30:28 2014 +0100
@@ -177,7 +177,7 @@
 <td>Public method to cancel an uncommitted merge.</td>
 </tr><tr>
 <td><a href="#Hg.hgConflicts">hgConflicts</a></td>
-<td>Public method used to show a list of files containing.</td>
+<td>Public method used to show a list of files containing conflicts.</td>
 </tr><tr>
 <td><a href="#Hg.hgCopy">hgCopy</a></td>
 <td>Public method used to copy a file/directory.</td>
@@ -276,7 +276,7 @@
 <td>Public method used to serve the project.</td>
 </tr><tr>
 <td><a href="#Hg.hgShowBranch">hgShowBranch</a></td>
-<td>Public method used to show the current branch the working directory.</td>
+<td>Public method used to show the current branch of the working directory.</td>
 </tr><tr>
 <td><a href="#Hg.hgShowConfig">hgShowConfig</a></td>
 <td>Public method to show the combined configuration.</td>
@@ -789,7 +789,7 @@
 <h4>Hg.hgConflicts</h4>
 <b>hgConflicts</b>(<i>name</i>)
 <p>
-        Public method used to show a list of files containing.
+        Public method used to show a list of files containing conflicts.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
@@ -1248,7 +1248,7 @@
 <h4>Hg.hgShowBranch</h4>
 <b>hgShowBranch</b>(<i>name</i>)
 <p>
-        Public method used to show the current branch the working directory.
+        Public method used to show the current branch of the working directory.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>