Merge branch 'master' into develop

server/core/dcb.c

@@ -1706,14 +1706,15 @@ int gw_write(
 /**
  * Add a callback
  *
- * Duplicate registrations are not allowed, therefore an error will be returned if
- * the specific function, reason and userdata triple are already registered.
+ * Duplicate registrations are not allowed, therefore an error will be
+ * returned if the specific function, reason and userdata triple
+ * are already registered.
  * An error will also be returned if the is insufficient memeory available to
  * create the registration.
  *
  * @param dcb		The DCB to add the callback to
  * @param reason	The callback reason
- * @param cb		The callback function to call
+ * @param callback	The callback function to call
  * @param userdata	User data to send in the call
  * @return		Non-zero (true) if the callback was added
  */
@@ -1769,7 +1770,7 @@ int		rval = 1;
  *
  * @param dcb		The DCB to add the callback to
  * @param reason	The callback reason
- * @param cb		The callback function to call
+ * @param callback	The callback function to call
  * @param userdata	User data to send in the call
  * @return		Non-zero (true) if the callback was removed
  */
@@ -1842,7 +1843,7 @@ DCB_CALLBACK	*cb, *nextcb;
 /**
  * Check the passed DCB to ensure it is in the list of allDCBS
  *
- * @param	DCB	The DCB to check
+ * @param	dcb	The DCB to check
  * @return	1 if the DCB is in the list, otherwise 0
  */
 int
@@ -1939,8 +1940,8 @@ void dcb_call_foreach (
  * Null protocol write routine used for cloned dcb's. It merely consumes
  * buffers written on the cloned DCB.
  *
- * @params dcb		The descriptor control block
- * @params buf		The buffer beign written
+ * @param dcb		The descriptor control block
+ * @param buf		The buffer being written
  * @return	Always returns a good write operation result
  */
 static int