We are currently indexing your data, so search results may be incomplete until we finish.
doc: use more formal speech
Changeset 87bbb23dc0d2…
Parent dbcef9b65240…
by
Changes to 3 files · Browse files at 87bbb23dc0d2 Showing diff from parent dbcef9b65240 Diff from another changeset...
|
@@ -134,13 +134,13 @@
For files which are not partially selected, the commit operation avoids
the entire *backup, revert, patch, commit, recover* round trip and
-simply commits those files in place.
+commits those files in place.
This longer answer is only interesting when something goes wrong, which
on Windows unfortunately has a probability greater than 0. If some
program (virus checker, compiler) locks your file in the middle of this
process you may see an error about a failed patch. These errors are
-recoverable, simply delete any new :file:`.rej` files and try the commit again.
+recoverable. Delete any new :file:`.rej` files and try the commit again.
@@ -275,7 +275,7 @@* Support for two-parent state (merging) has been improved, especially
the file context menus.
* There is now a limit on the size of files that will be diffed by the commit
- and changelog tools. Files above this size will simply show a message
+ and changelog tools. Files above this size will only show a message
indicating why the file was not diffed. This limit (default: 1MB) is
configurable (per-repository if necessary) via the settings dialog
:menuselection:`TortoiseHg --> Max Diff Size`.
@@ -295,11 +295,10 @@read the rest of this page to understand how the native tool now measures up.
The default layout of the native commit tool is different than Qct. The
-file list is on the left side of the diff panel. This layout is actually
-configurable if you prefer the Qct layout, simply set the
-:menuselection:`Commit --> Bottom Diffs` configuration item to :guilabel:`True`
-in the TortoiseHg settings dialog. This change will take affect the next time
-you start the commit tool.
+file list is on the left side of the diff panel. If you prefer the Qct
+layout, set the :menuselection:`Commit --> Bottom Diffs` configuration
+item to :guilabel:`True` in the TortoiseHg settings dialog. This change
+will take affect the next time you start the commit tool.
Also different in the native commit tool is that all the diffs in the
working directory are shown in the diff panel at startup. Selecting
|
||
|
@@ -30,8 +30,8 @@ If the state to be restored does not fit within your current screen
dimensions, the application will revert to factory default dimensions.
-The TortoiseHg dialogs which are more transitory in nature simply allow
-the window manager to place them where it wishes.
+The TortoiseHg dialogs which are more transitory in nature allow the
+window manager to place them where it wishes.
Keyboard Accelerators
=====================
|
||
|
@@ -64,7 +64,7 @@ When the unshelve button is pressed, the shelved changes are reapplied
to the working directory.
-How is this different than record/commit?
+How is this different from record/commit?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Shelved changes are physically removed from the working directory until
@@ -82,7 +82,7 @@can be cleanly reapplied later if the shelved changes conflict with
changes made to your code after the shelving.
-How is this different than MQ?
+How is this different from MQ?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
A shelf is, in effect, a single unnamed MQ patch that is never converted
@@ -90,7 +90,7 @@maintaining a patch queue, since it can hold changes from one patch and
re-apply them to another patch (or an entirely new patch).
-How is this different than attic?
+How is this different from attic?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The attic extension is a super-set of the shelve feature. In particular,
|
||
Add a tag
Loading...