Steve Borho avatar Steve Borho committed 56a366d

doc: reduce use of footnotes, which break on PDFs

Closes #1029

Comments (0)

Files changed (1)

doc/source/changelog.txt

 		performs the equivalent of 'push -r <rev>'.  This option is only
 		available on changesets marked as outgoing.
 	:guilabel:`Update...`
-		update your working directory to this revision [#rcm1]_
+		update your working directory to this revision. Opens the
+		TortoiseHg update dialog with this revision selected.
 	:guilabel:`Merge With...`
-		merge with this revision [#rcm2]_
+		merge with this revision. Opens the TortoiseHg merge dialog with
+		this revision selected.
 	:guilabel:`Backout...`
 		create a backout changeset for selected revision
 	:guilabel:`Revert`
 		:guilabel:`Export Patch`
 			generate a patch file containing this revision's changes
 		:guilabel:`Email Patch`
-			send this revision's changes to email recipient [#rcm3]_
+			send this revision's changes to email recipient.  Opens the
+			TortoiseHg email dialog with this revision selected.
 		:guilabel:`Bundle rev:tip`
 			create a bundle with all revs from selected to tip
 		:guilabel:`Archive...`
 			when MQ is enabled*
 		:guilabel:`Strip Revision...`
 			Remove the selected revision and all of it's descendants from the
-			repository [#rcm4]_ *Only visible when MQ is enabled*
+			repository [#rcm1]_ *Only visible when MQ is enabled*
 	:guilabel:`Transplant to local`
 		Transplant selected revision onto the current working parent.
 		*Only visible when the transplant extension is enabled*
 		Opens status viewer with cumulative changes of the range of
 		changesets.  The status viewer allows cherry picked changes to
 		be saved to a file.
-	:guilabel:`Visual Diff with selected` [#rcm5]_
+	:guilabel:`Visual Diff with selected`
 		Opens visual diff window with cumulative changes of the range
-		of changesets.
+		of changesets.  See also menuselection:`Global Settings -->
+		TortoiseHg --> Visual Diff Tool`
 	:guilabel:`Email from here to selected`
 		Opens email dialog with range of changesets.
 	:guilabel:`Bundle from here to 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` [#rcm6]_
+	:guilabel:`Merge with selected`
 		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
 		Import selected revision range into the current patch queue.
 		*Only visible when MQ is enabled*
 
-.. [#rcm1] Opens the TortoiseHg update dialog with this revision selected.
-.. [#rcm2] Opens the TortoiseHg merge dialog with this revision selected.
-.. [#rcm3] Opens the TortoiseHg email dialog with this revision selected.
-.. [#rcm4] The strip command will store the stripped revisions in a bundle file
+.. [#rcm1] The strip command will store the stripped revisions in a bundle file
 		that can later be reapplied.
-		See `also <http://mercurial.selenic.com/wiki/EditingHistory>`_.
-.. [#rcm5] :menuselection:`Global Settings --> TortoiseHg --> Visual Diff Tool`
-.. [#rcm6] Only sensitive if the selected revision is your current working
-		directory parent
+		See also `EditingHistory <http://mercurial.selenic.com/wiki/EditingHistory>`_.
 
 File Context Menus
 ------------------
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.