From f4687eb8e1a38be843c7b67e96f98150e177edce Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Fri, 30 May 2008 02:30:19 +0000
Subject: [PATCH] Updates

svn path=/trunk/; revision=20243
---
 docs/reference/ChangeLog         |  4 ++++
 docs/reference/gtk/building.sgml | 34 +++++++++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index ae5f8158a9..f6352db2f4 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-29  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/building.sgml: Document added configure options
+
 2008-05-29  Michael Natterer  <mitch@imendio.com>
 
 	* gtk/Makefile.am (CPPFLAGS): add -UGTK_DISABLE_SINGLE_INCLUDES so
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 82362fd895..d5f494a5ef 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -170,7 +170,7 @@ How to compile GTK+ itself
 	  The GLib library provides core non-graphical functionality
 	  such as high level data types, Unicode manipulation, and
 	  an object and type system to C programs. It is available
-	  from the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+
+	  from the <ulink url="ftp://ftp.gtk.org/pub/glib/">GTK+
 	  FTP site.</ulink>
 	</para>
       </listitem>
@@ -178,7 +178,7 @@ How to compile GTK+ itself
 	<para>
 	  <ulink url="http://www.pango.org">Pango</ulink> is a library
 	  for internationalized text handling. It is available from
-	  the <ulink url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP
+	  the <ulink url="ftp://ftp.gtk.org/pub/pango/">GTK+ FTP
 	  site.</ulink>. 
 	</para>
       </listitem>
@@ -188,7 +188,7 @@ How to compile GTK+ itself
 	  interfaces allowing accessibility technologies such as
 	  screen readers to interact with a graphical user interface.
 	  It is available from the <ulink
-	  url="ftp://ftp.gtk.org/pub/gtk/v2.6/">GTK+ FTP site.</ulink>
+	  url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site.</ulink>
 	</para>
       </listitem>
       <listitem>
@@ -309,6 +309,9 @@ How to compile GTK+ itself
 	  <group>
 	    <arg>--with-included-loaders==LOADER1,LOADER2,...</arg>
 	  </group>
+	  <group>
+	    <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
+	  </group>
 	  <group>
 	    <arg>--enable-debug=[no|minimum|yes]</arg>
 	  </group>
@@ -340,6 +343,10 @@ How to compile GTK+ itself
 	    <arg>--disable-gtk-doc</arg>
 	    <arg>--enable-gtk-doc</arg>
 	  </group>
+	  <group>
+	    <arg>--disable-cups</arg>
+	    <arg>--enable-cups</arg>
+	  </group>
           <group>
             <arg>--with-xinput=[no|yes]</arg>
           </group>
@@ -377,6 +384,15 @@ How to compile GTK+ itself
 	</para>
       </formalpara>
 
+      <formalpara>
+	<title><systemitem>--with-included-immodules</systemitem></title>
+
+	<para>
+         This option allows you to specify which input method modules you
+         want to include. 
+	</para>
+      </formalpara>
+
       <formalpara>
         <title><systemitem>--enable-debug</systemitem></title>
           
@@ -512,6 +528,18 @@ How to compile GTK+ itself
 	</para>
       </formalpara>
 
+      <formalpara>
+	<title><systemitem>--disable-cups</systemitem> and
+	  <systemitem>--enable-cups</systemitem></title>
+
+	<para>
+          By default the <command>configure</command> script will try
+          to build the cups print backend if the cups libraries are found.
+          These options can be used to explicitly control whether
+          the cups print backend should be built.
+        </para>
+      </formalparap>
+
       <formalpara>
         <title><systemitem>--with-xinput</systemitem></title>
         <para>