Commits

Steve Borho committed e2332d9

doc: minor cleanups

  • Participants
  • Parent commits aa9568d

Comments (0)

Files changed (3)

File doc/source/datamine.txt

 
 The datamine application is used to inspect the revision history of your
 repository.  It is a tabbed application that supports two tab types,
-shown below.  
+*Search* and *Annotate*.
 
 
 Search Tabs

File doc/source/settings.txt

 
 Mercurial on Windows has a three-tier configuration system.
 
-1) A site-wide configuration file in :file:`C:\\Program Files\\TortoiseHg\\Mercurial.ini`
+1) A site-wide configuration file in
+   :file:`C:\\Program Files\\TortoiseHg\\Mercurial.ini`
    This file is read first and thus has the lowest priority.
-2) A per-user configuration file in :file:`C:\\Documents and Settings\\username\\Mercurial.ini`
+2) A per-user configuration file in
+   :file:`C:\\Documents and Settings\\username\\Mercurial.ini`
    This file is read second and thus can override settings in the
    site-wide configuration file.
 3) A per-repository configuration file in :file:`repo-root\\.hg\\hgrc` This
 
 The site-wide file can be overwritten on upgrades so it is recommended
 that you do not make changes to this file.  Instead, you should make
-changes to your user :file:`Mercurial.ini` and/or the repository :file:`hgrc` file.
-The TortoiseHg Settings dialog enforces this suggestion by only
-operating in two modes:
+changes to your user :file:`Mercurial.ini` and/or the repository
+:file:`hgrc` file.  The TortoiseHg Settings dialog enforces this
+suggestion by only operating in two modes:
 
 Global
 	edits your user :file:`Mercurial.ini` file
 Repository
 	edits a repository :file:`.hg/hgrc` file
+
+In TortoiseHg 0.8, you may toggle between the two modes using the combo
+box at the top of the dialog.
 					
 Most TortoiseHg users will want to store all configurables in their
 global user settings, and only use the repository hgrc to store paths
 the user and repository configuration files may not exist until you run
 the Settings dialog for the first time.
 
+Tabs
+====
+
 The Settings tool is a tabbed application.
 
 Each tab corresponds roughly to a section of your :file:`Mercurial.ini`
 	the default push target when using the command line
 
 Please consult the Mercurial wiki for more detailed information about
-these configurables (except for the first three tabs: :guilabel:`TortoiseHg`,
-:guilabel:`Commit`, :guilabel:`Changelog`, which are specifically for TortoiseHg).
+these configurables (except for the first three tabs:
+:guilabel:`TortoiseHg`, :guilabel:`Commit`, :guilabel:`Changelog`, which
+are specifically for TortoiseHg).
+

File doc/source/shelve.txt

 Keyboard navigation
 -------------------
 
-:guilabel:`CTRL-Q`
-	will close the top dialog window
 :guilabel:`CTRL-C`
     in the diff panel will copy the currently highlighted (not selected,
     but highlighted) diff hunks to the clipboard. These can be pasted
     into a text buffer to generate any arbitrary patch based from the
     changes in your working directory.
 			
-Note that the code in the shelve tool that copies the hunks to the
-clipboard is smart about diff headers. If your highlighted list includes
-a hunk from a file but not it's file diff header, the diff header will
-be added to the clipboard in the appropriate location in the stream to
-make the clipboard contents always be a valid patch.
-
+The code which copies the hunks to the clipboard is intelligent about
+diff headers. If your highlighted list includes a hunk from a file but
+not it's file diff header, the diff header will be added to the
+clipboard in the appropriate location in the stream to make the
+clipboard contents always be a valid patch.
 
 Configurables
 -------------