Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

doc: minor cleanups

Changeset e2332d9c2b21…

Parent aa9568dec3a5…

by Steve Borho

Changes to 3 files · Browse files at e2332d9c2b21 Showing diff from parent aa9568dec3a5 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​datamine.txt Stacked
 
7
8
9
10
 
11
12
13
 
7
8
9
 
10
11
12
13
@@ -7,7 +7,7 @@
   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
Change 1 of 4 Show Entire File doc/​source/​settings.txt Stacked
 
17
18
19
20
 
 
21
22
 
 
23
24
25
 
27
28
29
30
31
32
 
 
 
33
34
35
36
37
 
 
 
38
39
40
 
44
45
46
 
 
 
47
48
49
 
68
69
70
71
72
 
 
 
 
 
17
18
19
 
20
21
22
 
23
24
25
26
27
 
29
30
31
 
 
 
32
33
34
35
36
37
38
39
40
41
42
43
44
45
 
49
50
51
52
53
54
55
56
57
 
76
77
78
 
 
79
80
81
82
@@ -17,9 +17,11 @@
   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 @@ -27,14 +29,17 @@
   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 @@ -44,6 +49,9 @@
 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` @@ -68,5 +76,7 @@
  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). +
Change 1 of 1 Show Entire File doc/​source/​shelve.txt Stacked
 
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
 
 
 
 
 
119
120
121
 
102
103
104
 
 
105
106
107
108
109
110
 
 
 
 
 
 
111
112
113
114
115
116
117
118
@@ -102,20 +102,17 @@
 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  -------------