Commit 287d91e5 authored by Kristian Høgsberg's avatar Kristian Høgsberg

Merge remote-tracking branch 'origin/master' into gdk-backend-wayland

Conflicts:
	gdk/gdkdisplaymanager.c
parents b5134619 f04504ac
...@@ -9,23 +9,23 @@ GTK+ requires the following packages: ...@@ -9,23 +9,23 @@ GTK+ requires the following packages:
GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@ GdkPixbuf @GDK_PIXBUF_REQUIRED_VERSION@, ATK @ATK_REQUIRED_VERSION@
and cairo @CAIRO_REQUIRED_VERSION@. and cairo @CAIRO_REQUIRED_VERSION@.
- gobject-introspection 0.9.3 or newer. - gobject-introspection @INTROSPECTION_REQUIRED_VERSION@ or newer.
Simple install procedure Simple install procedure
======================== ========================
% gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources % gzip -cd gtk+-@GTK_VERSION@.tar.gz | tar xvf - # unpack the sources
% cd gtk+-@GTK_VERSION@ # change to the toplevel directory % cd gtk+-@GTK_VERSION@ # change to the toplevel directory
% ./configure # run the `configure' script % ./configure # run the `configure' script
% make # build GTK+ % make # build GTK+
[ Become root if necessary ] [ Become root if necessary ]
% make install # install GTK+ % make install # install GTK+
The Details The Details
=========== ===========
Complete information about installing GTK+ and related libraries can be found Complete information about installing GTK+ and related libraries
in the file: can be found in the file:
docs/reference/gtk/html/gtk-building.html docs/reference/gtk/html/gtk-building.html
......
Overview of Changes in GTK+ 3.0.0
=================================
* Library sonames have been changed from libgdk-3.0 and libgtk-3.0
to libgdk-3 and libgtk-3.
* Bugs fixed:
632775 Back / Forward button's icons don't respect RTL settings
639846 GdkEventScroll events are sent twice
639945 Gtk.Widget does not have drag_* methods (but in pygtk it did)
640801 Crash gtk_tree_view_reset_header_styles at gtktreeview.c:11871
641196 Fix another GtkFixed regression, in gtk_fixed_forall()
641302 show something nicer than XF86AudioMute etc
641367 [region] gnome-applications ignore layout switching
641409 not chaining up in ::style-updated
641429 Errors creating a GtkWidget without a display
641431 Apply button goes grey after two mode switching
641517 "Migrating from libunique to GtkApplication" examples do not do...
641558 GtkCssProvider leaks path string
641621 Use faster new G_VALUE_COLLECT_INIT variant instead...
641640 Update autotools configuration
* Translation updates:
Arabic
English
Galician
Hebrew
Korean
Norwegian bokmål
Polish
Overview of Changes in GTK+ 2.99.3 Overview of Changes in GTK+ 2.99.3
================================== ==================================
......
...@@ -25,3 +25,22 @@ Installation ...@@ -25,3 +25,22 @@ Installation
============ ============
See the file 'INSTALL' See the file 'INSTALL'
Release notes for 3.0
=====================
* GTK+ 3 is a major new version of GTK+, which is parallel installable
with GTK+ 2.x. For information about porting applications from GTK+ 2.x
to GTK+ 3, see the file:
docs/reference/gtk/html/migrating.html
Or online at:
http://library.gnome.org/devel/gtk/3.0/migrating.html
* Note that the library sonames in this release have been changed from
libgtk-3.0 and libgdk-3.0 to libgtk-3 and libgdk-3, to prevent the
library versions from going backwards, compared to the 2.90/91/99
releases. Applications will have to be recompiled.
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" /> <File RelativePath="..\..\..\gdk\win32\gdkselection-win32.c" />
<File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" /> <File RelativePath="..\..\..\gdk\win32\gdktestutils-win32.c" />
<File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" /> <File RelativePath="..\..\..\gdk\win32\gdkvisual-win32.c" />
<File RelativePath="..\..\..\gdk\win32\gdkwin32displaymanager.c" /> <File RelativePath="..\..\..\gdk\win32\gdkdisplaymanager-win32.c" />
<File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" /> <File RelativePath="..\..\..\gdk\win32\gdkwin32id.c" />
<File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" /> <File RelativePath="..\..\..\gdk\win32\gdkwindow-win32.c" />
</Filter> </Filter>
......
...@@ -316,7 +316,6 @@ copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&# ...@@ -316,7 +316,6 @@ copy ..\..\..\gtk\gtkwidget.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#
copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A; copy ..\..\..\gtk\gtkwidgetpath.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A; copy ..\..\..\gtk\gtkwindow.h $(OutDir)\include\gtk-$(GtkApiVersion)\gtk&#x0D;&#x0A;
mkdir $(OutDir)\lib\gtk-$(GtkApiVersion)\include&#x0D;&#x0A;
copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A; copy ..\..\..\gdk\gdkconfig.h $(OutDir)\include\gtk-3.0\gdk&#x0D;&#x0A;
copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A; copy $(ConfigurationName)\$(PlatformName)\bin\*-$(GtkApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
......
This diff is collapsed.
...@@ -12,11 +12,11 @@ INCLUDES = \ ...@@ -12,11 +12,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
LDADDS = \ LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
$(MATH_LIB) $(MATH_LIB)
......
...@@ -55,11 +55,11 @@ INCLUDES = \ ...@@ -55,11 +55,11 @@ INCLUDES = \
$(GTK_DEP_CFLAGS) $(GTK_DEP_CFLAGS)
DEPS = \ DEPS = \
$(top_builddir)/gtk/libgtk-3.0.la $(top_builddir)/gtk/libgtk-3.la
LDADDS = \ LDADDS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(top_builddir)/gdk/libgdk-3.0.la \ $(top_builddir)/gdk/libgdk-3.la \
$(GTK_DEP_LIBS) \ $(GTK_DEP_LIBS) \
-lm -lm
......
...@@ -44,15 +44,14 @@ INCLUDES = \ ...@@ -44,15 +44,14 @@ INCLUDES = \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS) $(GDK_DEP_CFLAGS)
GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.0.la $(GDK_DEP_LIBS) GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
# Extra options to supply to gtkdoc-mkdb # Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=gdk
# Extra SGML files that are included by DOC_MAIN_SGML_FILE # Extra SGML files that are included by DOC_MAIN_SGML_FILE
content_files = \ content_files = \
version.xml \ version.xml
multihead.sgml
# Images to copy into HTML directory # Images to copy into HTML directory
HTML_IMAGES = \ HTML_IMAGES = \
......
...@@ -6,23 +6,24 @@ ...@@ -6,23 +6,24 @@
]> ]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
<bookinfo> <bookinfo>
<title>GDK Reference Manual</title> <title>GDK 3 Reference Manual</title>
<releaseinfo> <releaseinfo>
for GDK &version; This document is for the GDK 3 library, version &version;
The latest version of this documentation can be found on-line at The latest versions can be found online at
<ulink role="online-location" url="http://library.gnome.org/devel/gdk/unstable/">http://library.gnome.org/devel/gdk/unstable/</ulink>. <ulink role="online-location" url="http://library.gnome.org/devel/gdk3/">http://library.gnome.org/devel/gdk3/</ulink>.
If you are looking for the older GDK 2 series of libraries,
see <ulink role="online-location" url="http://library.gnome.org/devel/gdk/">http://library.gnome.org/devel/gdk/</ulink>.
</releaseinfo> </releaseinfo>
</bookinfo> </bookinfo>
<reference id="reference"> <reference id="reference">
<title>API Reference</title> <title>API Reference</title>
<xi:include href="xml/general.xml" /> <xi:include href="xml/general.xml" />
<xi:include href="multihead.sgml" />
<xi:include href="xml/gdkdisplay.xml" />
<xi:include href="xml/gdkdisplaymanager.xml" /> <xi:include href="xml/gdkdisplaymanager.xml" />
<xi:include href="xml/gdkdevice.xml" /> <xi:include href="xml/gdkdisplay.xml" />
<xi:include href="xml/gdkdevicemanager.xml" />
<xi:include href="xml/gdkscreen.xml" /> <xi:include href="xml/gdkscreen.xml" />
<xi:include href="xml/gdkdevicemanager.xml" />
<xi:include href="xml/gdkdevice.xml" />
<xi:include href="xml/regions.xml" /> <xi:include href="xml/regions.xml" />
<xi:include href="xml/pixbufs.xml" /> <xi:include href="xml/pixbufs.xml" />
<xi:include href="xml/colors.xml" /> <xi:include href="xml/colors.xml" />
......
<?xml version="1.0"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
]>
<refentry id="multihead" revision="1 May 2002">
<refmeta>
<refentrytitle>Multi-head Support Overview</refentrytitle>
<manvolnum>3</manvolnum>
<refmiscinfo>GDK Library</refmiscinfo>
</refmeta>
<refnamediv>
<refname>Multi-head Support Overview</refname>
<refpurpose>Overview of GdkDisplay and GdkScreen</refpurpose>
</refnamediv>
<refsect1>
<title>Overview</title>
<para>
Multihead support is based around two main object types:
<itemizedlist>
<listitem><para>GdkDisplay</para></listitem>
<listitem><para>GdkScreen</para></listitem>
</itemizedlist>
</para>
<para>
<link linkend="gdk-GdkDisplay">GdkDisplay</link> objects are the GDK
representation of the X Display which can be described as <emphasis>a
workstation consisting of a keyboard a pointing device (such as a
mouse) and one or more screens</emphasis>.
It is used to open and keep track of various <link
linkend="gdk-GdkScreen">GdkScreen</link> objects currently
instanciated by the application. It is also used to grab and release
the keyboard and the mouse pointer.
</para>
<para>
<link linkend="gdk-GdkScreen">GdkScreen</link> objects are the GDK
representation of a physical screen. It is used throughout GDK and GTK+
to specify which screen the top level windows are to be displayed on.
It is also used to query the screen specification and default settings such as
the default colormap (<link linkend="gdk-screen-get-default-colormap">gdk_screen_get_default_colormap</link>()),
the screen width (<link linkend="gdk-screen-get-width">gdk_screen_get_width</link>()), etc.
</para>
<para>
The following code samples demonstrate common usage of the objects described above.
</para>
<example>
<title>Testing the number of screen on the current display</title>
<programlisting><!--
-->gint num_screen = 0;
gchar *displayname = NULL;
GdkScreen **screen_list;
GdkDisplay *display;
gtk_init (&amp;argc, &amp;argv);
display = gdk_display_get_default ();
num_screen = gdk_display_get_n_screens (display);
displayname = gdk_display_get_name (display);
if (num_screen &lt;= 1)
{
printf ("This Xserver (%s) manages only one screen. exiting...\n",
displayname);
exit (1);
}
else
{
printf ("This Xserver (%s) manages %d screens.\n", displayname,
num_screen);
}<!--
--> </programlisting>
</example>
<example>
<title>Opening a second display</title>
<programlisting><!--
-->gchar *second_screen_name;
GdkDisplay *second_display;
GdkScreen *second_screen;
GtkWidget *window;
gtk_init (&amp;argc, &amp;argv);
/* screen2_name needs to be initialized before calling
/* gdk_display_new() */
second_display = gdk_display_new (&amp;argc, &amp;argv, second_screen_name);
if (second_display)
second_screen = gdk_display_get_default_screen (second_display);
else
{
g_print ("Can't open display :\n\t%s\n\n",
second_screen_name);
exit (1);
}
/* now GdkScreen can be assigned to GtkWindows */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_screen (window, second_screen);<!--
--></programlisting>
</example>
</refsect1>
<refsect1>
<title>See Also</title>
<para>
<variablelist>
<varlistentry>
<term><link linkend="GdkDisplay">GdkDisplay</link></term>
<listitem><para>the GDK Object used to represent and manipulate display
related data</para></listitem>
</varlistentry>
<varlistentry>
<term><link linkend="GdkScreen">GdkScreen</link></term>
<listitem><para>the GDK Object used to represent and query screen related
data</para></listitem>
</varlistentry>
</variablelist>
</para>
</refsect1>
</refentry>
<!--
Local variables:
mode: sgml
sgml-parent-document: ("gdk-docs.sgml" "book" "refentry" "")
End:
-->
...@@ -106,7 +106,7 @@ CPPFLAGS += \ ...@@ -106,7 +106,7 @@ CPPFLAGS += \
-UGTK_DISABLE_SINGLE_INCLUDES -UGTK_DISABLE_SINGLE_INCLUDES
GTKDOC_LIBS = \ GTKDOC_LIBS = \
$(top_builddir)/gtk/libgtk-3.0.la \ $(top_builddir)/gtk/libgtk-3.la \
$(GTK_DEP_LIBS) $(GTK_DEP_LIBS)
......
...@@ -172,7 +172,7 @@ How to compile GTK+ itself ...@@ -172,7 +172,7 @@ How to compile GTK+ itself
such as high level data types, Unicode manipulation, and such as high level data types, Unicode manipulation, and
an object and type system to C programs. It is available an object and type system to C programs. It is available
from the <ulink url="ftp://ftp.gtk.org/pub/glib/">GTK+ from the <ulink url="ftp://ftp.gtk.org/pub/glib/">GTK+
FTP site.</ulink> FTP site</ulink>.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
...@@ -180,7 +180,7 @@ How to compile GTK+ itself ...@@ -180,7 +180,7 @@ How to compile GTK+ itself
<ulink url="http://www.pango.org">Pango</ulink> is a library <ulink url="http://www.pango.org">Pango</ulink> is a library
for internationalized text handling. It is available from for internationalized text handling. It is available from
the <ulink url="ftp://ftp.gtk.org/pub/pango/">GTK+ FTP the <ulink url="ftp://ftp.gtk.org/pub/pango/">GTK+ FTP
site.</ulink>. site</ulink>.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
...@@ -189,7 +189,7 @@ How to compile GTK+ itself ...@@ -189,7 +189,7 @@ How to compile GTK+ itself
interfaces allowing accessibility technologies such as interfaces allowing accessibility technologies such as
screen readers to interact with a graphical user interface. screen readers to interact with a graphical user interface.
It is available from the <ulink It is available from the <ulink
url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site.</ulink> url="ftp://ftp.gtk.org/pub/atk/">GTK+ FTP site</ulink>.
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
...@@ -309,49 +309,60 @@ How to compile GTK+ itself ...@@ -309,49 +309,60 @@ How to compile GTK+ itself
<cmdsynopsis> <cmdsynopsis>
<command>configure</command> <command>configure</command>
<sbr/>
<group> <group>
<arg>--disable-modules</arg> <arg>--disable-modules</arg>
<arg>--enable-modules</arg> <arg>--enable-modules</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--with-included-immodules=MODULE1,MODULE2,...</arg> <arg>--with-included-immodules=MODULE1,MODULE2,...</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--enable-debug=[no/minimum/yes]</arg> <arg>--enable-debug=[no/minimum/yes]</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--disable-Bsymbolic</arg> <arg>--disable-Bsymbolic</arg>
<arg>--enable-Bsymbolic</arg> <arg>--enable-Bsymbolic</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--disable-xkb</arg> <arg>--disable-xkb</arg>
<arg>--enable-xkb</arg> <arg>--enable-xkb</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--disable-xinerama</arg> <arg>--disable-xinerama</arg>
<arg>--enable-xinerama</arg> <arg>--enable-xinerama</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--disable-gtk-doc</arg> <arg>--disable-gtk-doc</arg>
<arg>--enable-gtk-doc</arg> <arg>--enable-gtk-doc</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--disable-cups</arg> <arg>--disable-cups</arg>
<arg>--enable-cups</arg> <arg>--enable-cups</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--disable-papi</arg> <arg>--disable-papi</arg>
<arg>--enable-papi</arg> <arg>--enable-papi</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--enable-xinput</arg> <arg>--enable-xinput</arg>
<arg>--disable-xinput</arg> <arg>--disable-xinput</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--enable-packagekit</arg> <arg>--enable-packagekit</arg>
<arg>--disable-packagekit</arg> <arg>--disable-packagekit</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--enable-x11-backend</arg> <arg>--enable-x11-backend</arg>
<arg>--disable-x11-backend</arg> <arg>--disable-x11-backend</arg>
...@@ -360,9 +371,11 @@ How to compile GTK+ itself ...@@ -360,9 +371,11 @@ How to compile GTK+ itself
<arg>--enable-quartz-backend</arg> <arg>--enable-quartz-backend</arg>
<arg>--disable-quartz-backend</arg> <arg>--disable-quartz-backend</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--enable-introspection=[no/auto/yes]</arg> <arg>--enable-introspection=[no/auto/yes]</arg>
</group> </group>
<sbr/>
<group> <group>
<arg>--enable-gtk2-dependency</arg> <arg>--enable-gtk2-dependency</arg>
<arg>--disable-gtk2-dependency</arg> <arg>--disable-gtk2-dependency</arg>
......
...@@ -32,7 +32,7 @@ your system may be different): ...@@ -32,7 +32,7 @@ your system may be different):
$ pkg-config --cflags gtk+-3.0 $ pkg-config --cflags gtk+-3.0
-pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -pthread -I/usr/include/gtk-3.0 -I/usr/lib64/gtk-3.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
$ pkg-config --libs gtk+-3.0 $ pkg-config --libs gtk+-3.0
-pthread -lgtk-3.0 -lgdk-3.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-3.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
</programlisting> </programlisting>
</para> </para>
<para> <para>
......
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
<bookinfo> <bookinfo>
<title>GTK+ 3 Reference Manual</title> <title>GTK+ 3 Reference Manual</title>
<releaseinfo> <releaseinfo>
This document is for GTK+ 3 library; the latest version can be found online at This document is for the GTK+ 3 library, version &version;.
<ulink role="online-location" url="http://library.gnome.org/devel/gtk/unstable/">http://library.gnome.org/devel/gtk/unstable/</ulink>. The latest versions can be found online at
If you're looking for the older GTK+ 2 series of libraries, they can be found under their version numbers; for example, 2.22 is available at <ulink role="online-location" url="http://library.gnome.org/devel/gtk/2.22/">http://library.gnome.org/devel/gtk/2.22/</ulink>. <ulink role="online-location" url="http://library.gnome.org/devel/gtk3/">http://library.gnome.org/devel/gtk3/</ulink>.
If you are looking for the older GTK+ 2 series of libraries,
see <ulink role="online-location" url="http://library.gnome.org/devel/gtk/">http://library.gnome.org/devel/gtk/</ulink>.
</releaseinfo> </releaseinfo>
</bookinfo> </bookinfo>
......
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
<refentry id="gtk-query-immodules-3.0"> <refentry id="gtk-query-immodules-3.0">
<refmeta> <refmeta>
<refentrytitle>gtk-query-immodules-3.0</refentrytitle> <refentrytitle>gtk-query-immodules-3.0</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
<refmiscinfo class="manual">User Commands</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>gtk-query-immodules-3.0</refname> <refname>gtk-query-immodules-3.0</refname>
<refpurpose>Input method module registration utility</refpurpose> <refpurpose>Input method module registration utility</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
...@@ -38,8 +39,8 @@ may be absolute or relative paths. ...@@ -38,8 +39,8 @@ may be absolute or relative paths.
</para> </para>
<para> <para>
Normally, the output of <command>gtk-query-immodules-3.0</command> is written Normally, the output of <command>gtk-query-immodules-3.0</command> is written
to <filename><replaceable>libdir</replaceable>gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other to <filename><replaceable>libdir</replaceable>/gtk-3.0/3.0.0/immodules.cache</filename>, where GTK+ looks for it by default. If it is written to some other
location, the environment variable <link linkend="GTK_IM_MODULE_FILE"><envar>GTK_IM_MODULE_FILE</envar></link> location, the environment variable <link linkend="gtk-im-module-file"><envar>GTK_IM_MODULE_FILE</envar></link>
can be set to point GTK+ at the file. can be set to point GTK+ at the file.
</para> </para>
</refsect1> </refsect1>
...@@ -56,7 +57,7 @@ can be set to point GTK+ at the file. ...@@ -56,7 +57,7 @@ can be set to point GTK+ at the file.
<refsect1><title>Environment</title> <refsect1><title>Environment</title>
<para> <para>
The environment variable <link linkend="GTK_PATH"><envar>GTK_PATH</envar></link> The environment variable <link linkend="gtk-path"><envar>GTK_PATH</envar></link>
can be used to prepend directories to the input method module path. can be used to prepend directories to the input method module path.
</para> </para>
</refsect1> </refsect1>
......
...@@ -5,13 +5,14 @@ ...@@ -5,13 +5,14 @@
<refentry id="gtk-update-icon-cache"> <refentry id="gtk-update-icon-cache">
<refmeta> <refmeta>
<refentrytitle>gtk-update-icon-cache</refentrytitle> <refentrytitle>gtk-update-icon-cache</refentrytitle>
<manvolnum>1</manvolnum> <manvolnum>1</manvolnum>
<refmiscinfo class="manual">User Commands</refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>gtk-update-icon-cache</refname> <refname>gtk-update-icon-cache</refname>
<refpurpose>Icon theme caching utility</refpurpose> <refpurpose>Icon theme caching utility</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <refsynopsisdiv>
...@@ -20,28 +21,29 @@ ...@@ -20,28 +21,29 @@
<arg choice="opt">--force</arg> <arg choice="opt">--force</arg>
<arg choice="opt">--ignore-theme-index</arg> <arg choice="opt">--ignore-theme-index</arg>
<arg choice="opt">--index-only</arg> <arg choice="opt">--index-only</arg>
<arg choice="opt">--source<arg>name</arg></arg> <arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
<arg choice="opt">--quiet</arg> <arg choice="opt">--quiet</arg>
<arg choice="opt">--validate</arg> <arg choice="opt">--validate</arg>
<arg choice="req">iconpath</arg> <arg choice="plain"><replaceable>PATH</replaceable></arg>
</cmdsynopsis> </cmdsynopsis>
</refsynopsisdiv> </refsynopsisdiv>
<refsect1><title>Description</title> <refsect1><title>Description</title>
<para> <para>