Index: pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp
===================================================================
--- pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp	(revision 4670)
+++ pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/endpoint.hpp	(revision 4672)
@@ -21,5 +21,5 @@
 
 /**
- * @file pjsua2/ua.hpp
+ * @file pjsua2/endpoint.hpp
  * @brief PJSUA2 Base Agent Operation
  */
@@ -33,5 +33,5 @@
 
 /**
- * @defgroup PJSUA2_UA Base Endpoint Operations
+ * @defgroup PJSUA2_UA Endpoint
  * @ingroup PJSUA2_Ref
  * @{
@@ -163,5 +163,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
-
+/**
+ * SIP User Agent related settings.
+ */
 struct UaConfig : public PersistentObject
 {
@@ -213,5 +215,5 @@
      *
      * When nameserver is not configured, entries will be resolved with
-     * #pj_gethostbyname() if it's not an IP address. Port number may be
+     * pj_gethostbyname() if it's not an IP address. Port number may be
      * specified if the server is not listening in standard STUN port.
      */
@@ -343,5 +345,5 @@
 
     /**
-     * Additional flags to be given to #pj_file_open() when opening
+     * Additional flags to be given to pj_file_open() when opening
      * the log file. By default, the flag is PJ_O_WRONLY. Application
      * may set PJ_O_APPEND here so that logs are appended to existing
@@ -499,5 +501,5 @@
 
     /**
-     * Echo canceller options (see #pjmedia_echo_create())
+     * Echo canceller options (see pjmedia_echo_create())
      *
      * Default: 0.
@@ -791,5 +793,5 @@
     /**
      * Schedule a timer with the specified interval and user data. When the
-     * interval elapsed, Endpoint::onTimer() callback will be
+     * interval elapsed, onTimer() callback will be
      * called. Note that the callback may be executed by different thread,
      * depending on whether worker thread is enabled or not.
@@ -811,5 +813,5 @@
      * 				previous utilTimerSchedule() call.
      */
-    void utilTimerCancel(Token prmTimerToken);
+    void utilTimerCancel(Token prmToken);
 
     /**
@@ -824,9 +826,9 @@
      * This is a utility function to detect NAT type in front of this endpoint.
      * Once invoked successfully, this function will complete asynchronously
-     * and report the result in Endpoint::onNatDetectionComplete().
+     * and report the result in onNatDetectionComplete().
      *
      * After NAT has been detected and the callback is called, application can
-     * get the detected NAT type by calling #natGetType(). Application
-     * can also perform NAT detection by calling #natDetectType()
+     * get the detected NAT type by calling natGetType(). Application
+     * can also perform NAT detection by calling natDetectType()
      * again at later time.
      *
@@ -836,7 +838,7 @@
 
     /**
-     * Get the NAT type as detected by #natDetectType() function. This
-     * function will only return useful NAT type after #natDetectType()
-     * has completed successfully and Endpoint::onNatDetectionComplete()
+     * Get the NAT type as detected by natDetectType() function. This
+     * function will only return useful NAT type after natDetectType()
+     * has completed successfully and onNatDetectionComplete()
      * callback has been called.
      *
@@ -848,5 +850,5 @@
     /**
      * Auxiliary function to resolve and contact each of the STUN server
-     * entries (sequentially) to find which is usable. The #pjsua_init() must
+     * entries (sequentially) to find which is usable. The libInit() must
      * have been called before calling this function.
      *
@@ -966,5 +968,5 @@
      * @param media	media to be added.
      */
-    void addMedia(AudioMedia &media);
+    void mediaAdd(AudioMedia &media);
 
     /**
@@ -973,5 +975,5 @@
      * @param media	media to be removed.
      */
-    void removeMedia(AudioMedia &media);
+    void mediaRemove(AudioMedia &media);
 
     /**
@@ -1005,4 +1007,9 @@
     const AudioMediaVector &mediaEnumPorts() const throw(Error);
 
+    /**
+     * Get the instance of Audio Device Manager.
+     *
+     * @return		The Audio Device Manager.
+     */
     AudDevManager &audDevManager();
 
@@ -1060,5 +1067,5 @@
     /**
      * Callback when the Endpoint has finished performing NAT type
-     * detection that is initiated with Endpoint::natDetectType().
+     * detection that is initiated with natDetectType().
      *
      * @param prm	Callback parameters containing the detection
@@ -1071,5 +1078,5 @@
     /**
      * Callback when the Endpoint has finished performing STUN server
-     * checking that is initiated with Endpoint::natCheckStunServers().
+     * checking that is initiated with natCheckStunServers().
      *
      * @param prm	Callback parameters.
@@ -1090,5 +1097,5 @@
     /**
      * Callback when a timer has fired. The timer was scheduled by
-     * Endpoint::utilTimerSchedule().
+     * utilTimerSchedule().
      *
      * @param prm	Callback parameters.
