- Documented callgrind_{annotate,control} in the Callgrind manual chapter
  and created man pages for them.  Renamed the XML files in the process for
  consistency.

- Inlined cg-entities.xml into vg-entities.xml.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10742 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/callgrind/callgrind_annotate.in b/callgrind/callgrind_annotate.in
index 5c762e2..60ecde0 100644
--- a/callgrind/callgrind_annotate.in
+++ b/callgrind/callgrind_annotate.in
@@ -200,7 +200,7 @@
 
   options for the user, with defaults in [ ], are:
     -h --help             show this message
-    -v --version          show version
+    --version             show version
     --show=A,B,C          only show figures for events A,B,C [all]
     --sort=A,B,C          sort columns by events A,B,C [event column order]
     --threshold=<0--100>  percentage of counts (of primary sort event) we
@@ -232,7 +232,7 @@
         if ($arg =~ /^-/) {
 
             # --version
-            if ($arg =~ /^-v$|^--version$/) {
+            if ($arg =~ /^--version$/) {
                 die("callgrind_annotate-$version\n");
 
             # --show=A,B,C