Steve Borho avatar Steve Borho committed 82583ca

doc: quick update of docs for 1.1

This is likely an incomplete update, I could use some help on this front.

Comments (0)

Files changed (2)

doc/source/changelog.txt

 To specify a custom filter, the user selects the filter type, enters
 the search text of that type, and then hits return in the text entry.
 
-	:guilabel:`Rev Range`
-		Parse the user text as a revision range.  See
-		`hg.1.html#revisions <http://www.selenic.com/mercurial/hg.1.html#revisions>`_ 
-		for details on how to specify revision ranges.
+	:guilabel:`Revision Set`
+		Parse the user text as a revision set.  See
+		`hg.1.html#revisions <http://www.selenic.com/mercurial/hg.1.html#revsets>`_ 
+		for details on how to specify revision sets.
 	:guilabel:`File Patterns`
 		Parse the user text as a file pattern glob, unless the user text
 		is prefixed with a pattern type like *regexp:*.  See
 	:guilabel:`Push to Here`
 		Performs the equivalent of 'push -r <rev>'.  This option is only
 		available on changesets marked as outgoing.
+	:guilabel:`Push this Branch`
+		Performs the equivalent of 'push --new-branch --branch <branch>'.
+		This option is only available on changesets marked as outgoing.
 	:guilabel:`Update...`
 		Update your working directory to this revision. Opens the
 		TortoiseHg update dialog with this revision selected.
 		Creates a bundle file with range of changesets.
 	:guilabel:`Export patches from here to selected`
 		Creates a patch file for each changeset in selected range.
-	:guilabel:`Merge with selected`
+	:guilabel:`Merge with ...`
 		Merges this revision with the other selected revision.  If
 		neither revision is currently checked out, the merge dialog will
 		be forced to update to the first selected revision before
 		Rebase selected changeset and ancestors on top of original
 		selected revision.  *Only visible when the rebase extension is
 		enabled*
-	:guilabel:`qimport from here to selected`
+	:guilabel:`Import from here to selected to MQ`
 		Import selected revision range into the current patch queue.
 		*Only visible when MQ is enabled*
+	:guilabel:`Select common ancestor`
+		Selects (highlights) the common ancestor of the two selected
+		revisions.  Helpful, when reviewing merges.
 
 .. [#rcm1] The strip command will store the stripped revisions in a bundle file
 		that can later be reapplied.

doc/source/commit.txt

 	Configures a 'policy' limit for summary lines
 :menuselection:`Commit --> Message Line Length`
 	Configures a 'policy' limit for message lines
+:menuselection:`Commit --> Close After Commit`:
+	When set to True, the commit tool will close after a
+	successful commit.
+:menuselection:`Commit --> Default Tab`:
+	The tab on which the status and commit tools will open.
+	0 - Text Diff, 1 - Hunk Selection, 2 - Commit Preview.
 
 And three other features for *advanced* users.
 
 :menuselection:`TortoiseHg --> Max Diff Size`
 	Configures the diff size limit
 
-External tool configuration has been removed in 0.9
-
 From command line
 -----------------
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.