Index: pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp
===================================================================
--- pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp	(revision 4659)
+++ pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp	(revision 4672)
@@ -29,18 +29,14 @@
 #include <pjsua2/siptypes.hpp>
 
+/** PJSUA2 API is inside pj namespace */
+namespace pj
+{
+
 /**
  * @defgroup PJSUA2_ACC Account
  * @ingroup PJSUA2_Ref
- */
-
-/**
- * @defgroup PJSUA2_Acc_Data_Structure Data Structure
- * @ingroup PJSUA2_Ref
  * @{
  */
 
-/** PJSUA2 API is inside pj namespace */
-namespace pj
-{
 using std::string;
 
@@ -91,5 +87,5 @@
      * See also \a firstRetryIntervalSec setting.
      *
-     * Default: #PJSUA_REG_RETRY_INTERVAL
+     * Default: PJSUA_REG_RETRY_INTERVAL
      */
     unsigned		retryIntervalSec;
@@ -263,5 +259,5 @@
     /**
      * Specify how to offer call hold to remote peer. Please see the
-     * documentation on #pjsua_call_hold_type for more info.
+     * documentation on pjsua_call_hold_type for more info.
      *
      * Default: PJSUA_CALL_HOLD_TYPE_DEFAULT
@@ -280,5 +276,5 @@
     /**
      * Specify the usage of Session Timers for all sessions. See the
-     * #pjsua_sip_timer_use for possible values.
+     * pjsua_sip_timer_use for possible values.
      *
      * Default: PJSUA_SIP_TIMER_OPTIONAL
@@ -677,5 +673,5 @@
     /**
      * Specify whether stream keep-alive and NAT hole punching with
-     * non-codec-VAD mechanism (see @ref PJMEDIA_STREAM_ENABLE_KA) is enabled
+     * non-codec-VAD mechanism (see PJMEDIA_STREAM_ENABLE_KA) is enabled
      * for this account.
      *
@@ -689,5 +685,5 @@
      * PJMEDIA_SRTP_MANDATORY.
      *
-     * Default: #PJSUA_DEFAULT_USE_SRTP
+     * Default: PJSUA_DEFAULT_USE_SRTP
      */
     pjmedia_srtp_use	srtpUse;
@@ -702,5 +698,5 @@
      *	2: SRTP requires secure end-to-end transport (SIPS)
      *
-     * Default: #PJSUA_DEFAULT_SRTP_SECURE_SIGNALING
+     * Default: PJSUA_DEFAULT_SRTP_SECURE_SIGNALING
      */
     int			srtpSecureSignaling;
@@ -739,8 +735,8 @@
      * Regardless of this setting, application can detect incoming video
      * by implementing \a on_call_media_state() callback and enumerating
-     * the media stream(s) with #pjsua_call_get_info(). Once incoming
+     * the media stream(s) with pjsua_call_get_info(). Once incoming
      * video is recognised, application may retrieve the window associated
      * with the incoming video and show or hide it with
-     * #pjsua_vid_win_set_show().
+     * pjsua_vid_win_set_show().
      *
      * Default: False
@@ -757,5 +753,5 @@
      *
      * Regardless of the value of this setting, application can start and
-     * stop outgoing video transmission with #pjsua_call_set_vid_strm().
+     * stop outgoing video transmission with pjsua_call_set_vid_strm().
      *
      * Default: False
@@ -765,5 +761,5 @@
     /**
      * Specify video window's flags. The value is a bitmask combination of
-     * #pjmedia_vid_dev_wnd_flag.
+     * pjmedia_vid_dev_wnd_flag.
      *
      * Default: 0
@@ -984,4 +980,5 @@
 
 public:
+    /** Import from pjsip data */
     void fromPj(const pjsua_acc_info &pai);
 };
@@ -1274,13 +1271,4 @@
 };
 
-/**
- * @}  // PJSUA2_Acc_Data_Structure
- */
-
-/**
- * @addtogroup PJSUA2_ACC
- * @{
- */
-
 
 /**
@@ -1315,7 +1303,8 @@
      * reregistration on the account.
      *
-     * @param cfg 		New account config to be applied to the account.
-     */
-    void modify(const AccountConfig &acc) throw(Error);
+     * @param cfg 		New account config to be applied to the
+     * 				account.
+     */
+    void modify(const AccountConfig &cfg) throw(Error);
 
     /**
@@ -1495,5 +1484,5 @@
      *	  parameter. In this case, the library will automatically send NOTIFY
      *	  request upon returning from this callback.
-     *  - it may delay the processing of the request, for example to request
+     *	- it may delay the processing of the request, for example to request
      *    user permission whether to accept or reject the request. In this
      *	  case, the application MUST set the IncomingSubscribeParam.code
@@ -1559,10 +1548,10 @@
 };
 
+/**
+ * @}  // PJSUA2_ACC
+ */
+
 } // namespace pj
 
-/**
- * @}  // PJSUA2_ACC
- */
-
 #endif	/* __PJSUA2_ACCOUNT_HPP__ */
 
