- 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/docs/xml/valgrind-manpage.xml b/docs/xml/valgrind-manpage.xml
index d1988db..1bd5681 100644
--- a/docs/xml/valgrind-manpage.xml
+++ b/docs/xml/valgrind-manpage.xml
@@ -222,6 +222,8 @@
 <title>See Also</title>
 
 <para>
+callgrind_annotate(1),
+callgrind_control(1),
 ms_print(1),
 <filename>&vg-docs-path;</filename> or
 <filename>&vg-docs-url;</filename>.
@@ -233,9 +235,10 @@
 <refsect1 id="author">
 <title>Author</title>
 
-<para>This manpage written by Andres Roldan &lt;aroldan@debian.org&gt;,
-Robert Walsh &lt;rjwalsh@durables.org&gt;, and the Valgrind
-developers.</para>
+<para>The Valgrind developers.</para>
+
+<para>This manpage was written by Andres Roldan &lt;aroldan@debian.org&gt;
+and the Valgrind developers.</para>
 
 </refsect1>