diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 09b7ad62d74d7ef8385e99a015eec2f8ef228b1b..f212a83529b00dd39851f328a95b980efb5cd39d 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -637,7 +637,7 @@ static struct zt_pvt {
  * statement is reached, the current zt_chan_conf is used to configure the 
  * channel (struct zt_pvt)
  *
- * @seealso zt_chan_init for the default values.
+ * \see zt_chan_init for the default values.
  */
 struct zt_chan_conf {
 	struct zt_pvt chan;
diff --git a/include/asterisk/doxyref.h b/include/asterisk/doxyref.h
index d9daf413545cef4f51782b434c7dc1aa707b62a0..fa4d1ac3abdca870fc807d6fc584cf69f46e918f 100644
--- a/include/asterisk/doxyref.h
+++ b/include/asterisk/doxyref.h
@@ -44,6 +44,7 @@
  *  \arg \ref ConfigFiles
  *  \arg \ref SoundFiles included in the Asterisk distribution
  *  \arg \ref AstCREDITS : A Thank You to contributors
+ *  \arg \ref extref 
  \n\n
  * \section weblinks Web sites
  * \arg \b Main:  Asterisk Developer's website http://www.asterisk.org/developers/
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index fa0b6f939a31f0eb044b5a9627bbc038785c9947..c0b9b33522351200636eae8b99a0a6913f91e700 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -495,8 +495,9 @@ struct ast_frame *ast_smoother_read(struct ast_smoother *s);
 void ast_frame_dump(const char *name, struct ast_frame *f, char *prefix);
 
 /*! \page AudioCodecPref Audio Codec Preferences
+
 	In order to negotiate audio codecs in the order they are configured
-	in <channel>.conf for a device, we set up codec preference lists
+	in \<channel\>.conf for a device, we set up codec preference lists
 	in addition to the codec capabilities setting. The capabilities
 	setting is a bitmask of audio and video codecs with no internal
 	order. This will reflect the offer given to the other side, where
diff --git a/main/manager.c b/main/manager.c
index a88de0cda094ea6cc9b1590e64546eb97d624eb0..b342e6741b42fa5859d489fb150b8f8979c69081 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -22,6 +22,8 @@
  *
  * \author Mark Spencer <markster@digium.com>
  *
+ * \extref OpenSSL http://www.openssl.org - for AMI/SSL 
+ *
  * At the moment this file contains a number of functions, namely:
  *
  * - data structures storing AMI state
@@ -117,8 +119,10 @@ static int num_sessions;
 
 static int manager_debug;	/*!< enable some debugging code in the manager */
 
-/*!
+/*! \brief
  * Descriptor for a manager session, either on the AMI socket or over HTTP.
+ *
+ * \note
  * AMI session have managerid == 0; the entry is created upon a connect,
  * and destroyed with the socket.
  * HTTP sessions have managerid != 0, the value is used as a search key
@@ -155,6 +159,7 @@ struct mansession {
 static AST_LIST_HEAD_STATIC(sessions, mansession);
 
 /*! \brief user descriptor, as read from the config file.
+ *
  * \note It is still missing some fields -- e.g. we can have multiple permit and deny
  * lines which are not supported here, and readperm/writeperm/writetimeout
  * are not stored.
@@ -2157,10 +2162,12 @@ static int process_message(struct mansession *s, const struct message *m)
 
 /*!
  * Read one full line (including crlf) from the manager socket.
+ * \note \verbatim
  * \r\n is the only valid terminator for the line.
  * (Note that, later, '\0' will be considered as the end-of-line marker,
  * so everything between the '\0' and the '\r\n' will not be used).
  * Also note that we assume output to have at least "maxlen" space.
+ * \endverbatim
  */
 static int get_input(struct mansession *s, char *output)
 {