Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable doc: fix typos in preface.txt, intro.txt, whatsnew.txt, quick.txt

Changeset fd2e5d8cbefc…

Parent 56b14407cc94…

by André Sintzoff

Changes to 4 files · Browse files at fd2e5d8cbefc Showing diff from parent 56b14407cc94 Diff from another changeset...

Change 1 of 2 Show Entire File doc/​source/​intro.txt Stacked
 
75
76
77
78
 
79
80
81
 
103
104
105
106
 
107
108
109
 
75
76
77
 
78
79
80
81
 
103
104
105
 
106
107
108
109
@@ -75,7 +75,7 @@
 InnoSetup. They installed a TortoiseOverlay package as a separate  application, so you always saw both TortoiseHg and TortoiseOverlay as  two applications in the *Add/Remove Programs* control panel program. -(On X64 platforms, there were two TortoiseOverlays, one for x86 +(On x64 platforms, there were two TortoiseOverlays, one for x86  processes and one of x64 processes).    The new MSI installers for TortoiseHg 1.0 and later include the @@ -103,7 +103,7 @@
 Finally, if you have problems with the shell extension even after  re-logging in, we recommend you re-run the installer and select the  *Repair* option. There were problems with a few versions of -TortoiseOverlays that cause upgrades to subtly fail until the *Repair* +TortoiseOverlay that cause upgrades to subtly fail until the *Repair*  process is run.    
Change 1 of 1 Show Entire File doc/​source/​preface.txt Stacked
 
72
73
74
75
 
76
77
78
 
72
73
74
 
75
76
77
78
@@ -72,7 +72,7 @@
 as provided by the `TortoiseSVN <http://tortoisesvn.net>`_ project.    The history viewer of TortoiseHg is based on hgview -`hgview <http://www.logilab.org/project/hgview>`_, a tool developped by +`hgview <http://www.logilab.org/project/hgview>`_, a tool developed by  `David Douard <david.douard@logilab.fr>`_ and others, with the financial  support of `Logilab <http://www.logilab.fr>`_.  
Change 1 of 4 Show Entire File doc/​source/​quick.txt Stacked
 
83
84
85
86
 
87
88
89
 
121
122
123
124
 
125
126
127
 
152
153
154
155
 
156
157
158
 
280
281
282
283
 
284
285
286
 
83
84
85
 
86
87
88
89
 
121
122
123
 
124
125
126
127
 
152
153
154
 
155
156
157
158
 
280
281
282
 
283
284
285
286
@@ -83,7 +83,7 @@
 open. You will have the chance later to override these global settings  with repository local settings, if required.   -Click the :guilabel:`Ok` button to save the changes you have made and +Click the :guilabel:`OK` button to save the changes you have made and  close the settings dialog.    .. note:: @@ -121,7 +121,7 @@
   We suggest you keep :guilabel:`Add special files (.hgignore, ...)`  checked, and do not check -:guilabel:`Make repo compatible with Mercurial 1.0` +:guilabel:`Make repo compatible with Mercurial < 1.7`  unless you have a strong reason to do so.    After pressing :guilabel:`Create`, Mercurial creates a subdirectory in @@ -152,7 +152,7 @@
  or :command:`thg status` from the command line). Check the files you   want to add and then press the :guilabel:`Add` button. From the   status tool you can launch the ignore filter tool from the context - menu of a unknown file (the menu option is named :guilabel:`ignore`) + menu of a unknown file (the menu option is named :guilabel:`Ignore`)    3. Or skip adding new files as a separate step and have the commit tool   add them implicitly. The commit tool is very similar to the status @@ -280,7 +280,7 @@
  changes and then commit the merge into your local repository. From   the changelog viewer (:menuselection:`TortoiseHg --> Workbench`   or :command:`thg log`) open the context menu over the changeset - which you want to merge and select :guilabel:`merge with`. + which you want to merge and select :guilabel:`Merge with local...`.   Finally, in the merge dialog, press :guilabel:`Merge` and then   :guilabel:`Commit`.  4. Ensure your merged work still builds and passes your extensive test suite.
Change 1 of 4 Show Entire File doc/​source/​whatsnew.txt Stacked
 
1
2
 
 
3
4
5
 
11
12
13
14
 
15
16
17
 
81
82
83
84
 
85
86
87
 
146
147
148
149
 
150
151
152
 
 
 
1
2
3
4
5
 
11
12
13
 
14
15
16
17
 
81
82
83
 
84
85
86
87
 
146
147
148
 
149
150
151
152
@@ -1,5 +1,5 @@
-Whats New -========= +What's New +==========    .. module:: whatsnew.dialog   :synopsis: New features in this release @@ -11,7 +11,7 @@
 ----------    The following philosophical changes were made between TortoiseHg 1.0 and -TortoieHg 2.0 +TortoiseHg 2.0.    Workbench  ~~~~~~~~~ @@ -81,7 +81,7 @@
   The Workbench also includes a revision set editor which both teaches the  user the available keywords and their arguments, and offers brace -matching, auto-completions, and other editing ameneties. +matching, auto-completions, and other editing amenities.    In TortoiseHg 2.0, incoming and outgoing changesets are visualized as  revisions sets. In previous versions they were represented by graph @@ -146,7 +146,7 @@
 Demand loaded graph  ~~~~~~~~~~~~~~~~~~~   -To keep refreshes as effecient as possible, the graphing algorithm will +To keep refreshes as efficient as possible, the graphing algorithm will  only load a couple hundred revisions initially during a refresh, and  then load further revisions only when those revisions are required to be  displayed. You will notice scrolling through the graph is jerky, these