--- a/doc/api.mdwn	Mon May 21 03:38:51 2012 +0300
+++ b/doc/api.mdwn	Mon May 21 19:10:25 2012 +0300
@@ -72,7 +72,10 @@
 Hook name constants. Usually are the same as actual hook name, but
 uppercased, with 'HOOK_' added and with underscores instead of dashes.
 
-### *_request ( to, error )
+### OPT_*
+MCabber option names. Should not be enclosed in braces.
+
+### pep_*_request ( to, error )
 Request corresponding data from the jid, specified in 'to'.
 'error' may be used for error control. If no error occured,
 and remote side have replied with notification stanza, call
@@ -80,13 +83,6 @@
 event '*-in'. Currently there's no way to detect an
 error on the remote side (eg, if it does not support PEP).
 
-### *_publish ( ... )
-Publish supplied data as corresponding user's update. Note,
-that this function bypasses event interface, thus, it can
-be used to publish *only* via PEP. In general, it is
-suggested to use event (hooks) interface, as it allows
-multiplexing and non-breaking extensibility.
-
 ## pep
 
 ### (*pep_xmlns_handler_t) ( from, node, n, id, userdata )
@@ -104,17 +100,4 @@
 ### pep_unregister_xmlns_handler ( xmlns )
 Remove handler from given xmlns namespace.
 
-## tune
-'tune_publish' takes list of key-value pairs.
-
-## mood
-'mood_publish' takes two string arguments - mood and mood message.
-
-## activity
-'activity_publish' takes three string arguments - major activity, minor, and
-activity message.
-
-## geoloc
-'geoloc_publish' takes list of key-value pairs.
-
 <!-- -->