docs: use #*-struct instead of <structname>

32 files changed, 185 insertions, 187 deletions

diff --git a/gtk/deprecated/gtkrc.c b/gtk/deprecated/gtkrc.c
index 1c09ae76ff..0639672aa8 100644
--- a/gtk/deprecated/gtkrc.c
+++ b/gtk/deprecated/gtkrc.c
@@ -1815,7 +1815,7 @@ gtk_rc_parse_priority (GScanner	           *scanner,
 /**
  * gtk_rc_parse_color:
  * @scanner: a #GScanner
- * @color: (out): a pointer to a #GdkColor structure in which to store
+ * @color: (out): a pointer to a #GdkColor in which to store
  *     the result
  *
  * Parses a color in the format expected
@@ -1840,7 +1840,7 @@ gtk_rc_parse_color (GScanner *scanner,
  * gtk_rc_parse_color_full:
  * @scanner: a #GScanner
  * @style: (allow-none): a #GtkRcStyle, or %NULL
- * @color: (out): a pointer to a #GdkColor structure in which to store
+ * @color: (out): a pointer to a #GdkColor in which to store
  *     the result
  *
  * Parses a color in the format expected
diff --git a/gtk/deprecated/gtkrc.h b/gtk/deprecated/gtkrc.h
index ed6275969f..5c171285a5 100644
--- a/gtk/deprecated/gtkrc.h
+++ b/gtk/deprecated/gtkrc.h
@@ -74,10 +74,10 @@ typedef enum
  * @xthickness: X thickness
  * @ythickness: Y thickness
  *
- * The #GtkRcStyle structure is used to represent a set
+ * The #GtkRcStyle-struct is used to represent a set
  * of information about the appearance of a widget.
  * This can later be composited together with other
- * #GtkRcStyle structures to form a #GtkStyle.
+ * #GtkRcStyle-struct<!-- -->s to form a #GtkStyle.
  */
 struct _GtkRcStyle
 {
diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 5a14d92eb9..0a3914b79b 100644
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -4187,14 +4187,14 @@ gtk_widget_get_style (GtkWidget *widget)
 /**
  * gtk_widget_modify_style:
  * @widget: a #GtkWidget
- * @style: the #GtkRcStyle holding the style modifications
+ * @style: the #GtkRcStyle-struct holding the style modifications
  *
  * Modifies style values on the widget.
  *
  * Modifications made using this technique take precedence over
  * style values set via an RC file, however, they will be overridden
  * if a style is explicitly set on the widget using gtk_widget_set_style().
- * The #GtkRcStyle structure is designed so each field can either be
+ * The #GtkRcStyle-struct is designed so each field can either be
  * set or unset, so it is possible, using this function, to modify some
  * style values and leave the others unchanged.
  *
diff --git a/gtk/gtkaboutdialog.h b/gtk/gtkaboutdialog.h
index e2a55786f9..341f75f325 100644
--- a/gtk/gtkaboutdialog.h
+++ b/gtk/gtkaboutdialog.h
@@ -89,7 +89,7 @@ typedef enum {
 /**
  * GtkAboutDialog:
  *
- * The <structname>GtkAboutDialog</structname> struct contains
+ * The #GtkAboutDialog-struct contains
  * only private fields and should not be directly accessed.
  */
 struct _GtkAboutDialog
diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 27a5712ae7..c08f81b28d 100644
--- a/gtk/gtkaccellabel.h
+++ b/gtk/gtkaccellabel.h
@@ -53,7 +53,7 @@ typedef struct _GtkAccelLabelPrivate GtkAccelLabelPrivate;
 /**
  * GtkAccelLabel:
  *
- * The #GtkAccelLabel-struct struct contains private data only, and
+ * The #GtkAccelLabel-struct contains private data only, and
  * should be accessed using the functions below.
  */
 struct _GtkAccelLabel
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 6ca8b124e6..4f50368e4b 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -48,7 +48,7 @@ typedef struct _GtkAdjustmentClass    GtkAdjustmentClass;
 /**
  * GtkAdjustment:
  *
- * The #GtkAdjustment struct contains only private fields and
+ * The #GtkAdjustment-struct contains only private fields and
  * should not be directly accessed.
  */
 struct _GtkAdjustment
diff --git a/gtk/gtkborder.c b/gtk/gtkborder.c
index 91c9a54555..3c5de20bbb 100644
--- a/gtk/gtkborder.c
+++ b/gtk/gtkborder.c
@@ -29,9 +29,9 @@
 /**
  * gtk_border_new:
  *
- * Allocates a new #GtkBorder structure and initializes its elements to zero.
+ * Allocates a new #GtkBorder-struct and initializes its elements to zero.
  *
- * Returns: a newly allocated #GtkBorder. Free with gtk_border_free()
+ * Returns: a newly allocated #GtkBorder-struct. Free with gtk_border_free()
  *
  * Since: 2.14
  */
@@ -43,9 +43,9 @@ gtk_border_new (void)
 
 /**
  * gtk_border_copy:
- * @border_: a #GtkBorder
+ * @border_: a #GtkBorder-struct
  *
- * Copies a #GtkBorder structure.
+ * Copies a #GtkBorder-struct.
  *
  * Returns: a copy of @border_.
  */
@@ -59,9 +59,9 @@ gtk_border_copy (const GtkBorder *border_)
 
 /**
  * gtk_border_free:
- * @border_: a #GtkBorder
+ * @border_: a #GtkBorder-struct
  *
- * Frees a #GtkBorder structure.
+ * Frees a #GtkBorder-struct.
  */
 void
 gtk_border_free (GtkBorder *border_)
diff --git a/gtk/gtkbuildable.c b/gtk/gtkbuildable.c
index 8867cfd333..3264e05fde 100644
--- a/gtk/gtkbuildable.c
+++ b/gtk/gtkbuildable.c
@@ -233,7 +233,7 @@ gtk_buildable_construct_child (GtkBuildable *buildable,
  * @builder: a #GtkBuilder used to construct this object
  * @child: (allow-none): child object or %NULL for non-child tags
  * @tagname: name of tag
- * @parser: (out): a #GMarkupParser structure to fill in
+ * @parser: (out): a #GMarkupParser to fill in
  * @data: (out): return location for user data that will be passed in 
  *   to parser functions
  *
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h
index e2d84887e3..3e15e05a06 100644
--- a/gtk/gtkbuildable.h
+++ b/gtk/gtkbuildable.h
@@ -63,7 +63,7 @@ typedef struct _GtkBuildableIface GtkBuildableIface;
  *  constructed object is returned and becomes owned by the caller.
  * @custom_tag_start: Implement this if the buildable needs to parse
  *  content below &lt;child&gt;. To handle an element, the implementation
- *  must fill in the @parser structure and @user_data and return %TRUE.
+ *  must fill in the @parser and @user_data and return %TRUE.
  *  #GtkWidget implements this to parse keyboard accelerators specified
  *  in &lt;accelerator&gt; elements. #GtkContainer implements it to map
  *  properties defined via &lt;packing&gt; elements to child properties.
@@ -82,9 +82,9 @@ typedef struct _GtkBuildableIface GtkBuildableIface;
  *  Implement this if the buildable has internal children that may
  *  need to be accessed from a UI definition.
  *
- * The GtkBuildableIface interface contains method that are
+ * The #GtkBuildableIface interface contains method that are
  * necessary to allow #GtkBuilder to construct an object from
- * a GtkBuilder UI definition.
+ * a #GtkBuilder UI definition.
  */
 struct _GtkBuildableIface
 {
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 10c5661165..01ae50d71d 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1586,7 +1586,7 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
 /**
  * gtk_builder_connect_signals:
  * @builder: a #GtkBuilder
- * @user_data: a pointer to a structure sent in as user data to all signals
+ * @user_data: user data to pass back with all signals
  *
  * This method is a simpler variation of gtk_builder_connect_signals_full().
  * It uses symbols explicitly added to @builder with prior calls to
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 2d1f069fd0..49babdb2a0 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -142,7 +142,7 @@
  * is the id of widget (which should be a child of the dialogs @action_area).
  * </para>
  * <example>
- * <title>A <structname>GtkDialog</structname> UI definition fragment.</title>
+ * <title>A #GtkDialog UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="GtkDialog" id="dialog1">
  *   <child internal-child="vbox">"
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 37cc87e8bf..87b4678196 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -103,7 +103,7 @@ typedef struct _GtkDialogClass         GtkDialogClass;
 /**
  * GtkDialog:
  *
- * The GtkDialog struct contains only private fields
+ * The #GtkDialog-struct contains only private fields
  * and should not be directly accessed.
  */
 struct _GtkDialog
diff --git a/gtk/gtkfilefilter.c b/gtk/gtkfilefilter.c
index 5b060960c0..f314bcd005 100644
--- a/gtk/gtkfilefilter.c
+++ b/gtk/gtkfilefilter.c
@@ -537,7 +537,7 @@ gtk_file_filter_add_custom (GtkFileFilter         *filter,
  * gtk_file_filter_get_needed:
  * @filter: a #GtkFileFilter
  * 
- * Gets the fields that need to be filled in for the structure
+ * Gets the fields that need to be filled in for the #GtkFileFilterInfo
  * passed to gtk_file_filter_filter()
  * 
  * This function will not typically be used by applications; it
@@ -558,11 +558,11 @@ gtk_file_filter_get_needed (GtkFileFilter *filter)
 /**
  * gtk_file_filter_filter:
  * @filter: a #GtkFileFilter
- * @filter_info: a #GtkFileFilterInfo structure containing information
+ * @filter_info: a #GtkFileFilterInfo containing information
  *  about a file.
  * 
  * Tests whether a file should be displayed according to @filter.
- * The #GtkFileFilterInfo structure @filter_info should include
+ * The #GtkFileFilterInfo @filter_info should include
  * the fields returned from gtk_file_filter_get_needed().
  *
  * This function will not typically be used by applications; it
diff --git a/gtk/gtkfilefilter.h b/gtk/gtkfilefilter.h
index 317906403d..02e8c08dc3 100644
--- a/gtk/gtkfilefilter.h
+++ b/gtk/gtkfilefilter.h
@@ -77,7 +77,7 @@ typedef gboolean (*GtkFileFilterFunc) (const GtkFileFilterInfo *filter_info,
  *   in the file chooser
  * @mime_type: the mime type of the file
  *
- * A #GtkFileFilterInfo struct is used to pass information about the
+ * A #GtkFileFilterInfo-struct is used to pass information about the
  * tested file to gtk_file_filter_filter().
  */
 struct _GtkFileFilterInfo
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index df8c336494..3c415981fe 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -1646,13 +1646,13 @@ _gtk_file_system_model_iter_is_filtered_out (GtkFileSystemModel *model,
  * @model: a #GtkFileSystemModel
  * @iter: a #GtkTreeIter pointing to a row of @model
  * 
- * Gets the #GFileInfo structure for a particular row
+ * Gets the #GFileInfo-struct for a particular row
  * of @model.
  * 
- * Return value: a #GFileInfo structure. This structure
+ * Return value: a #GFileInfo-struct. This value
  *   is owned by @model and must not be modified or freed.
  *   If you want to keep the information for later use,
- *   you must take a reference, since the structure may be
+ *   you must take a reference, since the #GFileInfo-struct may be
  *   freed on later changes to the file system.  If you have
  *   called _gtk_file_system_model_add_editable() and the @iter
  *   corresponds to the row that this function returned, the
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 8aacd56386..4b0c4c7d87 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -1805,7 +1805,7 @@ choose_icon (GtkIconTheme       *icon_theme,
  * @size: desired icon size
  * @flags: flags modifying the behavior of the icon lookup
  * 
- * Looks up a named icon and returns a structure containing
+ * Looks up a named icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon. The icon
  * can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
@@ -1843,7 +1843,7 @@ gtk_icon_theme_lookup_icon (GtkIconTheme       *icon_theme,
  * @flags: flags modifying the behavior of the icon lookup
  *
  * Looks up a named icon for a particular window scale and returns a
- * structure containing information such as the filename of the
+ * #GtkIconInfo containing information such as the filename of the
  * icon. The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon() combines
  * these two steps if all you need is the pixbuf.)
@@ -1942,7 +1942,7 @@ gtk_icon_theme_lookup_icon_for_scale (GtkIconTheme       *icon_theme,
  * @size: desired icon size
  * @flags: flags modifying the behavior of the icon lookup
  * 
- * Looks up a named icon and returns a structure containing
+ * Looks up a named icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon. The icon
  * can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon()
@@ -1981,7 +1981,7 @@ gtk_icon_theme_choose_icon (GtkIconTheme       *icon_theme,
  * @flags: flags modifying the behavior of the icon lookup
  * 
  * Looks up a named icon for a particular window scale and returns a
- * structure containing information such as the filename of the
+ * #GtkIconInfo containing information such as the filename of the
  * icon. The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon(). (gtk_icon_theme_load_icon() combines
  * these two steps if all you need is the pixbuf.)
@@ -3519,7 +3519,7 @@ gtk_icon_info_get_filename (GtkIconInfo *icon_info)
 
 /**
  * gtk_icon_info_get_builtin_pixbuf:
- * @icon_info: a #GtkIconInfo structure
+ * @icon_info: a #GtkIconInfo
  * 
  * Gets the built-in image for this icon, if any. To allow
  * GTK+ to use built in icon images, you must pass the
@@ -3546,7 +3546,7 @@ gtk_icon_info_get_builtin_pixbuf (GtkIconInfo *icon_info)
 
 /**
  * gtk_icon_info_is_symbolic:
- * @icon_info: a #GtkIconInfo structure
+ * @icon_info: a #GtkIconInfo
  *
  * Checks if the icon is symbolic or not. This currently uses only
  * the file name and not the file contents for determining this.
@@ -3878,7 +3878,7 @@ proxy_pixbuf_destroy (guchar *pixels, gpointer data)
 
 /**
  * gtk_icon_info_load_icon:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @error: (allow-none): location to store error information on failure,
  *     or %NULL.
  *
@@ -3952,7 +3952,7 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
 
 /**
  * gtk_icon_info_load_surface:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @for_window: (allow-none): #GdkWindow to optimize drawing for, or %NULL
  * @error: (allow-none): location to store error information on failure,
  *     or %NULL.
@@ -4012,7 +4012,7 @@ load_icon_thread  (GTask           *task,
 
 /**
  * gtk_icon_info_load_icon_async:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @cancellable: (allow-none): optional #GCancellable object,
  *     %NULL to ignore
  * @callback: (scope async): a #GAsyncReadyCallback to call when the
@@ -4060,7 +4060,7 @@ gtk_icon_info_load_icon_async (GtkIconInfo          *icon_info,
 
 /**
  * gtk_icon_info_load_icon_finish:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @res: a #GAsyncResult
  * @error: (allow-none): location to store error information on failure,
  *     or %NULL.
@@ -4526,7 +4526,7 @@ load_symbolic_icon_thread  (GTask           *task,
 
 /**
  * gtk_icon_info_load_symbolic_async:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @fg: a #GdkRGBA representing the foreground color of the icon
  * @success_color: (allow-none): a #GdkRGBA representing the warning color
  *     of the icon or %NULL to use the default color
@@ -4621,7 +4621,7 @@ gtk_icon_info_load_symbolic_async (GtkIconInfo   *icon_info,
 
 /**
  * gtk_icon_info_load_symbolic_finish:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @res: a #GAsyncResult
  * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
  *     loaded icon was a symbolic one and whether the @fg color was
@@ -4685,7 +4685,7 @@ gtk_icon_info_load_symbolic_finish (GtkIconInfo   *icon_info,
 
 /**
  * gtk_icon_info_load_symbolic_for_context_async:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @context: a #GtkStyleContext
  * @cancellable: (allow-none): optional #GCancellable object,
  *     %NULL to ignore
@@ -4750,7 +4750,7 @@ gtk_icon_info_load_symbolic_for_context_async (GtkIconInfo      *icon_info,
 
 /**
  * gtk_icon_info_load_symbolic_for_context_finish:
- * @icon_info: a #GtkIconInfo structure from gtk_icon_theme_lookup_icon()
+ * @icon_info: a #GtkIconInfo from gtk_icon_theme_lookup_icon()
  * @res: a #GAsyncResult
  * @was_symbolic: (out) (allow-none): a #gboolean, returns whether the
  *     loaded icon was a symbolic one and whether the @fg color was
@@ -5189,12 +5189,12 @@ find_builtin_icon (const gchar *icon_name,
  * @size: desired icon size
  * @flags: flags modifying the behavior of the icon lookup
  * 
- * Looks up an icon and returns a structure containing
+ * Looks up an icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon. 
  * The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon().
  *
- * Return value: (transfer full): a #GtkIconInfo structure containing 
+ * Return value: (transfer full): a #GtkIconInfo containing 
  *     information about the icon, or %NULL if the icon 
  *     wasn't found. Unref with g_object_unref()
  *
@@ -5219,12 +5219,12 @@ gtk_icon_theme_lookup_by_gicon (GtkIconTheme       *icon_theme,
  * @scale: the desired scale
  * @flags: flags modifying the behavior of the icon lookup
  *
- * Looks up an icon and returns a structure containing
+ * Looks up an icon and returns a #GtkIconInfo containing
  * information such as the filename of the icon.
  * The icon can then be rendered into a pixbuf using
  * gtk_icon_info_load_icon().
  *
- * Return value: (transfer full): a #GtkIconInfo structure containing
+ * Return value: (transfer full): a #GtkIconInfo containing
  *     information about the icon, or %NULL if the icon
  *     wasn't found. Unref with g_object_unref()
  *
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 344972e94b..4eead137cd 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -75,8 +75,7 @@
  * on the image, such as button clicks, place the image inside a
  * #GtkEventBox, then connect to the event signals on the event box.
  * <example>
- * <title>Handling button press events on a
- * <structname>GtkImage</structname>.</title>
+ * <title>Handling button press events on a #GtkImage.</title>
  * <programlisting>
  *   static gboolean
  *   button_press_callback (GtkWidget      *event_box,
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index bf7710ddd8..be3d83d759 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -46,7 +46,7 @@ typedef struct _GtkLinkButtonPrivate	GtkLinkButtonPrivate;
 /**
  * GtkLinkButton:
  *
- * The <structname>GtkLinkButton</structname> structure contains only
+ * The #GtkLinkButton-struct contains only
  * private data and should be accessed using the provided API.
  */
 struct _GtkLinkButton
@@ -61,7 +61,7 @@ struct _GtkLinkButton
  * GtkLinkButtonClass:
  * @activate_link: class handler for the #GtkLinkButton::activate-link signal
  *
- * The <structname>GtkLinkButtonClass</structname> structure contains only
+ * The #GtkLinkButtonClass contains only
  * private data.
  */
 struct _GtkLinkButtonClass
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 0d2569bc03..c2f46b4617 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -99,7 +99,7 @@
  * @notebook internal children with the name "notebook".
  *
  * <example>
- * <title>A <structname>GtkPrintUnixDialog</structname> UI definition fragment.</title>
+ * <title>A #GtkPrintUnixDialog UI definition fragment.</title>
  * <programlisting><![CDATA[
  * <object class="GtkPrintUnixDialog" id="dialog1">
  *   <child internal-child="notebook">
diff --git a/gtk/gtkrecentfilter.c b/gtk/gtkrecentfilter.c
index d296334498..08c260a2bb 100644
--- a/gtk/gtkrecentfilter.c
+++ b/gtk/gtkrecentfilter.c
@@ -468,7 +468,7 @@ gtk_recent_filter_get_name (GtkRecentFilter *filter)
  * gtk_recent_filter_get_needed:
  * @filter: a #GtkRecentFilter
  *
- * Gets the fields that need to be filled in for the structure
+ * Gets the fields that need to be filled in for the #GtkRecentFilterInfo
  * passed to gtk_recent_filter_filter()
  * 
  * This function will not typically be used by applications; it
@@ -695,11 +695,11 @@ gtk_recent_filter_add_custom (GtkRecentFilter      *filter,
 /**
  * gtk_recent_filter_filter:
  * @filter: a #GtkRecentFilter
- * @filter_info: a #GtkRecentFilterInfo structure containing information
+ * @filter_info: a #GtkRecentFilterInfo containing information
  *   about a recently used resource
  *
  * Tests whether a file should be displayed according to @filter.
- * The #GtkRecentFilterInfo structure @filter_info should include
+ * The #GtkRecentFilterInfo @filter_info should include
  * the fields returned from gtk_recent_filter_get_needed().
  *
  * This function will not typically be used by applications; it
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 9cfdc7c125..2f564bcd5e 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -73,8 +73,7 @@
  * ]|
  *
  * In order to retrieve the list of recently used files, you can use
- * gtk_recent_manager_get_items(), which returns a list of #GtkRecentInfo
- * structures.
+ * gtk_recent_manager_get_items(), which returns a list of #GtkRecentInfo-struct<!-- -->s.
  *
  * A #GtkRecentManager is the model used to populate the contents of
  * one, or more #GtkRecentChooser implementations.
@@ -130,8 +129,8 @@ typedef struct
 /**
  * GtkRecentInfo:
  *
- * #GtkRecentInfo is an opaque data structure
- * whose members can only be accessed using the provided API.
+ * #GtkRecentInfo-struct contains private data only, and should
+ * be accessed using the provided API.
  *
  * #GtkRecentInfo constains all the meta-data
  * associated with an entry in the recently used files list.
@@ -858,20 +857,20 @@ gtk_recent_manager_add_item (GtkRecentManager  *manager,
  * @recent_data: metadata of the resource
  *
  * Adds a new resource, pointed by @uri, into the recently used
- * resources list, using the metadata specified inside the #GtkRecentData
- * structure passed in @recent_data.
+ * resources list, using the metadata specified inside the #GtkRecentData-struct
+ * passed in @recent_data.
  *
  * The passed URI will be used to identify this resource inside the
  * list.
  *
  * In order to register the new recently used resource, metadata about
  * the resource must be passed as well as the URI; the metadata is
- * stored in a #GtkRecentData structure, which must contain the MIME
+ * stored in a #GtkRecentData-struct, which must contain the MIME
  * type of the resource pointed by the URI; the name of the application
  * that is registering the item, and a command line to be used when
  * launching the item.
  *
- * Optionally, a #GtkRecentData structure might contain a UTF-8 string
+ * Optionally, a #GtkRecentData-struct might contain a UTF-8 string
  * to be used when viewing the item instead of the last component of the
  * URI; a short description of the item; whether the item should be
  * considered private - that is, should be displayed only by the
@@ -1147,10 +1146,10 @@ build_recent_info (GBookmarkFile  *bookmarks,
  * @error: (allow-none): a return location for a #GError, or %NULL
  *
  * Searches for a URI inside the recently used resources list, and
- * returns a structure containing informations about the resource
+ * returns a #GtkRecentInfo-struct containing informations about the resource
  * like its MIME type, or its display name.
  *
- * Return value: a #GtkRecentInfo structure containing information
+ * Return value: a #GtkRecentInfo-struct containing information
  *   about the resource pointed by @uri, or %NULL if the URI was
  *   not registered in the recently used resources list.  Free with
  *   gtk_recent_info_unref().
@@ -2090,10 +2089,10 @@ gtk_recent_info_exists (GtkRecentInfo *info)
  * @info_a: a #GtkRecentInfo
  * @info_b: a #GtkRecentInfo
  *
- * Checks whether two #GtkRecentInfo structures point to the same
+ * Checks whether two #GtkRecentInfo-struct point to the same
  * resource.
  *
- * Return value: %TRUE if both #GtkRecentInfo structures point to se same
+ * Return value: %TRUE if both #GtkRecentInfo-struct point to se same
  *   resource, %FALSE otherwise.
  *
  * Since: 2.10
diff --git a/gtk/gtkrecentmanager.h b/gtk/gtkrecentmanager.h
index 662e8d3bb7..246cd4094c 100644
--- a/gtk/gtkrecentmanager.h
+++ b/gtk/gtkrecentmanager.h
@@ -83,7 +83,7 @@ struct _GtkRecentData
 /**
  * GtkRecentManager:
  *
- * #GtkRecentManager contains only private data
+ * #GtkRecentManager-struct contains only private data
  * and should be accessed using the provided API.
  *
  * Since: 2.10
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 2b3bc117c3..8a27909fe0 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -68,7 +68,7 @@
  *
  * Some of the datatypes defined this section are used in
  * the #GtkClipboard and drag-and-drop API's as well. The
- * #GtkTargetEntry structure and #GtkTargetList objects represent
+ * #GtkTargetEntry and #GtkTargetList objects represent
  * lists of data types that are supported when sending or
  * receiving data. The #GtkSelectionData object is used to
  * store a chunk of data along with the data type and other
@@ -1141,7 +1141,7 @@ gtk_selection_convert (GtkWidget *widget,
 
 /**
  * gtk_selection_data_get_selection:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the selection #GdkAtom of the selection data.
  *
@@ -1159,7 +1159,7 @@ gtk_selection_data_get_selection (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_target:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the target of the selection.
  *
@@ -1177,7 +1177,7 @@ gtk_selection_data_get_target (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_data_type:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the data type of the selection.
  *
@@ -1195,7 +1195,7 @@ gtk_selection_data_get_data_type (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_format:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the format of the selection.
  *
@@ -1213,7 +1213,7 @@ gtk_selection_data_get_format (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_data: (skip)
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the raw data of the selection.
  *
@@ -1231,7 +1231,7 @@ gtk_selection_data_get_data (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_length:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the length of the raw data of the selection.
  *
@@ -1249,7 +1249,7 @@ gtk_selection_data_get_length (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_get_data_with_length: (rename-to gtk_selection_data_get_data)
- * @selection_data: a pointer to a #GtkSelectionData structure
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  * @length: (out): return location for length of the data segment
  *
  * Retrieves the raw data of the selection along with its length.
@@ -1271,7 +1271,7 @@ gtk_selection_data_get_data_with_length (const GtkSelectionData *selection_data,
 
 /**
  * gtk_selection_data_get_display:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  *
  * Retrieves the display of the selection.
  *
@@ -1289,7 +1289,7 @@ gtk_selection_data_get_display (const GtkSelectionData *selection_data)
 
 /**
  * gtk_selection_data_set:
- * @selection_data: a pointer to a #GtkSelectionData structure.
+ * @selection_data: a pointer to a #GtkSelectionData-struct.
  * @type: the type of selection data
  * @format: format (number of bits in a unit)
  * @data: (array length=length): pointer to the data (will be copied)
@@ -3128,9 +3128,9 @@ gtk_selection_default_handler (GtkWidget	*widget,
 
 /**
  * gtk_selection_data_copy:
- * @data: a pointer to a #GtkSelectionData structure.
+ * @data: a pointer to a #GtkSelectionData-struct.
  * 
- * Makes a copy of a #GtkSelectionData structure and its data.
+ * Makes a copy of a #GtkSelectionData-struct and its data.
  * 
  * Return value: a pointer to a copy of @data.
  **/
@@ -3155,9 +3155,9 @@ gtk_selection_data_copy (const GtkSelectionData *data)
 
 /**
  * gtk_selection_data_free:
- * @data: a pointer to a #GtkSelectionData structure.
+ * @data: a pointer to a #GtkSelectionData-struct.
  * 
- * Frees a #GtkSelectionData structure returned from
+ * Frees a #GtkSelectionData-struct returned from
  * gtk_selection_data_copy().
  **/
 void
@@ -3176,9 +3176,9 @@ gtk_selection_data_free (GtkSelectionData *data)
  * @flags: Set of flags, see #GtkTargetFlags
  * @info: an ID that will be passed back to the application
  *
- * Makes a new #GtkTargetEntry structure.
+ * Makes a new #GtkTargetEntry.
  *
- * Return value: a pointer to a new GtkTargetEntry structure.
+ * Return value: a pointer to a new #GtkTargetEntry.
  *     Free with gtk_target_entry_free()
  **/
 GtkTargetEntry *
@@ -3192,9 +3192,9 @@ gtk_target_entry_new (const char *target,
 
 /**
  * gtk_target_entry_copy:
- * @data: a pointer to a #GtkTargetEntry structure.
+ * @data: a pointer to a #GtkTargetEntry
  *
- * Makes a copy of a #GtkTargetEntry structure and its data.
+ * Makes a copy of a #GtkTargetEntry and its data.
  *
  * Return value: a pointer to a copy of @data.
  *     Free with gtk_target_entry_free()
@@ -3216,9 +3216,9 @@ gtk_target_entry_copy (GtkTargetEntry *data)
 
 /**
  * gtk_target_entry_free:
- * @data: a pointer to a #GtkTargetEntry structure.
+ * @data: a pointer to a #GtkTargetEntry.
  *
- * Frees a #GtkTargetEntry structure returned from
+ * Frees a #GtkTargetEntry returned from
  * gtk_target_entry_new() or gtk_target_entry_copy().
  **/
 void
diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index af474f3eaf..6c338d00f7 100644
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -45,7 +45,7 @@ typedef struct _GtkTargetPair GtkTargetPair;
  *     signal. It allows the application to identify the target
  *     type without extensive string compares.
  *
- * A #GtkTargetPair structure is used to represent the same
+ * A #GtkTargetPair is used to represent the same
  * information as a table of #GtkTargetEntry, but in
  * an efficient form.
  */
@@ -59,8 +59,8 @@ struct _GtkTargetPair
 /**
  * GtkTargetList:
  *
- * A #GtkTargetList structure is a reference counted list
- * of #GtkTargetPair. This structure should be treated as
+ * A #GtkTargetList-struct is a reference counted list
+ * of #GtkTargetPair and should be treated as
  * opaque.
  */
 typedef struct _GtkTargetList  GtkTargetList;
@@ -78,7 +78,7 @@ typedef struct _GtkTargetEntry GtkTargetEntry;
  *     signal. It allows the application to identify the target
  *     type without extensive string compares.
  *
- * A #GtkTargetEntry structure represents a single type of
+ * A #GtkTargetEntry represents a single type of
  * data than can be supplied for by a widget for a selection
  * or for supplied or received during drag-and-drop.
  */
diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h
index 9ac4d21c09..3e92cab08c 100644
--- a/gtk/gtkspinbutton.h
+++ b/gtk/gtkspinbutton.h
@@ -103,7 +103,7 @@ typedef struct _GtkSpinButtonClass         GtkSpinButtonClass;
 /**
  * GtkSpinButton:
  *
- * The #GtkSpinButton struct contains only private data and should
+ * The #GtkSpinButton-struct contains only private data and should
  * not be directly modified.
  */
 struct _GtkSpinButton
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
index 9804f4f474..70cfd970bd 100644
--- a/gtk/gtkswitch.h
+++ b/gtk/gtkswitch.h
@@ -48,7 +48,7 @@ typedef struct _GtkSwitchClass          GtkSwitchClass;
 /**
  * GtkSwitch:
  *
- * The <structname>GtkSwitch</structname> structure contains private
+ * The #GtkSwitch-struct contains private
  * data and it should only be accessed using the provided API.
  */
 struct _GtkSwitch
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index d7b2512ea5..aa1b15ced5 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -3607,7 +3607,7 @@ is_cursor_pos_func (const PangoLogAttr *attrs,
  * the equivalent of say the letter "a" with an accent mark will be
  * represented as two characters, first the letter then a "combining
  * mark" that causes the accent to be rendered; so the cursor can't go
- * between those two characters. See also the #PangoLogAttr structure and
+ * between those two characters. See also the #PangoLogAttr-struct and
  * pango_break() function.
  * 
  * Return value: %TRUE if we moved and the new position is dereferenceable
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index b85b4815cb..822b33b666 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -63,21 +63,21 @@
  * Models are accessed on a node/column level of granularity. One can
  * query for the value of a model at a certain node and a certain
  * column on that node. There are two structures used to reference
- * a particular node in a model. They are the #GtkTreePath and the
- * #GtkTreeIter<footnote><para>Here, <abbrev>iter</abbrev> is short
+ * a particular node in a model. They are the #GtkTreePath-struct and the
+ * #GtkTreeIter-struct<footnote><para>Here, <abbrev>iter</abbrev> is short
  * for <quote>iterator</quote></para></footnote>. Most of the interface
- * consists of operations on a #GtkTreeIter.
+ * consists of operations on a #GtkTreeIter-struct.
  *
  * A path is essentially a potential node. It is a location on a model
  * that may or may not actually correspond to a node on a specific
- * model. The #GtkTreePath struct can be converted into either an
+ * model. The #GtkTreePath-struct can be converted into either an
  * array of unsigned integers or a string. The string form is a list
  * of numbers separated by a colon. Each number refers to the offset
  * at that level. Thus, the path <quote>0</quote> refers to the root
  * node and the path <quote>2:4</quote> refers to the fifth child of
  * the third node.
  *
- * By contrast, a #GtkTreeIter is a reference to a specific node on
+ * By contrast, a #GtkTreeIter-struct is a reference to a specific node on
  * a specific model. It is a generic struct with an integer and three
  * generic pointers. These are filled in by the model in a model-specific
  * way. One can convert a path to an iterator by calling
@@ -115,7 +115,7 @@
  * callbacks.
  *
  * <example>
- * <title>Acquiring a <structname>GtkTreeIter</structname></title>
+ * <title>Acquiring a #GtkTreeIter-struct</title>
  * <programlisting>
  *  /&ast; Three ways of getting the iter pointing to the location &ast;/
  * GtkTreePath *path;
@@ -146,7 +146,7 @@
  * how to write such a function, see the #GtkListStore documentation.
  *
  * <example>
- * <title>Reading data from a <structname>GtkTreeModel</structname></title>
+ * <title>Reading data from a #GtkTreeModel</title>
  * <programlisting>
  * enum
  * {
@@ -345,8 +345,8 @@ gtk_tree_model_base_init (gpointer g_class)
       /**
        * GtkTreeModel::row-changed:
        * @tree_model: the #GtkTreeModel on which the signal is emitted
-       * @path: a #GtkTreePath identifying the changed row
-       * @iter: a valid #GtkTreeIter pointing to the changed row
+       * @path: a #GtkTreePath-struct identifying the changed row
+       * @iter: a valid #GtkTreeIter-struct pointing to the changed row
        *
        * This signal is emitted when a row in the model has changed.
        */
@@ -377,8 +377,8 @@ gtk_tree_model_base_init (gpointer g_class)
       /**
        * GtkTreeModel::row-inserted:
        * @tree_model: the #GtkTreeModel on which the signal is emitted
-       * @path: a #GtkTreePath identifying the new row
-       * @iter: a valid #GtkTreeIter pointing to the new row
+       * @path: a #GtkTreePath-struct identifying the new row
+       * @iter: a valid #GtkTreeIter-struct pointing to the new row
        *
        * This signal is emitted when a new row has been inserted in
        * the model.
@@ -402,8 +402,8 @@ gtk_tree_model_base_init (gpointer g_class)
       /**
        * GtkTreeModel::row-has-child-toggled:
        * @tree_model: the #GtkTreeModel on which the signal is emitted
-       * @path: a #GtkTreePath identifying the row
-       * @iter: a valid #GtkTreeIter pointing to the row
+       * @path: a #GtkTreePath-struct identifying the row
+       * @iter: a valid #GtkTreeIter-struct pointing to the row
        *
        * This signal is emitted when a row has gotten the first child
        * row or lost its last child row.
@@ -422,7 +422,7 @@ gtk_tree_model_base_init (gpointer g_class)
       /**
        * GtkTreeModel::row-deleted:
        * @tree_model: the #GtkTreeModel on which the signal is emitted
-       * @path: a #GtkTreePath identifying the row
+       * @path: a #GtkTreePath-struct identifying the row
        *
        * This signal is emitted when a row has been deleted.
        *
@@ -448,9 +448,9 @@ gtk_tree_model_base_init (gpointer g_class)
       /**
        * GtkTreeModel::rows-reordered: (skip)
        * @tree_model: the #GtkTreeModel on which the signal is emitted
-       * @path: a #GtkTreePath identifying the tree node whose children
+       * @path: a #GtkTreePath-struct identifying the tree node whose children
        *     have been reordered
-       * @iter: a valid #GtkTreeIter pointing to the node whose children
+       * @iter: a valid #GtkTreeIter-struct pointing to the node whose children
        *     have been reordered, or %NULL if the depth of @path is 0
        * @new_order: an array of integers mapping the current position
        *     of each child to its old position before the re-ordering,
@@ -577,10 +577,10 @@ rows_reordered_marshal (GClosure          *closure,
 /**
  * gtk_tree_path_new:
  *
- * Creates a new #GtkTreePath.
- * This structure refers to a row.
+ * Creates a new #GtkTreePath-struct.
+ * This refers to a row.
  *
- * Return value: A newly created #GtkTreePath.
+ * Return value: A newly created #GtkTreePath-struct.
  */
 GtkTreePath *
 gtk_tree_path_new (void)
@@ -598,7 +598,7 @@ gtk_tree_path_new (void)
  * gtk_tree_path_new_from_string:
  * @path: The string representation of a path
  *
- * Creates a new #GtkTreePath initialized to @path.
+ * Creates a new #GtkTreePath-struct initialized to @path.
  *
  * @path is expected to be a colon separated list of numbers.
  * For example, the string "10:4:0" would create a path of depth
@@ -606,7 +606,7 @@ gtk_tree_path_new (void)
  * child of that 11th child, and the 1st child of that 5th child.
  * If an invalid path string is passed in, %NULL is returned.
  *
- * Return value: A newly-created #GtkTreePath, or %NULL
+ * Return value: A newly-created #GtkTreePath-struct, or %NULL
  */
 GtkTreePath *
 gtk_tree_path_new_from_string (const gchar *path)
@@ -654,7 +654,7 @@ gtk_tree_path_new_from_string (const gchar *path)
  *
  * Creates a new path with @first_index and @varargs as indices.
  *
- * Return value: A newly created #GtkTreePath
+ * Return value: A newly created #GtkTreePath-struct
  *
  * Since: 2.2
  */
@@ -689,7 +689,7 @@ gtk_tree_path_new_from_indices (gint first_index,
  *
  * Creates a new path with the given @indices array of @length.
  *
- * Return value: A newly created #GtkTreePath
+ * Return value: A newly created #GtkTreePath-struct
  *
  * Since: 3.12
  */
@@ -712,7 +712,7 @@ gtk_tree_path_new_from_indicesv (gint *indices,
 
 /**
  * gtk_tree_path_to_string:
- * @path: A #GtkTreePath
+ * @path: A #GtkTreePath-struct
  *
  * Generates a string representation of the path.
  *
@@ -754,11 +754,11 @@ gtk_tree_path_to_string (GtkTreePath *path)
 /**
  * gtk_tree_path_new_first:
  *
- * Creates a new #GtkTreePath.
+ * Creates a new #GtkTreePath-struct.
  *
  * The string representation of this path is "0".
  *
- * Return value: A new #GtkTreePath
+ * Return value: A new #GtkTreePath-struct
  */
 GtkTreePath *
 gtk_tree_path_new_first (void)
@@ -773,7 +773,7 @@ gtk_tree_path_new_first (void)
 
 /**
  * gtk_tree_path_append_index:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  * @index_: the index
  *
  * Appends a new index to a path.
@@ -803,7 +803,7 @@ gtk_tree_path_append_index (GtkTreePath *path,
 
 /**
  * gtk_tree_path_prepend_index:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  * @index_: the index
  *
  * Prepends a new index to a path.
@@ -832,7 +832,7 @@ gtk_tree_path_prepend_index (GtkTreePath *path,
 
 /**
  * gtk_tree_path_get_depth:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
  * Returns the current depth of @path.
  *
@@ -848,7 +848,7 @@ gtk_tree_path_get_depth (GtkTreePath *path)
 
 /**
  * gtk_tree_path_get_indices: (skip)
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
  * Returns the current indices of @path.
  *
@@ -869,7 +869,7 @@ gtk_tree_path_get_indices (GtkTreePath *path)
 
 /**
  * gtk_tree_path_get_indices_with_depth: (rename-to gtk_tree_path_get_indices)
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  * @depth: (out) (allow-none): return location for number of elements
  *     returned in the integer array, or %NULL
  *
@@ -898,7 +898,7 @@ gtk_tree_path_get_indices_with_depth (GtkTreePath *path,
 
 /**
  * gtk_tree_path_free:
- * @path: (allow-none): a #GtkTreePath
+ * @path: (allow-none): a #GtkTreePath-struct
  *
  * Frees @path. If @path is %NULL, it simply returns.
  */
@@ -914,11 +914,11 @@ gtk_tree_path_free (GtkTreePath *path)
 
 /**
  * gtk_tree_path_copy:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
- * Creates a new #GtkTreePath as a copy of @path.
+ * Creates a new #GtkTreePath-struct as a copy of @path.
  *
- * Return value: a new #GtkTreePath
+ * Return value: a new #GtkTreePath-struct
  */
 GtkTreePath *
 gtk_tree_path_copy (const GtkTreePath *path)
@@ -941,8 +941,8 @@ G_DEFINE_BOXED_TYPE (GtkTreePath, gtk_tree_path,
 
 /**
  * gtk_tree_path_compare:
- * @a: a #GtkTreePath
- * @b: a #GtkTreePath to compare with
+ * @a: a #GtkTreePath-struct
+ * @b: a #GtkTreePath-struct to compare with
  *
  * Compares two paths.
  *
@@ -977,8 +977,8 @@ gtk_tree_path_compare (const GtkTreePath *a,
 
 /**
  * gtk_tree_path_is_ancestor:
- * @path: a #GtkTreePath
- * @descendant: another #GtkTreePath
+ * @path: a #GtkTreePath-struct
+ * @descendant: another #GtkTreePath-struct
  *
  * Returns %TRUE if @descendant is a descendant of @path.
  *
@@ -1010,8 +1010,8 @@ gtk_tree_path_is_ancestor (GtkTreePath *path,
 
 /**
  * gtk_tree_path_is_descendant:
- * @path: a #GtkTreePath
- * @ancestor: another #GtkTreePath
+ * @path: a #GtkTreePath-struct
+ * @ancestor: another #GtkTreePath-struct
  *
  * Returns %TRUE if @path is a descendant of @ancestor.
  *
@@ -1044,7 +1044,7 @@ gtk_tree_path_is_descendant (GtkTreePath *path,
 
 /**
  * gtk_tree_path_next:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
  * Moves the @path to point to the next node at the current depth.
  */
@@ -1059,7 +1059,7 @@ gtk_tree_path_next (GtkTreePath *path)
 
 /**
  * gtk_tree_path_prev:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
  * Moves the @path to point to the previous node at the
  * current depth, if it exists.
@@ -1085,7 +1085,7 @@ gtk_tree_path_prev (GtkTreePath *path)
 
 /**
  * gtk_tree_path_up:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
  * Moves the @path to point to its parent node, if it has a parent.
  *
@@ -1106,7 +1106,7 @@ gtk_tree_path_up (GtkTreePath *path)
 
 /**
  * gtk_tree_path_down:
- * @path: a #GtkTreePath
+ * @path: a #GtkTreePath-struct
  *
  * Moves @path to point to the first child of the current path.
  */
@@ -1120,7 +1120,7 @@ gtk_tree_path_down (GtkTreePath *path)
 
 /**
  * gtk_tree_iter_copy:
- * @iter: a #GtkTreeIter
+ * @iter: a #GtkTreeIter-struct
  *
  * Creates a dynamically allocated tree iterator as a copy of @iter.
  *
@@ -1237,8 +1237,8 @@ gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_get_iter:
  * @tree_model: a #GtkTreeModel
- * @iter: (out): the uninitialized #GtkTreeIter
- * @path: the #GtkTreePath
+ * @iter: (out): the uninitialized #GtkTreeIter-struct
+ * @path: the #GtkTreePath-struct
  *
  * Sets @iter to a valid iterator pointing to @path.  If @path does
  * not exist, @iter is set to an invalid iterator and %FALSE is returned.
@@ -1268,8 +1268,8 @@ gtk_tree_model_get_iter (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_get_iter_from_string:
  * @tree_model: a #GtkTreeModel
- * @iter: (out): an uninitialized #GtkTreeIter
- * @path_string: a string representation of a #GtkTreePath
+ * @iter: (out): an uninitialized #GtkTreeIter-struct
+ * @path_string: a string representation of a #GtkTreePath-struct
  *
  * Sets @iter to a valid iterator pointing to @path_string, if it
  * exists. Otherwise, @iter is left invalid and %FALSE is returned.
@@ -1301,7 +1301,7 @@ gtk_tree_model_get_iter_from_string (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_get_string_from_iter:
  * @tree_model: a #GtkTreeModel
- * @iter: a #GtkTreeIter
+ * @iter: a #GtkTreeIter-struct
  *
  * Generates a string representation of the iter.
  *
@@ -1337,7 +1337,7 @@ gtk_tree_model_get_string_from_iter (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_get_iter_first:
  * @tree_model: a #GtkTreeModel
- * @iter: (out): the uninitialized #GtkTreeIter
+ * @iter: (out): the uninitialized #GtkTreeIter-struct
  *
  * Initializes @iter with the first iterator in the tree
  * (the one at the path "0") and returns %TRUE. Returns
@@ -1365,13 +1365,13 @@ gtk_tree_model_get_iter_first (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_get_path:
  * @tree_model: a #GtkTreeModel
- * @iter: the #GtkTreeIter
+ * @iter: the #GtkTreeIter-struct
  *
- * Returns a newly-created #GtkTreePath referenced by @iter.
+ * Returns a newly-created #GtkTreePath-struct referenced by @iter.
  *
  * This path should be freed with gtk_tree_path_free().
  *
- * Return value: a newly-created #GtkTreePath
+ * Return value: a newly-created #GtkTreePath-struct
  */
 GtkTreePath *
 gtk_tree_model_get_path (GtkTreeModel *tree_model,
@@ -1391,7 +1391,7 @@ gtk_tree_model_get_path (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_get_value:
  * @tree_model: a #GtkTreeModel
- * @iter: the #GtkTreeIter
+ * @iter: the #GtkTreeIter-struct
  * @column: the column to lookup the value at
  * @value: (out) (transfer none): an empty #GValue to set
  *
@@ -1421,7 +1421,7 @@ gtk_tree_model_get_value (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_next:
  * @tree_model: a #GtkTreeModel
- * @iter: (in): the #GtkTreeIter
+ * @iter: (in): the #GtkTreeIter-struct
  *
  * Sets @iter to point to the node following it at the current level.
  *
@@ -1469,7 +1469,7 @@ gtk_tree_model_iter_previous_default (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_previous:
  * @tree_model: a #GtkTreeModel
- * @iter: (in): the #GtkTreeIter
+ * @iter: (in): the #GtkTreeIter-struct
  *
  * Sets @iter to point to the previous node at the current level.
  *
@@ -1503,8 +1503,8 @@ gtk_tree_model_iter_previous (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_children:
  * @tree_model: a #GtkTreeModel
- * @iter: (out): the new #GtkTreeIter to be set to the child
- * @parent: (allow-none): the #GtkTreeIter, or %NULL
+ * @iter: (out): the new #GtkTreeIter-struct to be set to the child
+ * @parent: (allow-none): the #GtkTreeIter-struct, or %NULL
  *
  * Sets @iter to point to the first child of @parent.
  *
@@ -1538,7 +1538,7 @@ gtk_tree_model_iter_children (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_has_child:
  * @tree_model: a #GtkTreeModel
- * @iter: the #GtkTreeIter to test for children
+ * @iter: the #GtkTreeIter-struct to test for children
  *
  * Returns %TRUE if @iter has children, %FALSE otherwise.
  *
@@ -1562,7 +1562,7 @@ gtk_tree_model_iter_has_child (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_n_children:
  * @tree_model: a #GtkTreeModel
- * @iter: (allow-none): the #GtkTreeIter, or %NULL
+ * @iter: (allow-none): the #GtkTreeIter-struct, or %NULL
  *
  * Returns the number of children that @iter has.
  *
@@ -1588,8 +1588,8 @@ gtk_tree_model_iter_n_children (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_nth_child:
  * @tree_model: a #GtkTreeModel
- * @iter: (out): the #GtkTreeIter to set to the nth child
- * @parent: (allow-none): the #GtkTreeIter to get the child from, or %NULL.
+ * @iter: (out): the #GtkTreeIter-struct to set to the nth child
+ * @parent: (allow-none): the #GtkTreeIter-struct to get the child from, or %NULL.
  * @n: the index of the desired child
  *
  * Sets @iter to be the child of @parent, using the given index.
@@ -1625,8 +1625,8 @@ gtk_tree_model_iter_nth_child (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_iter_parent:
  * @tree_model: a #GtkTreeModel
- * @iter: (out): the new #GtkTreeIter to set to the parent
- * @child: the #GtkTreeIter
+ * @iter: (out): the new #GtkTreeIter-struct to set to the parent
+ * @child: the #GtkTreeIter-struct
  *
  * Sets @iter to be the parent of @child.
  *
@@ -1659,7 +1659,7 @@ gtk_tree_model_iter_parent (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_ref_node:
  * @tree_model: a #GtkTreeModel
- * @iter: the #GtkTreeIter
+ * @iter: the #GtkTreeIter-struct
  *
  * Lets the tree ref the node.
  *
@@ -1695,7 +1695,7 @@ gtk_tree_model_ref_node (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_unref_node:
  * @tree_model: a #GtkTreeModel
- * @iter: the #GtkTreeIter
+ * @iter: the #GtkTreeIter-struct
  *
  * Lets the tree unref the node.
  *
@@ -1810,8 +1810,8 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_row_changed:
  * @tree_model: a #GtkTreeModel
- * @path: a #GtkTreePath pointing to the changed row
- * @iter: a valid #GtkTreeIter pointing to the changed row
+ * @path: a #GtkTreePath-struct pointing to the changed row
+ * @iter: a valid #GtkTreeIter-struct pointing to the changed row
  *
  * Emits the #GtkTreeModel::row-changed signal on @tree_model.
  */
@@ -1830,8 +1830,8 @@ gtk_tree_model_row_changed (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_row_inserted:
  * @tree_model: a #GtkTreeModel
- * @path: a #GtkTreePath pointing to the inserted row
- * @iter: a valid #GtkTreeIter pointing to the inserted row
+ * @path: a #GtkTreePath-struct pointing to the inserted row
+ * @iter: a valid #GtkTreeIter-struct pointing to the inserted row
  *
  * Emits the #GtkTreeModel::row-inserted signal on @tree_model.
  */
@@ -1850,8 +1850,8 @@ gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_row_has_child_toggled:
  * @tree_model: a #GtkTreeModel
- * @path: a #GtkTreePath pointing to the changed row
- * @iter: a valid #GtkTreeIter pointing to the changed row
+ * @path: a #GtkTreePath-struct pointing to the changed row
+ * @iter: a valid #GtkTreeIter-struct pointing to the changed row
  *
  * Emits the #GtkTreeModel::row-has-child-toggled signal on
  * @tree_model. This should be called by models after the child
@@ -1872,7 +1872,7 @@ gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_row_deleted:
  * @tree_model: a #GtkTreeModel
- * @path: a #GtkTreePath pointing to the previous location of
+ * @path: a #GtkTreePath-struct pointing to the previous location of
  *     the deleted row
  *
  * Emits the #GtkTreeModel::row-deleted signal on @tree_model.
@@ -1897,9 +1897,9 @@ gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_rows_reordered: (skip)
  * @tree_model: a #GtkTreeModel
- * @path: a #GtkTreePath pointing to the tree node whose children
+ * @path: a #GtkTreePath-struct pointing to the tree node whose children
  *     have been reordered
- * @iter: a valid #GtkTreeIter pointing to the node whose children
+ * @iter: a valid #GtkTreeIter-struct pointing to the node whose children
  *     have been reordered, or %NULL if the depth of @path is 0
  * @new_order: an array of integers mapping the current position of
  *     each child to its old position before the re-ordering,
@@ -1925,9 +1925,9 @@ gtk_tree_model_rows_reordered (GtkTreeModel *tree_model,
 /**
  * gtk_tree_model_rows_reordered_with_length: (rename-to gtk_tree_model_rows_reordered)
  * @tree_model: a #GtkTreeModel
- * @path: a #GtkTreePath pointing to the tree node whose children
+ * @path: a #GtkTreePath-struct pointing to the tree node whose children
  *     have been reordered
- * @iter: (allow-none): a valid #GtkTreeIter pointing to the node
+ * @iter: (allow-none): a valid #GtkTreeIter-struct pointing to the node
  *     whose children have been reordered, or %NULL if the depth
  *     of @path is 0
  * @new_order: (array length=length): an array of integers
@@ -2263,7 +2263,7 @@ gtk_tree_row_reference_unref_path (GtkTreePath  *path,
 /**
  * gtk_tree_row_reference_new:
  * @model: a #GtkTreeModel
- * @path: a valid #GtkTreePath to monitor
+ * @path: a valid #GtkTreePath-struct to monitor
  *
  * Creates a row reference based on @path.
  *
@@ -2292,7 +2292,7 @@ gtk_tree_row_reference_new (GtkTreeModel *model,
  * gtk_tree_row_reference_new_proxy:
  * @proxy: a proxy #GObject
  * @model: a #GtkTreeModel
- * @path: a valid #GtkTreePath to monitor
+ * @path: a valid #GtkTreePath-struct to monitor
  *
  * You do not need to use this function.
  *
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index 72068c31e4..6cb64e1759 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -84,7 +84,7 @@ typedef enum
  * @user_data2: model-specific data
  * @user_data3: model-specific data
  *
- * The <structname>GtkTreeIter</structname> is the primary structure
+ * The #GtkTreeIter is the primary structure
  * for accessing a #GtkTreeModel. Models are expected to put a unique
  * integer in the <structfield>stamp</structfield> member, and put
  * model-specific data in the three <structfield>user_data</structfield>
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 7e5dc57fca..54b369697f 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -51,7 +51,7 @@
  * sort the second.
  *
  * <example>
- * <title>Using a <structname>GtkTreeModelSort</structname></title>
+ * <title>Using a #GtkTreeModelSort</title>
  * <programlisting>
  * {
  *   GtkTreeView *tree_view1;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 0b2aac3dd7..68b7d28fd5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -248,7 +248,7 @@
  * <refsect2 id="style-properties">
  * <title>Style Properties</title>
  * <para>
- * <structname>GtkWidget</structname> introduces <firstterm>style
+ * #GtkWidget introduces <firstterm>style
  * properties</firstterm> - these are basically object properties that are stored
  * not on the object, but in the style object associated to the widget. Style
  * properties are set in <link linkend="gtk3-Resource-Files">resource files</link>.
@@ -280,10 +280,10 @@
  * ]]></programlisting>
  * </example>
  * <para>
- * In addition to accelerators, <structname>GtkWidget</structname> also support a
+ * In addition to accelerators, #GtkWidget also support a
  * custom &lt;accessible&gt; element, which supports actions and relations.
  * Properties on the accessible implementation of an object can be set by accessing the
- * internal child "accessible" of a <structname>GtkWidget</structname>.
+ * internal child "accessible" of a #GtkWidget.
  * </para>
  * <example>
  * <title>A UI definition fragment specifying an accessible</title>
@@ -12214,11 +12214,11 @@ static const GtkWidgetAuxInfo default_aux_info = {
 /*
  * gtk_widget_get_aux_info:
  * @widget: a #GtkWidget
- * @create: if %TRUE, create the structure if it doesn't exist
+ * @create: if %TRUE, create the #GtkWidgetAuxInfo-struct if it doesn't exist
  *
- * Get the #GtkWidgetAuxInfo structure for the widget.
+ * Get the #GtkWidgetAuxInfo-struct for the widget.
  *
- * Return value: the #GtkAuxInfo structure for the widget, or
+ * Return value: the #GtkWidgetAuxInfo-struct for the widget, or
  *    %NULL if @create is %FALSE and one doesn't already exist.
  */
 static GtkWidgetAuxInfo *
@@ -12621,7 +12621,7 @@ gtk_widget_style_get (GtkWidget   *widget,
 /**
  * gtk_requisition_new:
  *
- * Allocates a new #GtkRequisition structure and initializes its elements to zero.
+ * Allocates a new #GtkRequisition-struct and initializes its elements to zero.
  *
  * Returns: a new empty #GtkRequisition. The newly allocated #GtkRequisition should
  *   be freed with gtk_requisition_free().
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 1f6318f6e9..b03e098a75 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -75,7 +75,7 @@ typedef struct _GtkWidgetAuxInfo       GtkWidgetAuxInfo;
  * @width: the width of the widget's allocated area.
  * @height: the height of the widget's allocated area.
  *
- * A <structname>GtkAllocation</structname> of a widget represents region
+ * A #GtkAllocation-struct of a widget represents region
  * which has been allocated to the widget by its parent. It is a subregion
  * of its parents allocation. See <xref linkend="geometry-management"/> for
  * more information.
@@ -115,7 +115,7 @@ typedef gboolean (*GtkTickCallback) (GtkWidget     *widget,
  * @width: the widget's desired width
  * @height: the widget's desired height
  *
- * A <structname>GtkRequisition</structname> represents the desired size of a widget. See
+ * A #GtkRequisition-struct represents the desired size of a widget. See
  * <xref linkend="geometry-management"/> for more information.
  */
 struct _GtkRequisition