4 files changed, 120 insertions, 1 deletions
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index e52276a4d2..80a4ca53fb 100644
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -81,7 +81,8 @@ content_files = 		\
 	text_widget.sgml	\
 	tree_widget.sgml	\
 	windows.sgml		\
-	x11.sgml
+	x11.sgml		\
+	gtk-query-immodules-2.0.xml
 
 # Images to copy into HTML directory
 HTML_IMAGES = \
@@ -159,6 +160,15 @@ HTML_IMAGES = \
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 
+man_MANS = gtk-query-immodules-2.0.1 
+
+if ENABLE_MAN
+
+%.1 : %.xml 
+	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+endif
+
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index b616a0c93c..017e0815d7 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -157,6 +157,7 @@
 <!ENTITY gtk-Changes-1-2 SYSTEM "changes-1.2.sgml">
 <!ENTITY gtk-Changes-2-0 SYSTEM "changes-2.0.sgml">
 <!ENTITY version SYSTEM "version.xml">
+<!ENTITY gtk-query-immodules SYSTEM "gtk-query-immodules-2.0.xml">
 ]>
 <book id="index">
   <bookinfo>
@@ -288,6 +289,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
 
   <part id="gtkobjects">
     <title>GTK+ Widgets and Objects</title>
+
     <chapter>
       <title>Object Hierarchy</title>
     &index-Object-Tree;
@@ -357,6 +359,7 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkListStore;
         &GtkTreeStore;
     </chapter>
+
     <chapter id="MenusAndCombos">
       <title>Menus, Combo Box, Toolbar</title>
         &GtkCombo;
@@ -478,9 +481,16 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
         &GtkTree;
         &GtkTreeItem;
     </chapter>
+  </part>
 
+  <part>
+    <title>GTK+ Tools</title>
+
+     &gtk-query-immodules;
   </part>
 
   <index/>
 
 </book>
+
+
diff --git a/docs/reference/gtk/gtk-query-immodules-2.0.1 b/docs/reference/gtk/gtk-query-immodules-2.0.1
new file mode 100644
index 0000000000..7f38a37121
--- /dev/null
+++ b/docs/reference/gtk/gtk-query-immodules-2.0.1
@@ -0,0 +1,49 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "GTK-QUERY-IMMODUL" 1 "" "" ""
+.SH NAME
+gtk-query-immodules-2.0 \- Input method module registration utility
+.SH "SYNOPSIS"
+
+.nf
+\fBgtk-query-immodules-2.0\fR [module...]
+.fi
+
+.SH "DESCRIPTION"
+
+.PP
+ \fBgtk-query-immodules-2.0\fR collects information about loadable input method modules for GTK+ and writes it to \fIstdout\fR\&.
+
+.PP
+If called without arguments, it looks for modules in the GTK+ input method module path\&.
+
+.PP
+If called with arguments, it looks for the specified modules\&. The arguments may be absolute or relative paths\&.
+
+.SH "ENVIRONMENT"
+
+.PP
+The environment variable \fBGTK_PATH\fR can be used to prepend directories to the input method module path\&.
+
+.SH "BUGS"
+
+.PP
+None known yet\&.
+
diff --git a/docs/reference/gtk/gtk-query-immodules-2.0.xml b/docs/reference/gtk/gtk-query-immodules-2.0.xml
new file mode 100644
index 0000000000..6e2443ddf2
--- /dev/null
+++ b/docs/reference/gtk/gtk-query-immodules-2.0.xml
@@ -0,0 +1,50 @@
+<refentry id="gtk-query-immodules-2.0">
+
+<refmeta>
+<refentrytitle>gtk-query-immodules-2.0</refentrytitle>
+<manvolnum>1</manvolnum>
+</refmeta>
+
+<refnamediv>
+<refname>gtk-query-immodules-2.0</refname>
+<refpurpose>Input method module registration utility</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<cmdsynopsis>
+<command>gtk-query-immodules-2.0</command>
+<arg choice="opt" rep="repeat">module</arg>
+</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+<command>gtk-query-immodules-2.0</command> collects information about loadable 
+input method modules for GTK+ and writes it to <filename>stdout</filename>. 
+</para>
+<para>
+If called without arguments, it looks for modules in the GTK+ input method 
+module path.  
+</para>
+<para>
+If called with arguments, it looks for the specified modules. The arguments
+may be absolute or relative paths.
+</para>
+</refsect1>
+
+<refsect1><title>Environment</title>
+<para>
+The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link> can 
+be used to prepend directories to the input method module path. 
+</para>
+</refsect1>
+
+<refsect1><title>Bugs</title>
+<para>
+None known yet.
+</para>
+</refsect1>
+
+</refentry>
+
+