diff -r d891503c8aa6 -r d9bcdc9a91e6 pidgin/gtkprefs.h
--- a/pidgin/gtkprefs.h	Wed Jan 29 10:10:12 2014 +0530
+++ b/pidgin/gtkprefs.h	Wed Jan 29 10:49:02 2014 +0530
@@ -44,9 +44,9 @@
 /**
  * Add a new checkbox for a boolean preference
  *
- * @title: The text to be displayed as the checkbox label
- * @key:   The key of the purple bool pref that will be represented by the checkbox
- * @page:  The page to which the new checkbox will be added
+ * @param title The text to be displayed as the checkbox label
+ * @param key   The key of the purple bool pref that will be represented by the checkbox
+ * @param page  The page to which the new checkbox will be added
  */
 GtkWidget *pidgin_prefs_checkbox(const char *title, const char *key,
 		GtkWidget *page);
@@ -54,13 +54,13 @@
 /**
  * Add a new spin button representing an int preference
  *
- * @page:  The page to which the spin button will be added
- * @title: The text to be displayed as the spin button label
- * @key:   The key of the int pref that will be represented by the spin button
- * @min:   The minimum value of the spin button
- * @max:   The maximum value of the spin button
- * @sg:    If not NULL, the size group to which the spin button will be added
- * Returns:      An hbox containing both the label and the spinner.  Can be
+ * @param page  The page to which the spin button will be added
+ * @param title The text to be displayed as the spin button label
+ * @param key   The key of the int pref that will be represented by the spin button
+ * @param min   The minimum value of the spin button
+ * @param max   The maximum value of the spin button
+ * @param sg    If not NULL, the size group to which the spin button will be added
+ * @return      An hbox containing both the label and the spinner.  Can be
  *              used to set the widgets to sensitive or insensitive based on the
  *              value of a checkbox.
  */
@@ -70,12 +70,12 @@
 /**
  * Add a new entry representing a string preference
  *
- * @page:  The page to which the entry will be added
- * @title: The text to be displayed as the entry label
- * @key:   The key of the string pref that will be represented by the entry
- * @sg:    If not NULL, the size group to which the entry will be added
+ * @param page  The page to which the entry will be added
+ * @param title The text to be displayed as the entry label
+ * @param key   The key of the string pref that will be represented by the entry
+ * @param sg    If not NULL, the size group to which the entry will be added
  *
- * Returns:      An hbox containing both the label and the entry.  Can be used to set
+ * @return      An hbox containing both the label and the entry.  Can be used to set
  *               the widgets to sensitive or insensitive based on the value of a
  *               checkbox.
  */
@@ -86,12 +86,12 @@
  * Add a new entry representing a password (string) preference
  * The entry will use a password-style text entry (the text is substituded)
  *
- * @page:  The page to which the entry will be added
- * @title: The text to be displayed as the entry label
- * @key:   The key of the string pref that will be represented by the entry
- * @sg:    If not NULL, the size group to which the entry will be added
+ * @param page  The page to which the entry will be added
+ * @param title The text to be displayed as the entry label
+ * @param key   The key of the string pref that will be represented by the entry
+ * @param sg    If not NULL, the size group to which the entry will be added
  *
- * Returns:      An hbox containing both the label and the entry.  Can be used to set
+ * @return      An hbox containing both the label and the entry.  Can be used to set
  *               the widgets to sensitive or insensitive based on the value of a
  *               checkbox.
  */
@@ -101,11 +101,11 @@
 /**
  * Add a new dropdown representing a preference of the specified type
  *
- * @page:  The page to which the dropdown will be added
- * @title: The text to be displayed as the dropdown label
- * @type:  The type of preference to be stored in the generated dropdown
- * @key:   The key of the pref that will be represented by the dropdown
- * @...:   The choices to be added to the dropdown, choices should be
+ * @param page  The page to which the dropdown will be added
+ * @param title The text to be displayed as the dropdown label
+ * @param type  The type of preference to be stored in the generated dropdown
+ * @param key   The key of the pref that will be represented by the dropdown
+ * @param ...   The choices to be added to the dropdown, choices should be
  *              paired as label/value
  */
 GtkWidget *pidgin_prefs_dropdown(GtkWidget *page, const gchar *title,
@@ -114,11 +114,11 @@
 /**
  * Add a new dropdown representing a preference of the specified type
  *
- * @page:      The page to which the dropdown will be added
- * @title:     The text to be displayed as the dropdown label
- * @type:      The type of preference to be stored in the dropdown
- * @key:       The key of the pref that will be represented by the dropdown
- * @menuitems: The choices to be added to the dropdown, choices should
+ * @param page      The page to which the dropdown will be added
+ * @param title     The text to be displayed as the dropdown label
+ * @param type      The type of preference to be stored in the dropdown
+ * @param key       The key of the pref that will be represented by the dropdown
+ * @param menuitems The choices to be added to the dropdown, choices should
  *                  be paired as label/value
  */
 GtkWidget *pidgin_prefs_dropdown_from_list(GtkWidget *page,