Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: miscellaneous language fixes
authortimeless <timeless@gmail.com>
Sat, 28 Feb 2009 12:38:45 +0100
changeset 7807 bd8f44638847
parent 7806 6d0cf2a2acad
child 7808 5b010dae99c3
help: miscellaneous language fixes
hgext/patchbomb.py file | annotate | diff | comparison | revisions
mercurial/changelog.py file | annotate | diff | comparison | revisions
mercurial/cmdutil.py file | annotate | diff | comparison | revisions
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-help.out file | annotate | diff | comparison | revisions 
--- a/hgext/patchbomb.py	Sat Feb 28 12:25:14 2009 +0100
+++ b/hgext/patchbomb.py	Sat Feb 28 12:38:45 2009 +0100
@@ -48,7 +48,7 @@
 each patchbomb message in a pager or sending the messages directly,
 it will create a UNIX mailbox file with the patch emails.  This
 mailbox file can be previewed with any mail user agent which supports
-UNIX mbox files, i.e. with mutt:
+UNIX mbox files, e.g. with mutt:
 
   % mutt -R -f mbox
 
@@ -444,7 +444,7 @@
 emailopts = [
           ('a', 'attach', None, _('send patches as attachments')),
           ('i', 'inline', None, _('send patches as inline attachments')),
-          ('', 'bcc', [], _('email addresses of blind copy recipients')),
+          ('', 'bcc', [], _('email addresses of blind carbon copy recipients')),
           ('c', 'cc', [], _('email addresses of copy recipients')),
           ('d', 'diffstat', None, _('add diffstat output to messages')),
           ('', 'date', '', _('use the given date as the sending date')),
--- a/mercurial/changelog.py	Sat Feb 28 12:25:14 2009 +0100
+++ b/mercurial/changelog.py	Sat Feb 28 12:38:45 2009 +0100
@@ -24,7 +24,7 @@
     return text.replace('\0', '\\0')
 
 class appender:
-    '''the changelog index must be update last on disk, so we use this class
+    '''the changelog index must be updated last on disk, so we use this class
     to delay writes to it'''
     def __init__(self, fp, buf):
         self.data = buf
--- a/mercurial/cmdutil.py	Sat Feb 28 12:25:14 2009 +0100
+++ b/mercurial/cmdutil.py	Sat Feb 28 12:38:45 2009 +0100
@@ -940,10 +940,10 @@
     raise util.Abort(_("revision matching date not found"))
 
 def walkchangerevs(ui, repo, pats, change, opts):
-    '''Iterate over files and the revs they changed in.
+    '''Iterate over files and the revs in which they changed.
 
     Callers most commonly need to iterate backwards over the history
-    it is interested in.  Doing so has awful (quadratic-looking)
+    in which they are interested. Doing so has awful (quadratic-looking)
     performance, so we use iterators in a "windowed" way.
 
     We walk a window of revisions in the desired order.  Within the
--- a/mercurial/commands.py	Sat Feb 28 12:25:14 2009 +0100
+++ b/mercurial/commands.py	Sat Feb 28 12:38:45 2009 +0100
@@ -23,7 +23,7 @@
     The files will be added to the repository at the next commit. To
     undo an add before that, see hg revert.
 
-    If no names are given, add all files in the repository.
+    If no names are given, add all files to the repository.
     """
 
     rejected = None
@@ -184,7 +184,7 @@
     The --merge option remembers the parent of the working directory
     before starting the backout, then merges the new head with that
     changeset afterwards. This saves you from doing the merge by
-    hand. The result of this merge is not committed, as for a normal
+    hand. The result of this merge is not committed, as with a normal
     merge.
 
     See \'hg help dates\' for a list of formats valid for -d/--date.
@@ -277,7 +277,7 @@
     If you supply a command it will be used for automatic bisection. Its exit
     status will be used as flag to mark revision as bad or good. In case exit
     status is 0 the revision is marked as good, 125 - skipped, 127 (command not
-    found) - bisection will be aborted and any other status bigger than 0 will
+    found) - bisection will be aborted; any other status bigger than 0 will
     mark revision as bad.
     """
     def print_result(nodes, good):
@@ -456,7 +456,7 @@
     """create a changegroup file
 
     Generate a compressed changegroup file collecting changesets not
-    found in the other repository.
+    known to be in another repository.
 
     If no destination repository is specified the destination is
     assumed to have all the nodes specified by one or more --base
@@ -614,7 +614,7 @@
     file names or -I/-X filters.
 
     If no commit message is specified, the configured editor is started to
-    enter a message.
+    prompt you for a message.
 
     See 'hg help dates' for a list of formats valid for -d/--date.
     """
@@ -653,13 +653,13 @@
 
     Mark dest as having copies of source files. If dest is a
     directory, copies are put in that directory. If dest is a file,
-    there can only be one source.
+    the source must be a single file.
 
     By default, this command copies the contents of files as they
     stand in the working directory. If invoked with --after, the
     operation is recorded, but no copying is performed.
 
-    This command takes effect in the next commit. To undo a copy
+    This command takes effect with the next commit. To undo a copy
     before that, see hg revert.
     """
     wlock = repo.wlock(False)
@@ -1023,7 +1023,7 @@
     probably with undesirable results.
 
     Use the --git option to generate diffs in the git extended diff
-    format. Read the diffs help topic for more information.
+    format. For more information, read hg help diffs.
     """
 
     revs = opts.get('rev')
@@ -1857,8 +1857,8 @@
     files and full commit message is shown.
 
     NOTE: log -p may generate unexpected diff output for merge
-    changesets, as it will compare the merge changeset against its
-    first parent only. Also, the files: list will only reflect files
+    changesets, as it will only compare the merge changeset against
+    its first parent. Also, the files: list will only reflect files
     that are different from BOTH parents.
 
     """
@@ -2312,10 +2312,10 @@
     a file, there can only be one source.
 
     By default, this command copies the contents of files as they
-    stand in the working directory. If invoked with --after, the
+    exist in the working directory. If invoked with --after, the
     operation is recorded, but no copying is performed.
 
-    This command takes effect in the next commit. To undo a rename
+    This command takes effect at the next commit. To undo a rename
     before that, see hg revert.
     """
     wlock = repo.wlock(False)
--- a/tests/test-help.out	Sat Feb 28 12:25:14 2009 +0100
+++ b/tests/test-help.out	Sat Feb 28 12:38:45 2009 +0100
@@ -169,7 +169,7 @@
     The files will be added to the repository at the next commit. To
     undo an add before that, see hg revert.
 
-    If no names are given, add all files in the repository.
+    If no names are given, add all files to the repository.
 
 options:
 
@@ -188,7 +188,7 @@
     The files will be added to the repository at the next commit. To
     undo an add before that, see hg revert.
 
-    If no names are given, add all files in the repository.
+    If no names are given, add all files to the repository.
 
 options:
 
@@ -220,7 +220,7 @@
     probably with undesirable results.
 
     Use the --git option to generate diffs in the git extended diff
-    format. Read the diffs help topic for more information.
+    format. For more information, read hg help diffs.
 
 options:
mercurial