From 8d221c6caa32916789f5fe20331af1d13760b0ad Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Fri, 15 Aug 2008 18:01:38 +0000
Subject: [PATCH] Some doc additions

svn path=/trunk/; revision=21129
---
 ChangeLog                        |  7 +++++++
 README.in                        |  5 +++++
 docs/reference/ChangeLog         |  5 +++++
 docs/reference/gtk/building.sgml | 11 +++++++++++
 4 files changed, 28 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 859b3c3fc..82680abca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 547655 – gio_can_sniff configure test can fail if not installed
+	with prefix {/usr,/usr/local} and XDG_DATA_DIRS env not set
+
+	* README.in: Add a note about shared-mime-info and XDG_DATA_DIRS.
+
 2008-08-15  Christian Dywan  <christian@imendio.com>
 
 	Bug 547846 – gtktestutils functions lack Since: tags
diff --git a/README.in b/README.in
index 71b653820..254da7f5b 100644
--- a/README.in
+++ b/README.in
@@ -48,6 +48,11 @@ Release notes for 2.14
   to GTK_SENSITIVITY_ON, so that the button is always sensitive or
   GTK_SENSITIVITY_OFF to make it insensitive respectively.
 
+* gdk-pixbuf will use GIO for mime type detection if possible. For
+  this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
+  set accordingly at configure time. Otherwise, gdk-pixbuf falls
+  back to its built-in sniffing implementation.
+
 Release notes for 2.12
 ======================
 
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0f7eb481e..3e29405cc 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/building.sgml: Add a note about shared-mime-info and 
+	XDG_DATA_DIRS.
+
 2008-08-13  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtk-sections.txt: Remove useless getters
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 8b5c29803..a32b725ed 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -255,6 +255,17 @@ How to compile GTK+ itself
           drawing.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink> 
+          package is not a hard dependency of GTK+, but it contains definitions 
+          for mime types that are used by GIO and, indirectly, by GTK+. 
+          gdk-pixbuf will use GIO for mime type detection if possible. For this 
+          to work, shared-mime-info needs to be installed and 
+          <envvar>XDG_DATA_DIRS</envvar> set accordingly at configure time. 
+          Otherwise, gdk-pixbuf falls back to its built-in mime type detection.
+        </para>
+      </listitem>
     </itemizedlist>
   </refsect1>
   <refsect1 id="building">