From 1b3f21e870fe4d0ce388cb4672ff417aa9264fb6 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <maclas@gmx.de>
Date: Fri, 3 Jan 2003 22:50:40 +0000
Subject: [PATCH] Update description of priorities for styles and bindings.
 (#98054)

2003-01-03  Matthias Clasen  <maclas@gmx.de>

	* gtk/tmpl/gtkrc.sgml: Update description of priorities for styles
	and bindings.  (#98054)
---
 docs/reference/ChangeLog           |  5 +++
 docs/reference/gtk/tmpl/gtkrc.sgml | 56 ++++++++++++++++--------------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 90efdb39fd..5e1a71ceff 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-03  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkrc.sgml: Update description of priorities for styles
+	and bindings.  (#98054)
+
 2002-12-31  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtkrc.sgml: Add a note about gtkrc-2.0 being parsed by
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 55ff8b7d83..3c46185e23 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -95,6 +95,28 @@ but also #GtkToggleButton and
 #GtkCheckButton widgets, since
 those classes derive from #GtkButton.
 </para>
+<para>
+Additionally, a priority can be specified for each pattern, and styles 
+override other styles first by priority, then by pattern type and then 
+by order of specification (later overrides earlier). The priorities 
+that can be specified are (highest to lowest):
+<simplelist>
+<member><literal>highest</literal></member>
+<member><literal>rc</literal></member>
+<member><literal>theme</literal></member>
+<member><literal>application</literal></member>
+<member><literal>gtk</literal></member>
+<member><literal>lowest</literal></member>
+</simplelist>
+<literal>rc</literal> is the default for styles
+read from an RC file, <literal>theme</literal>
+is the default for styles read from theme RC files,
+<literal>application</literal> 
+should be used for styles an application sets
+up, and <literal>gtk</literal> is used for styles
+that GTK+ creates internally.
+</para>
+
 </refsect2>
 
 <refsect2><title>Toplevel declarations</title>
@@ -118,7 +140,7 @@ The possible toplevel declarations are:
   </varlistentry>
   <varlistentry>
     <term><literal>class <replaceable>pattern</replaceable> 
-          [ style | binding [ : <replaceable>priority</replaceable> ]]
+          [ style | binding ][ : <replaceable>priority</replaceable> ]
           <replaceable>name</replaceable></literal></term>
     <listitem>
      <para>Specifies a style or binding set for a particular
@@ -163,7 +185,7 @@ The possible toplevel declarations are:
   </varlistentry>
   <varlistentry>
     <term><literal>widget <replaceable>pattern</replaceable> 
-          [ style | binding [ : <replaceable>priority</replaceable> ]]
+          [ style | binding ][ : <replaceable>priority</replaceable> ]
           <replaceable>name</replaceable></literal></term>
     <listitem>
      <para>Specifies a style or binding set for a particular
@@ -172,7 +194,7 @@ The possible toplevel declarations are:
   </varlistentry>
   <varlistentry>
     <term><literal>widget_class <replaceable>pattern</replaceable> 
-          [ style | binding [ : <replaceable>priority</replaceable> ]]
+          [ style | binding ][ : <replaceable>priority</replaceable> ]
           <replaceable>name</replaceable></literal></term>
     <listitem>
      <para>Specifies a style or binding set for a particular
@@ -506,29 +528,11 @@ parameters of the signal.
 </para>
 
 <para>
-Binding sets are connected to widgets in the
-same manner as styles, with one addition. 
-A priority can be specified for each pattern,
-and within each type of pattern, binding sets
-override other binding sets first by priority,
-and only then by order of specification. (Later
-overrides earlier). The priorities that can
-be specified are (highest to lowest):
-<simplelist>
-<member><literal>highest</literal></member>
-<member><literal>rc</literal></member>
-<member><literal>theme</literal></member>
-<member><literal>application</literal></member>
-<member><literal>gtk</literal></member>
-<member><literal>lowest</literal></member>
-</simplelist>
-<literal>rc</literal> is the default for bindings
-read from an RC file, <literal>theme</literal>
-is the default for bindings read from theme RC files,
-<literal>application</literal> 
-should be used for bindings an application sets
-up, and <literal>gtk</literal> is used for bindings
-that GTK+ creates internally.
+Binding sets are connected to widgets in the same manner as styles, 
+with one difference: Binding sets override other binding sets first 
+by pattern type, then by priority and then by order of specification.
+The priorities that can be specified and their default values are the 
+same as for styles.
 </para>
 </refsect2>