# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1166306290 -3600
# Node ID 3c82ab166eea9e1562f7fa5999dc94c95cf6384c
# Parent  283ee89715701948d1d3c35e386bb57bcdcb58ec
doc fix: hg tags defaults to current parent revision, too.
Additionally use better language for the help text for tag,
cat and manifest.

diff -r 283ee8971570 -r 3c82ab166eea mercurial/commands.py
--- a/mercurial/commands.py	Sat Dec 16 22:33:39 2006 +0100
+++ b/mercurial/commands.py	Sat Dec 16 22:58:10 2006 +0100
@@ -342,8 +342,8 @@
     """output the current or given revision of files
 
     Print the specified files as they were at the given revision.
-    If no revision is given then working dir parent is used, or tip
-    if no revision is checked out.
+    If no revision is given, the parent of the working directory is used,
+    or tip if no revision is checked out.
 
     Output may be to a file, in which case the name of the file is
     given using a format string.  The formatting rules are the same as
@@ -1744,8 +1744,8 @@
     """output the current or given revision of the project manifest
 
     Print a list of version controlled files for the given revision.
-    If no revision is given then working dir parent is used, or tip
-    if no revision is checked out.
+    If no revision is given, the parent of the working directory is used,
+    or tip if no revision is checked out.
 
     The manifest is the list of files being version controlled. If no revision
     is given then the first parent of the working directory is used.
@@ -2404,7 +2404,7 @@
                     ui.write('  %s%s' % (copied, end))
 
 def tag(ui, repo, name, rev_=None, **opts):
-    """add a tag for the current tip or a given revision
+    """add a tag for the current or given revision
 
     Name a particular revision using <name>.
 
@@ -2412,7 +2412,8 @@
     very useful to compare different revision, to go back to significant
     earlier versions or to mark branch points as releases, etc.
 
-    If no revision is given, the parent of the working directory is used.
+    If no revision is given, the parent of the working directory is used,
+    or tip if no revision is checked out.
 
     To facilitate version control, distribution, and merging of tags,
     they are stored as a file named ".hgtags" which is managed
diff -r 283ee8971570 -r 3c82ab166eea tests/test-globalopts.out
--- a/tests/test-globalopts.out	Sat Dec 16 22:33:39 2006 +0100
+++ b/tests/test-globalopts.out	Sat Dec 16 22:58:10 2006 +0100
@@ -156,7 +156,7 @@
  serve        export the repository via HTTP
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
- tag          add a tag for the current tip or a given revision
+ tag          add a tag for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply a changegroup file
@@ -206,7 +206,7 @@
  serve        export the repository via HTTP
  showconfig   show combined config settings from all hgrc files
  status       show changed files in the working directory
- tag          add a tag for the current tip or a given revision
+ tag          add a tag for the current or given revision
  tags         list repository tags
  tip          show the tip revision
  unbundle     apply a changegroup file