--- a/doc/book/en/A03a-concepts.en.txt	Wed Jan 14 11:23:14 2009 +0100
+++ b/doc/book/en/A03a-concepts.en.txt	Wed Jan 14 11:42:52 2009 +0100
@@ -490,32 +490,47 @@
 
 The available application entities are:
 
-* addressbook: PhoneNumber and PostalAddress
+* addressbook_: PhoneNumber and PostalAddress
 
-* basket: Basket (like a shopping cart)
+* basket_: Basket (like a shopping cart)
 
-* blog: Blog (a *very* basic blog)
+* blog_: Blog (a *very* basic blog)
 
-* classfolder: Folder (to organize things but grouping them in folders)
+* comment_: Comment (to attach comment threads to entities)
+
+* event_: Event (define events, display them in calendars)
 
-* classtags: Tag (to tag anything)
+* file_: File (to allow users to upload and store binary or text files)
 
-* file: File (to allow users to upload and store binary or text files)
+* folder_: Folder (to organize things but grouping them in folders)
 
-* link: Link (to collect links to web resources)
+* keyword_: Keyword (to define classification schemes)
 
-* mailinglist: MailingList (to reference a mailing-list and the URLs
+* link_: Link (to collect links to web resources)
+
+* mailinglist_: MailingList (to reference a mailing-list and the URLs
   for its archives and its admin interface)
 
-* person: Person (easily mixed with addressbook)
+* person_: Person (easily mixed with addressbook)
+
+* tag_: Tag (to tag anything)
 
-* task: Task (something to be done between start and stop date)
+* task_: Task (something to be done between start and stop date)
 
-* zone: Zone (to define places within larger places, for example a
+* zone_: Zone (to define places within larger places, for example a
   city in a state in a country)
 
-The available system entities are:
-
-* comment: Comment (to attach comment threads to entities)
-
-
+.. _addressbook: http://www.cubicweb.org/project/cubicweb-addressbook
+.. _basket: http://www.cubicweb.org/project/cubicweb-basket
+.. _blog: http://www.cubicweb.org/project/cubicweb-blog
+.. _comment: http://www.cubicweb.org/project/cubicweb-comment
+.. _event: http://www.cubicweb.org/project/cubicweb-event
+.. _file: http://www.cubicweb.org/project/cubicweb-file
+.. _folder: http://www.cubicweb.org/project/cubicweb-folder
+.. _keyword: http://www.cubicweb.org/project/cubicweb-keyword
+.. _link: http://www.cubicweb.org/project/cubicweb-link
+.. _mailinglist: http://www.cubicweb.org/project/cubicweb-mailinglist
+.. _person: http://www.cubicweb.org/project/cubicweb-person
+.. _tag: http://www.cubicweb.org/project/cubicweb-tag
+.. _task: http://www.cubicweb.org/project/cubicweb-task
+.. _zone: http://www.cubicweb.org/project/cubicweb-zone