Drop the &gdk-pixbuf; entity

It does not get expanded anymore; lets just say gdk-pixbuf.

3 files changed, 9 insertions, 13 deletions

diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf.xml
index 521cc9e97..c657ddfb2 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.xml
@@ -3,9 +3,6 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
 <!ENTITY version SYSTEM "version.xml">
-
-<!ENTITY gdk-pixbuf "<application>gdk-pixbuf</application>">
-<!ENTITY Imlib "<application>Imlib</application>">
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
@@ -69,7 +66,7 @@
     <partintro>
       <para>
 	This part presents the class and function reference for the
-	&gdk-pixbuf; library.  Classes are described together with
+	gdk-pixbuf library.  Classes are described together with
 	their methods; individual functions are grouped by functional
 	group.
       </para>
@@ -103,8 +100,7 @@
 
     <partintro>
       <para>
-	This part presents the tools which are shipped with the
-	&gdk-pixbuf; library.
+	This part presents the tools which are shipped with the gdk-pixbuf library.
       </para>
     </partintro>
 
diff --git a/gdk-pixbuf/gdk-pixbuf-core.h b/gdk-pixbuf/gdk-pixbuf-core.h
index 49bb1b9fb..e6843b8ec 100644
--- a/gdk-pixbuf/gdk-pixbuf-core.h
+++ b/gdk-pixbuf/gdk-pixbuf-core.h
@@ -147,7 +147,7 @@ typedef enum
  * @GDK_COLORSPACE_RGB: Indicates a red/green/blue additive color space.
  * 
  * This enumeration defines the color spaces that are supported by
- * the &gdk-pixbuf; library.  Currently only RGB is supported.
+ * the gdk-pixbuf library.  Currently only RGB is supported.
  */
 /* Note that these values are encoded in inline pixbufs
  * as ints, so don't reorder them
@@ -161,7 +161,7 @@ typedef enum {
 /**
  * GdkPixbuf:
  * 
- * This is the main structure in the &gdk-pixbuf; library.  It is
+ * This is the main structure in the gdk-pixbuf library.  It is
  * used to represent images.  It contains information about the
  * image's pixel data, its color space, bits per sample, width and
  * height, and the rowstride (the number of bytes between the start of
@@ -208,7 +208,7 @@ typedef void (* GdkPixbufDestroyNotify) (guchar *pixels, gpointer data);
  *  given operation on the type of image at hand.
  * @GDK_PIXBUF_ERROR_FAILED: Generic failure code, something went wrong.
  * 
- * An error code in the #GDK_PIXBUF_ERROR domain. Many &gdk-pixbuf;
+ * An error code in the #GDK_PIXBUF_ERROR domain. Many gdk-pixbuf
  * operations can cause errors in this domain, or in the #G_FILE_ERROR
  * domain.
  */
diff --git a/gdk-pixbuf/gdk-pixbuf-io.h b/gdk-pixbuf/gdk-pixbuf-io.h
index a9cbdf1a9..ec36a73b8 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.h
+++ b/gdk-pixbuf/gdk-pixbuf-io.h
@@ -78,7 +78,7 @@ void             gdk_pixbuf_format_free (GdkPixbufFormat       *format);
  * The function is expected to set @width and @height to the desired
  * size to which the image should be scaled. If a module has no efficient 
  * way to achieve the desired scaling during the loading of the image, it may
- * either ignore the size request, or only approximate it -- &gdk-pixbuf; will
+ * either ignore the size request, or only approximate it - gdk-pixbuf will
  * then perform the required scaling on the completely loaded image. 
  * 
  * If the function sets @width or @height to zero, the module should interpret
@@ -151,13 +151,13 @@ typedef void (* GdkPixbufModuleUpdatedFunc)  (GdkPixbuf *pixbuf,
  * Each prefix has an associated integer that describes the relevance of 
  * the prefix, with 0 meaning a mismatch and 100 a "perfect match".
  * 
- * Starting with &gdk-pixbuf; 2.8, the first byte of the mask may be '*', 
+ * Starting with gdk-pixbuf 2.8, the first byte of the mask may be '*', 
  * indicating an unanchored pattern that matches not only at the beginning, 
  * but also in the middle. Versions prior to 2.8 will interpret the '*'
  * like an 'x'. 
  * 
  * The signature of a module is stored as an array of 
- * #GdkPixbufModulePattern<!-- -->s. The array is terminated by a pattern
+ * #GdkPixbufModulePatterns. The array is terminated by a pattern
  * where the @prefix is %NULL.
  * 
  * 
@@ -289,7 +289,7 @@ gboolean gdk_pixbuf_set_option  (GdkPixbuf   *pixbuf,
  * GdkPixbufFormatFlags:
  * @GDK_PIXBUF_FORMAT_WRITABLE: the module can write out images in the format.
  * @GDK_PIXBUF_FORMAT_SCALABLE: the image format is scalable
- * @GDK_PIXBUF_FORMAT_THREADSAFE: the module is threadsafe. &gdk-pixbuf;
+ * @GDK_PIXBUF_FORMAT_THREADSAFE: the module is threadsafe. gdk-pixbuf
  *     ignores modules that are not marked as threadsafe. (Since 2.28).
  * 
  * Flags which allow a module to specify further details about the supported