- 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/vg-entities.xml b/docs/xml/vg-entities.xml
index 5da7c01..e713bfb 100644
--- a/docs/xml/vg-entities.xml
+++ b/docs/xml/vg-entities.xml
@@ -1,6 +1,7 @@
 <!-- misc. strings -->
 <!ENTITY vg-jemail     "julian@valgrind.org">
 <!ENTITY vg-vemail     "valgrind@valgrind.org">
+<!ENTITY cl-email      "Josef.Weidendorfer@gmx.de">
 <!ENTITY vg-lifespan   "2000-2009">
 
 <!-- valgrind release + version stuff -->
@@ -20,3 +21,6 @@
 <!ENTITY vg-repo-url   "http://www.valgrind.org/downloads/repository.html">
 <!ENTITY vg-pubs-url   "http://www.valgrind.org/docs/pubs.html">
 <!ENTITY vg-docs-url   "http://www.valgrind.org/docs/manual/index.html">
+<!ENTITY cl-gui-url    "http://kcachegrind.sourceforge.net/cgi-bin/show.cgi/KcacheGrindIndex">
+
+