docs: don't use <emphasis>

It is a little heavy handed. The text can speak for itself.

38 files changed, 82 insertions, 82 deletions

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 86adb85d7f..a1fee6c476 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -486,7 +486,7 @@ gdk_init (int *argc, char ***argv)
  * like #GtkWidget::button-press-event, do not need thread protection.
  *
  * In particular, this means, if you are writing widgets that might
- * be used in threaded programs, you <emphasis>must</emphasis> surround
+ * be used in threaded programs, you must surround
  * timeouts and idle functions in this matter.
  *
  * As always, you must also surround any calls to GTK+ not made within
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index d5d1da37bb..6e9bd20487 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -55,9 +55,9 @@
  * </itemizedlist>
  *
  * GdkDisplay objects are the GDK representation of an X Display,
- * which can be described as <emphasis>a workstation consisting of
+ * which can be described as a workstation consisting of
  * a keyboard, a pointing device (such as a mouse) and one or more
- * screens</emphasis>.
+ * screens.
  * It is used to open and keep track of various GdkScreen objects
  * currently instantiated by the application. It is also used to
  * access the keyboard(s) and mouse pointer(s) of the display.
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 733c8990d2..0398b32291 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -2149,7 +2149,7 @@ gdk_synthesize_window_state (GdkWindow     *window,
  * 
  * Sets the double click time (two clicks within this time interval
  * count as a double click and result in a #GDK_2BUTTON_PRESS event).
- * Applications should <emphasis>not</emphasis> set this, it is a global 
+ * Applications should not set this, it is a global 
  * user-configured setting.
  *
  * Since: 2.2
@@ -2168,7 +2168,7 @@ gdk_display_set_double_click_time (GdkDisplay *display,
  * Set the double click time for the default display. See
  * gdk_display_set_double_click_time(). 
  * See also gdk_display_set_double_click_distance().
- * Applications should <emphasis>not</emphasis> set this, it is a 
+ * Applications should not set this, it is a 
  * global user-configured setting.
  **/
 void
@@ -2185,7 +2185,7 @@ gdk_set_double_click_time (guint msec)
  * Sets the double click distance (two clicks within this distance
  * count as a double click and result in a #GDK_2BUTTON_PRESS event).
  * See also gdk_display_set_double_click_time().
- * Applications should <emphasis>not</emphasis> set this, it is a global 
+ * Applications should not set this, it is a global 
  * user-configured setting.
  *
  * Since: 2.4
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 8b1fc0844b..f29303f3ac 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -529,7 +529,7 @@ gdk_keymap_lookup_key (GdkKeymap          *keymap,
  * used in the keymap, since, for instance, <literal>&lt;Control&gt;</literal>
  * would be masked out even if only <literal>&lt;Control&gt;&lt;Alt&gt;</literal>
  * was used in the keymap. To support this usage as well as well as
- * possible, all <emphasis>single modifier</emphasis> combinations
+ * possible, all single modifier combinations
  * that could affect the key for any combination of modifiers will
  * be returned in @consumed_modifiers; multi-modifier combinations
  * are returned only when actually found in @state. When you store
diff --git a/gdk/gdkproperty.c b/gdk/gdkproperty.c
index c642864b17..b0a4741025 100644
--- a/gdk/gdkproperty.c
+++ b/gdk/gdkproperty.c
@@ -44,7 +44,7 @@
  * if they are of different endianesses it will be byteswapped
  * as necessary according to the format of the property.
  * Note that on the client side, properties of format 32
- * will be stored with one unit per <emphasis>long</emphasis>,
+ * will be stored with one unit per long,
  * even if a long integer has more than 32 bits on the platform.
  * (This decision was apparently made for Xlib to maintain
  * compatibility with programs that assumed longs were 32
@@ -208,7 +208,7 @@ gdk_atom_intern (const gchar *atom_name,
  * Note that this function is identical to gdk_atom_intern() except
  * that if a new #GdkAtom is created the string itself is used rather
  * than a copy. This saves memory, but can only be used if the string
- * will <emphasis>always</emphasis> exist. It can be used with statically
+ * will always exist. It can be used with statically
  * allocated strings in the main program, but not with statically
  * allocated memory in dynamically loaded modules, if you expect to
  * ever unload the module again (e.g. do not use this function in
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 37b8691cc6..897f09787e 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -6021,7 +6021,7 @@ gdk_window_set_device_cursor (GdkWindow *window,
  * position from the most recent configure event.
  *
  * <note>
- * If @window is not a toplevel, it is <emphasis>much</emphasis> better
+ * If @window is not a toplevel, it is much better
  * to call gdk_window_get_position(), gdk_window_get_width() and
  * gdk_window_get_height() instead, because it avoids the roundtrip to
  * the X server and because these functions support the full 32-bit
@@ -9455,7 +9455,7 @@ gdk_window_set_modal_hint (GdkWindow *window,
  * Toggles whether a window should appear in a task list or window
  * list. If a window's semantic type as specified with
  * gdk_window_set_type_hint() already fully describes the window, this
- * function should <emphasis>not</emphasis> be called in addition,
+ * function should not be called in addition,
  * instead you should allow the window to be treated according to
  * standard policy for its semantic type.
  *
@@ -9478,7 +9478,7 @@ gdk_window_set_skip_taskbar_hint (GdkWindow *window,
  * thumbnail representation of the windows on the desktop). If a
  * window's semantic type as specified with gdk_window_set_type_hint()
  * already fully describes the window, this function should
- * <emphasis>not</emphasis> be called in addition, instead you should
+ * not be called in addition, instead you should
  * allow the window to be treated according to standard policy for
  * its semantic type.
  *
diff --git a/gtk/deprecated/gtkiconfactory.c b/gtk/deprecated/gtkiconfactory.c
index 6aacfa9c7c..8d4da50bce 100644
--- a/gtk/deprecated/gtkiconfactory.c
+++ b/gtk/deprecated/gtkiconfactory.c
@@ -2405,7 +2405,7 @@ gtk_icon_source_set_size (GtkIconSource *source,
  * @source: a #GtkIconSource
  *
  * Obtains the text direction this icon source applies to. The return
- * value is only useful/meaningful if the text direction is <emphasis>not</emphasis>
+ * value is only useful/meaningful if the text direction is not
  * wildcarded.
  *
  * Return value: text direction this source matches
@@ -2425,7 +2425,7 @@ gtk_icon_source_get_direction (const GtkIconSource *source)
  * @source: a #GtkIconSource
  *
  * Obtains the widget state this icon source applies to. The return
- * value is only useful/meaningful if the widget state is <emphasis>not</emphasis>
+ * value is only useful/meaningful if the widget state is not
  * wildcarded.
  *
  * Return value: widget state this source matches
@@ -2445,7 +2445,7 @@ gtk_icon_source_get_state (const GtkIconSource *source)
  * @source: a #GtkIconSource
  *
  * Obtains the icon size this source applies to. The return value
- * is only useful/meaningful if the icon size is <emphasis>not</emphasis> wildcarded.
+ * is only useful/meaningful if the icon size is not wildcarded.
  *
  * Return value: (type int): icon size this source matches.
  *
diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c
index e6edf8c3ba..cecb64a6ce 100644
--- a/gtk/deprecated/gtktable.c
+++ b/gtk/deprecated/gtktable.c
@@ -51,11 +51,11 @@
  *
  * To alter the space next to a specific row, use gtk_table_set_row_spacing(),
  * and for a column, gtk_table_set_col_spacing().
- * The gaps between <emphasis>all</emphasis> rows or columns can be changed by
+ * The gaps between all rows or columns can be changed by
  * calling gtk_table_set_row_spacings() or gtk_table_set_col_spacings()
- * respectively. Note that spacing is added <emphasis>between</emphasis> the
- * children, while padding added by gtk_table_attach() is added <emphasis>on
- * either side</emphasis> of the widget it belongs to.
+ * respectively. Note that spacing is added between the
+ * children, while padding added by gtk_table_attach() is added on
+ * either side of the widget it belongs to.
  *
  * gtk_table_set_homogeneous(), can be used to set whether all cells in the
  * table will resize themselves to the size of the largest widget in the table.
@@ -628,7 +628,7 @@ gtk_table_new (guint	rows,
  * @rows: The new number of rows.
  * @columns: The new number of columns.
  *
- * If you need to change a table's size <emphasis>after</emphasis>
+ * If you need to change a table's size after
  * it has been created, this function allows you to do so.
  *
  * Deprecated: 3.4: #GtkGrid resizes automatically.
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 943e93b897..ebdf49ea16 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -35,10 +35,10 @@
  * Thus, all children of a GtkBox are allocated one dimension in common,
  * which is the height of a row, or the width of a column.
  *
- * GtkBox uses a notion of <emphasis>packing</emphasis>. Packing refers
+ * GtkBox uses a notion of packing. Packing refers
  * to adding widgets with reference to a particular position in a
  * #GtkContainer. For a GtkBox, there are two reference positions: the
- * <emphasis>start</emphasis> and the <emphasis>end</emphasis> of the box.
+ * start and the end of the box.
  * For a vertical #GtkBox, the start is defined as the top of the box and
  * the end is defined as the bottom. For a horizontal #GtkBox the start
  * is defined as the left side and the end is defined as the right side.
@@ -58,9 +58,9 @@
  *
  * Use gtk_box_set_spacing() to determine how much space will be
  * minimally placed between all children in the GtkBox. Note that
- * spacing is added <emphasis>between</emphasis> the children, while
+ * spacing is added between the children, while
  * padding added by gtk_box_pack_start() or gtk_box_pack_end() is added
- * <emphasis>on either side</emphasis> of the widget it belongs to.
+ * on either side of the widget it belongs to.
  *
  * Use gtk_box_reorder_child() to move a GtkBox child to a different
  * place in the box.
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
index 0e2f9e12d4..1365e65a63 100644
--- a/gtk/gtkcellarea.c
+++ b/gtk/gtkcellarea.c
@@ -329,7 +329,7 @@
  * <refsect2 id="cell-properties">
  * <title>Cell Properties</title>
  * <para>
- * The #GtkCellArea introduces <emphasis>cell properties</emphasis>
+ * The #GtkCellArea introduces cell properties
  * for #GtkCellRenderers in very much the same way that #GtkContainer
  * introduces <link linkend="child-properties">child properties</link>
  * for #GtkWidgets. This provides some general interfaces for defining
diff --git a/gtk/gtkcellareabox.c b/gtk/gtkcellareabox.c
index 10aae6af4f..ec1f89d0b7 100644
--- a/gtk/gtkcellareabox.c
+++ b/gtk/gtkcellareabox.c
@@ -29,10 +29,10 @@
  * The #GtkCellAreaBox renders cell renderers into a row or a column
  * depending on its #GtkOrientation.
  *
- * GtkCellAreaBox uses a notion of <emphasis>packing</emphasis>. Packing
+ * GtkCellAreaBox uses a notion of packing. Packing
  * refers to adding cell renderers with reference to a particular position
  * in a #GtkCellAreaBox. There are two reference positions: the
- * <emphasis>start</emphasis> and the <emphasis>end</emphasis> of the box.
+ * start and the end of the box.
  * When the #GtkCellAreaBox is oriented in the %GTK_ORIENTATION_VERTICAL
  * orientation, the start is defined as the top of the box and the end is
  * defined as the bottom. In the %GTK_ORIENTATION_HORIZONTAL orientation
diff --git a/gtk/gtkcelllayout.c b/gtk/gtkcelllayout.c
index a6d33aa8f7..41d9e2eb41 100644
--- a/gtk/gtkcelllayout.c
+++ b/gtk/gtkcelllayout.c
@@ -25,7 +25,7 @@
  * attributes and data funcs.
  *
  * One of the notable features provided by implementations of GtkCellLayout
- * are <emphasis>attributes</emphasis>. Attributes let you set the properties
+ * are attributes. Attributes let you set the properties
  * in flexible ways. They can just be set to constant values like regular
  * properties. But they can also be mapped to a column of the underlying
  * tree model with gtk_cell_layout_set_attributes(), which means that the value
@@ -94,7 +94,7 @@
  * combo = g_object_new (GTK_TYPE_COMBO_BOX, "cell-area", my_cell_area, NULL);
  * </programlisting></informalexample>
  * to use a custom cell area with a combo box. But construct properties
- * are only initialized <emphasis>after</emphasis> instance init()
+ * are only initialized after instance init()
  * functions have run, which means that using functions which rely on
  * the existence of the cell area in your subclass' init() function will
  * cause the default cell area to be instantiated. In this case, a provided
diff --git a/gtk/gtkcellrenderercombo.c b/gtk/gtkcellrenderercombo.c
index cc1c44608d..e0bc5a6638 100644
--- a/gtk/gtkcellrenderercombo.c
+++ b/gtk/gtkcellrenderercombo.c
@@ -137,7 +137,7 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
    * combo box. 
    *
    * Note that this refers to the model specified in the model property, 
-   * <emphasis>not</emphasis> the model backing the tree view to which 
+   * not the model backing the tree view to which 
    * this cell renderer is attached.
    * 
    * #GtkCellRendererCombo automatically adds a text cell renderer for 
diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c
index 027b384c53..3738908231 100644
--- a/gtk/gtkcolorbutton.c
+++ b/gtk/gtkcolorbutton.c
@@ -245,7 +245,7 @@ gtk_color_button_class_init (GtkColorButtonClass *klass)
    * When handling this signal, use gtk_color_button_get_rgba() to
    * find out which color was just selected.
    *
-   * Note that this signal is only emitted when the <emphasis>user</emphasis>
+   * Note that this signal is only emitted when the user
    * changes the color. If you need to react to programmatic color changes
    * as well, use the notify::color signal.
    *
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 7f7e41e076..ae759e9ed1 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -67,13 +67,13 @@
  * of the abstract GtkContainer base class.
  *
  * The first type of container widget has a single child widget and derives
- * from #GtkBin. These containers are <emphasis>decorators</emphasis>, which
+ * from #GtkBin. These containers are decorators, which
  * add some kind of functionality to the child. For example, a #GtkButton makes
  * its child into a clickable button; a #GtkFrame draws a frame around its child
  * and a #GtkWindow places its child widget inside a top-level window.
  *
  * The second type of container can have more than one child; its purpose is to
- * manage <emphasis>layout</emphasis>. This means that these containers assign
+ * manage layout. This means that these containers assign
  * sizes and positions to their children. For example, a #GtkHBox arranges its
  * children in a horizontal row, and a #GtkGrid arranges the widgets it contains
  * in a two-dimensional grid.
@@ -185,7 +185,7 @@
  * <refsect2 id="child-properties">
  * <title>Child properties</title>
  * <para>
- * GtkContainer introduces <emphasis>child properties</emphasis>.
+ * GtkContainer introduces child properties.
  * These are object properties that are not specific
  * to either the container or the contained widget, but rather to their relation.
  * Typical examples of child properties are the position or pack-type of a widget
@@ -1458,7 +1458,7 @@ gtk_container_get_property (GObject         *object,
 /**
  * gtk_container_set_border_width:
  * @container: a #GtkContainer
- * @border_width: amount of blank space to leave <emphasis>outside</emphasis>
+ * @border_width: amount of blank space to leave outside
  *   the container. Valid values are in the range 0-65535 pixels.
  *
  * Sets the border width of the container.
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 5bc5b3a77c..76cd521a61 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1244,7 +1244,7 @@ run_destroy_handler (GtkDialog *dialog, gpointer data)
  * Note that even though the recursive main loop gives the effect of a
  * modal dialog (it prevents the user from interacting with other
  * windows in the same window group while the dialog is run), callbacks
- * such as timeouts, IO channel watches, DND drops, etc, <emphasis>will</emphasis>
+ * such as timeouts, IO channel watches, DND drops, etc, will
  * be triggered during a gtk_dialog_run() call.
  *
  * Return value: response ID
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 13d08e885e..76cc7288d8 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -7857,7 +7857,7 @@ gtk_entry_get_activates_default (GtkEntry *entry)
  *
  * Changes the size request of the entry to be about the right size
  * for @n_chars characters. Note that it changes the size
- * <emphasis>request</emphasis>, the size can still be affected by
+ * request, the size can still be affected by
  * how you pack the widget into containers. If @n_chars is -1, the
  * size reverts to the default entry size.
  **/
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index 1b05cd097c..98057225c9 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -75,7 +75,7 @@
  * #GtkFileChooser, your program can get the selected names
  * either as filenames or as URIs.  For URIs, the normal escaping
  * rules are applied if the URI contains non-ASCII characters.
- * However, filenames are <emphasis>always</emphasis> returned in
+ * However, filenames are always returned in
  * the character set specified by the
  * <envar>G_FILENAME_ENCODING</envar> environment variable.
  * Please see the GLib documentation for more details about this
@@ -944,7 +944,7 @@ gtk_file_chooser_set_current_folder (GtkFileChooser *chooser,
  * See gtk_file_chooser_set_current_folder().
  *
  * Note that this is the folder that the file chooser is currently displaying
- * (e.g. "/home/username/Documents"), which is <emphasis>not the same</emphasis>
+ * (e.g. "/home/username/Documents"), which is not the same
  * as the currently-selected folder if the chooser is in
  * %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode
  * (e.g. "/home/username/Documents/selected-folder/".  To get the
@@ -1290,7 +1290,7 @@ gtk_file_chooser_set_current_folder_uri (GtkFileChooser *chooser,
  * See gtk_file_chooser_set_current_folder_uri().
  *
  * Note that this is the folder that the file chooser is currently displaying
- * (e.g. "file:///home/username/Documents"), which is <emphasis>not the same</emphasis>
+ * (e.g. "file:///home/username/Documents"), which is not the same
  * as the currently-selected folder if the chooser is in
  * %GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode
  * (e.g. "file:///home/username/Documents/selected-folder/".  To get the
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index be60dcaa6e..d33d34787b 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -392,7 +392,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
    *
    * The ::file-set signal is emitted when the user selects a file.
    *
-   * Note that this signal is only emitted when the <emphasis>user</emphasis>
+   * Note that this signal is only emitted when the user
    * changes the file.
    *
    * Since: 2.12
diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index 019c5dfa8d..c7d2410dec 100644
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -141,7 +141,7 @@
  * should only cause the file chooser to show a specific folder
  * when it is appropriate to use gtk_file_chooser_set_filename(),
  * i.e. when you are doing a <guimenuitem>File/Save
- * As</guimenuitem> command <emphasis>and</emphasis> you already
+ * As</guimenuitem> command and you already
  * have a file saved somewhere.
  * </para>
  * </note>
@@ -169,7 +169,7 @@
  * boxes you can use your own custom response codes rather than the
  * ones in #GtkResponseType, but #GtkFileChooserDialog assumes that
  * its "accept"-type action, e.g. an "Open" or "Save" button,
- * <emphasis>will</emphasis> have one of the following response
+ * will have one of the following response
  * codes:
  * <para>
  * <simplelist id="gtkfilechooserdialog-responses">
diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 0aaa4d3f26..3fade1f098 100644
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -528,7 +528,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
    * When handling this signal, use gtk_font_button_get_font_name() 
    * to find out which font was just selected.
    *
-   * Note that this signal is only emitted when the <emphasis>user</emphasis>
+   * Note that this signal is only emitted when the user
    * changes the font. If you need to react to programmatic font changes
    * as well, use the notify::font-name signal.
    *
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 223b1397d6..6036164084 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -151,7 +151,7 @@
  * Note that it is probably more common to define your models
  * in the code, and one might consider it a layering violation
  * to specify the content of a list store in a UI definition,
- * <emphasis>data</emphasis>, not <emphasis>presentation</emphasis>,
+ * data, not presentation,
  * and common wisdom is to separate the two, as far as possible.
  * <!-- FIXME a bit inconclusive -->
  *
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 1f1e6bfa45..0c32f13b23 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1009,7 +1009,7 @@ gtk_init_check (int    *argc,
  * if you are calling gtk_parse_args(), gtk_init_check(),
  * gtk_init_with_args() or g_option_context_parse() with
  * the option group returned by gtk_get_option_group(),
- * you <emphasis>don't</emphasis> have to call gtk_init().
+ * you don't have to call gtk_init().
  *
  * <note><para>
  * This function will terminate your program if it was unable to
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index 40c3bdeeb6..346c16dc04 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -40,7 +40,7 @@
  * The margins specified in this object are the "print margins", i.e. the
  * parts of the page that the printer cannot print on. These are different
  * from the layout margins that a word processor uses; they are typically
- * used to determine the <emphasis>minimal</emphasis> size for the layout
+ * used to determine the minimal size for the layout
  * margins.
  * </para>
  *
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 06ffc7f135..60f2a93b88 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1129,7 +1129,7 @@ gtk_print_operation_class_init (GtkPrintOperationClass *class)
    *
    * The number of pages in the document. 
    *
-   * This <emphasis>must</emphasis> be set to a positive number
+   * This must be set to a positive number
    * before the rendering starts. It may be set in a 
    * #GtkPrintOperation::begin-print signal hander.
    *
@@ -1600,7 +1600,7 @@ gtk_print_operation_set_job_name (GtkPrintOperation *op,
  * 
  * Sets the number of pages in the document. 
  *
- * This <emphasis>must</emphasis> be set to a positive number
+ * This must be set to a positive number
  * before the rendering starts. It may be set in a 
  * #GtkPrintOperation::begin-print signal hander.
  *
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index c2f46b4617..d7da9515f3 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -3645,7 +3645,7 @@ gtk_print_unix_dialog_set_settings (GtkPrintUnixDialog *dialog,
  *
  * Gets a new #GtkPrintSettings object that represents the
  * current values in the print dialog. Note that this creates a
- * <emphasis>new object</emphasis>, and you need to unref it
+ * new object, and you need to unref it
  * if don't want to keep it.
  *
  * Returns: a new #GtkPrintSettings object with the values from @dialog
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 8a27909fe0..89f099f7aa 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1296,7 +1296,7 @@ gtk_selection_data_get_display (const GtkSelectionData *selection_data)
  * @length: length of the data
  * 
  * Stores new data into a #GtkSelectionData object. Should
- * <emphasis>only</emphasis> be called from a selection handler callback.
+ * only be called from a selection handler callback.
  * Zero-terminates the stored data.
  **/
 void 
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 6d94eca0c2..b7aba0fdb9 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -53,7 +53,7 @@
  * the top of the each bar's stack is the one that will currently be displayed.
  *
  * Any messages added to a statusbar's stack must specify a
- * <emphasis>context id</emphasis> that is used to uniquely identify
+ * context id that is used to uniquely identify
  * the source of a message. This context id can be generated by
  * gtk_statusbar_get_context_id(), given a message and the statusbar that
  * it will be added to. Note that messages are stored in a stack, and when
@@ -246,7 +246,7 @@ gtk_statusbar_update (GtkStatusbar *statusbar,
  *
  * Returns a new context identifier, given a description 
  * of the actual context. Note that the description is 
- * <emphasis>not</emphasis> shown in the UI.
+ * not shown in the UI.
  *
  * Returns: an integer id
  */
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 1168a836f5..aa723400bd 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -78,7 +78,7 @@
  * Implementations of the "tray" side of this specification can
  * be found e.g. in the GNOME 2 and KDE panel applications.
  *
- * Note that a GtkStatusIcon is <emphasis>not</emphasis> a widget, but just
+ * Note that a GtkStatusIcon is not a widget, but just
  * a #GObject. Making it a widget would be impractical, since the system tray
  * on Win32 doesn't allow to embed arbitrary widgets.
  */
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 852b464e8a..a0cde545b2 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -1682,7 +1682,7 @@ gtk_text_buffer_delete (GtkTextBuffer *buffer,
  * @end_iter: end of range
  * @default_editable: whether the buffer is editable by default
  *
- * Deletes all <emphasis>editable</emphasis> text in the given range.
+ * Deletes all editable text in the given range.
  * Calls gtk_text_buffer_delete() for each editable sub-range of
  * [@start,@end). @start and @end are revalidated to point to
  * the location of the last deleted range, or left untouched if
@@ -1830,7 +1830,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
  * text (text marked with tags that set the invisibility attribute) if
  * @include_hidden_chars is %FALSE. Does not include characters
  * representing embedded images, so byte and character indexes into
- * the returned string do <emphasis>not</emphasis> correspond to byte
+ * the returned string do not correspond to byte
  * and character indexes into the buffer. Contrast with
  * gtk_text_buffer_get_slice().
  *
@@ -1866,7 +1866,7 @@ gtk_text_buffer_get_text (GtkTextBuffer     *buffer,
  * @include_hidden_chars is %FALSE. The returned string includes a
  * 0xFFFC character whenever the buffer contains
  * embedded images, so byte and character indexes into
- * the returned string <emphasis>do</emphasis> correspond to byte
+ * the returned string do correspond to byte
  * and character indexes into the buffer. Contrast with
  * gtk_text_buffer_get_text(). Note that 0xFFFC can occur in normal
  * text as well, so it is not a reliable indicator that a pixbuf or
@@ -2106,7 +2106,7 @@ gtk_text_buffer_set_mark (GtkTextBuffer     *buffer,
  * with right gravity (when you type, the cursor stays on the right
  * side of the text you're typing).
  *
- * The caller of this function does <emphasis>not</emphasis> own a 
+ * The caller of this function does not own a 
  * reference to the returned #GtkTextMark, so you can ignore the 
  * return value if you like. Marks are owned by the buffer and go 
  * away when the buffer does.
@@ -2865,7 +2865,7 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
  *
  * Obtains an iterator pointing to @char_offset within the given
  * line. The @char_offset must exist, offsets off the end of the line
- * are not allowed. Note <emphasis>characters</emphasis>, not bytes;
+ * are not allowed. Note characters, not bytes;
  * UTF-8 may encode one character as multiple bytes.
  **/
 void
@@ -2890,7 +2890,7 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
  *
  * Obtains an iterator pointing to @byte_index within the given line.
  * @byte_index must be the start of a UTF-8 character, and must not be
- * beyond the end of the line.  Note <emphasis>bytes</emphasis>, not
+ * beyond the end of the line.  Note bytes, not
  * characters; UTF-8 may encode one character as multiple bytes.
  **/
 void
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index aa1b15ced5..c46db9fb08 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -918,7 +918,7 @@ gtk_text_iter_get_slice       (const GtkTextIter *start,
  * @start: iterator at start of a range
  * @end: iterator at end of a range
  *
- * Returns <emphasis>text</emphasis> in the given range.  If the range
+ * Returns text in the given range.  If the range
  * contains non-text elements such as images, the character and byte
  * offsets in the returned string will not correspond to character and
  * byte offsets in the buffer. If you want offsets to correspond, see
@@ -1101,7 +1101,7 @@ gtk_text_iter_get_marks (const GtkTextIter *iter)
  * toggled on.) If a tag is toggled on at @iter, then some non-empty
  * range of characters following @iter has that tag applied to it.  If
  * a tag is toggled off, then some non-empty range following @iter
- * does <emphasis>not</emphasis> have the tag applied to it.
+ * does not have the tag applied to it.
  *
  * Return value: (element-type GtkTextTag) (transfer container): tags toggled at this point
  **/
@@ -1159,7 +1159,7 @@ gtk_text_iter_get_toggled_tags  (const GtkTextIter  *iter,
  *
  * Note that if gtk_text_iter_begins_tag() returns %TRUE, it means that @iter is
  * at the beginning of the tagged range, and that the
- * <emphasis>character</emphasis> at @iter is inside the tagged range. In other
+ * character at @iter is inside the tagged range. In other
  * words, unlike gtk_text_iter_ends_tag(), if gtk_text_iter_begins_tag() returns
  * %TRUE, gtk_text_iter_has_tag() will also return %TRUE for the same
  * parameters.
@@ -1207,8 +1207,8 @@ gtk_text_iter_begins_tag    (const GtkTextIter  *iter,
  * is %NULL, returns %TRUE if any tag is toggled off at this point.
  *
  * Note that if gtk_text_iter_ends_tag() returns %TRUE, it means that @iter is
- * at the end of the tagged range, but that the <emphasis>character</emphasis>
- * at @iter is <emphasis>outside</emphasis> the tagged range. In other words,
+ * at the end of the tagged range, but that the character
+ * at @iter is outside the tagged range. In other words,
  * unlike gtk_text_iter_begins_tag(), if gtk_text_iter_ends_tag() returns %TRUE,
  * gtk_text_iter_has_tag() will return %FALSE for the same parameters.
  *
@@ -1253,7 +1253,7 @@ gtk_text_iter_ends_tag   (const GtkTextIter  *iter,
  *
  * This is equivalent to (gtk_text_iter_begins_tag () ||
  * gtk_text_iter_ends_tag ()), i.e. it tells you whether a range with
- * @tag applied to it begins <emphasis>or</emphasis> ends at @iter.
+ * @tag applied to it begins or ends at @iter.
  *
  * Return value: whether @tag is toggled on or off at @iter
  **/
@@ -3766,7 +3766,7 @@ gtk_text_iter_is_cursor_position (const GtkTextIter *iter)
  * @iter: a #GtkTextIter 
  * @char_on_line: a character offset relative to the start of @iter's current line
  * 
- * Moves @iter within a line, to a new <emphasis>character</emphasis>
+ * Moves @iter within a line, to a new character
  * (not byte) offset. The given character offset must be less than or
  * equal to the number of characters in the line; if equal, @iter
  * moves to the start of the next line. See
@@ -3808,7 +3808,7 @@ gtk_text_iter_set_line_offset (GtkTextIter *iter,
  * @byte_on_line: a byte index relative to the start of @iter's current line
  *
  * Same as gtk_text_iter_set_line_offset(), but works with a
- * <emphasis>byte</emphasis> index. The given byte index must be at
+ * byte index. The given byte index must be at
  * the start of a character, it can't be in the middle of a UTF-8
  * encoded character.
  * 
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 13f818d978..e49b741f18 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1881,7 +1881,7 @@ gtk_text_view_get_iter_at_location (GtkTextView *text_view,
  * gtk_text_view_window_to_buffer_coords().
  *
  * Note that this is different from gtk_text_view_get_iter_at_location(),
- * which returns cursor locations, i.e. positions <emphasis>between</emphasis>
+ * which returns cursor locations, i.e. positions between
  * characters.
  *
  * Since: 2.6
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 9fe613b580..d22eda6861 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -459,7 +459,7 @@ gtk_tree_model_base_init (gpointer g_class)
        * This signal is emitted when the children of a node in the
        * #GtkTreeModel have been reordered.
        *
-       * Note that this signal is <emphasis>not</emphasis> emitted
+       * Note that this signal is not emitted
        * when rows are reordered by DND, since this is implemented
        * by removing and then reinserting the row.
        */
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index a9ebca4861..415a05365c 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -3878,7 +3878,7 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter            *filter,
  * With the @n_columns and @types parameters, you give an array of column
  * types for this model (which will be exposed to the parent model/view).
  * The @func, @data and @destroy parameters are for specifying the modify
- * function. The modify function will get called for <emphasis>each</emphasis>
+ * function. The modify function will get called for each
  * data access, the goal of the modify function is to return the data which 
  * should be displayed at the location specified using the parameters of the 
  * modify function.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 6aef036525..a84454336c 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11748,12 +11748,12 @@ gtk_tree_view_get_headers_clickable (GtkTreeView *tree_view)
  * This function tells GTK+ that the user interface for your
  * application requires users to read across tree rows and associate
  * cells with one another. By default, GTK+ will then render the tree
- * with alternating row colors. Do <emphasis>not</emphasis> use it
+ * with alternating row colors. Do not use it
  * just because you prefer the appearance of the ruled tree; that's a
  * question for the theme. Some themes will draw tree rows in
  * alternating colors even when rules are turned off, and users who
  * prefer that appearance all the time can choose those themes. You
- * should call this function only as a <emphasis>semantic</emphasis>
+ * should call this function only as a semantic
  * hint to the theme engine that your tree makes alternating colors
  * useful from a functional standpoint (since it has lots of columns,
  * generally).
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 27c68a2a14..ad166f59bd 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2795,7 +2795,7 @@ gtk_tree_view_column_get_sort_indicator  (GtkTreeViewColumn     *tree_column)
  *
  * Changes the appearance of the sort indicator. 
  * 
- * This <emphasis>does not</emphasis> actually sort the model.  Use
+ * This does not actually sort the model.  Use
  * gtk_tree_view_column_set_sort_column_id() if you want automatic sorting
  * support.  This function is primarily for custom sorting behavior, and should
  * be used in conjunction with gtk_tree_sortable_set_sort_column_id() to do
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 4e4f589b21..38c3e353b0 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -219,8 +219,8 @@
  * to do it.
  *
  * Of course if you are getting the size request for
- * <emphasis>another</emphasis> widget, such as a child of a
- * container, you <emphasis>must</emphasis> use the wrapper APIs.
+ * another widget, such as a child of a
+ * container, you must use the wrapper APIs.
  * Otherwise, you would not properly consider widget margins,
  * #GtkSizeGroup, and so forth.
  *
@@ -3112,7 +3112,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
    * The ::drag-data-received signal is emitted on the drop site when the
    * dragged data has been received. If the data was received in order to
    * determine whether the drop will be accepted, the handler is expected
-   * to call gdk_drag_status() and <emphasis>not</emphasis> finish the drag.
+   * to call gdk_drag_status() and not finish the drag.
    * If the data was received in response to a #GtkWidget::drag-drop signal
    * (and this is the last target to be received), the handler for this
    * signal is expected to process the received data and then call
@@ -8793,7 +8793,7 @@ gtk_widget_get_double_buffered (GtkWidget *widget)
  * the widget will not even redraw if its position changes; this is to
  * allow containers that don't draw anything to avoid excess
  * invalidations. If you set this flag on a widget with no window that
- * <emphasis>does</emphasis> draw on @widget->window, you are
+ * does draw on @widget->window, you are
  * responsible for invalidating both the old and new allocation of the
  * widget when the widget is moved and responsible for invalidating
  * regions newly when the widget increases size.
@@ -14440,7 +14440,7 @@ gtk_widget_get_clipboard (GtkWidget *widget, GdkAtom selection)
  * The widgets in the list are not individually referenced. If you
  * want to iterate through the list and perform actions involving
  * callbacks that might destroy the widgets, you
- * <emphasis>must</emphasis> call <literal>g_list_foreach (result,
+ * must call <literal>g_list_foreach (result,
  * (GFunc)g_object_ref, NULL)</literal> first, and then unref all the
  * widgets afterwards.
 
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 303d319724..d557abbf2f 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2633,7 +2633,7 @@ gtk_window_get_modal (GtkWindow *window)
  * Returns a list of all existing toplevel windows. The widgets
  * in the list are not individually referenced. If you want
  * to iterate through the list and perform actions involving
- * callbacks that might destroy the widgets, you <emphasis>must</emphasis> call
+ * callbacks that might destroy the widgets, you must call
  * <literal>g_list_foreach (result, (GFunc)g_object_ref, NULL)</literal> first, and
  * then unref all the widgets afterwards.
  *
@@ -4845,7 +4845,7 @@ gtk_window_resize_to_geometry (GtkWindow *window,
  * "configure-event" on the window and adjust your size-dependent
  * state to match the size delivered in the #GdkEventConfigure.
  *
- * Note 2: The returned size does <emphasis>not</emphasis> include the
+ * Note 2: The returned size does not include the
  * size of the window manager decorations (aka the window frame or
  * border). Those are not drawn by GTK+ and GTK+ has no reliable
  * method of determining their size.
@@ -4865,7 +4865,7 @@ gtk_window_resize_to_geometry (GtkWindow *window,
  * application cannot.
  *
  * In any case, if you insist on application-specified window
- * positioning, there's <emphasis>still</emphasis> a better way than
+ * positioning, there's still a better way than
  * doing it yourself - gtk_window_set_position() will frequently
  * handle the details for you.
  *