Add two more folder modes to the enum.

[~andy/gtk] / docs / reference / gtk / tmpl / gtkrc.sgml

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 3c46185e23ee276b0d610c64a2e33657225b090e..e5b5f73c961ee5b47bfbeadff10fba27e6f3dd8f 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -281,9 +281,8 @@ elements are:
     <term><literal>font = <replaceable>font</replaceable></literal></term>
      <listitem>
        <para>
-         Sets the font for a widget. <replaceable>font</replaceable> must be
-         a XLFD font description, e.g. 
-         <literal>"-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*"</literal>.
+         Starting with GTK+ 2.0, the "font" and "fontset"
+         declarations are ignored; use "font_name" declarations instead.
        </para>
      </listitem>
   </varlistentry>
@@ -291,13 +290,8 @@ elements are:
     <term><literal>fontset = <replaceable>font</replaceable></literal></term>
      <listitem>
        <para>
-         Sets the fontset for a widget. Overrides any
-         <literal>font</literal> declarations. <replaceable>font</replaceable> 
-         must be a comma-separated list of XLFD font descriptions, e.g.
-         <literal>"-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-240,
-                   -JIS-Fixed-Medium-R-Normal--26-180-100-100-C-120,
-                   -GB-Fixed-Medium-R-Normal--26-180-100-100-C-240,
-                   -Adobe-Courier-Bold-R-Normal--25-180-100-100-M-150"</literal>.
+         Starting with GTK+ 2.0, the "font" and "fontset"
+         declarations are ignored; use "font_name" declarations instead.
        </para>
      </listitem>
   </varlistentry>
@@ -305,10 +299,10 @@ elements are:
     <term><literal>font_name = <replaceable>font</replaceable></literal></term>
      <listitem>
        <para>
-         Sets the font for a widget. Overrides any
-         <literal>font</literal> or <literal>fontset</literal> declarations. 
-         <replaceable>font</replaceable> must be a Pango font name, e.g.
-         <literal>"Sans Italic 10"</literal>.
+         Sets the font for a widget. <replaceable>font</replaceable> must be 
+         a Pango font name, e.g. <literal>"Sans Italic 10"</literal>. 
+         For details about Pango font names, see 
+         pango_font_description_from_string().
        </para>
      </listitem>   
   </varlistentry>
@@ -410,14 +404,18 @@ hex digits, or they can be specified as a triplet
 <literal>{ <replaceable>r</replaceable>, <replaceable>g</replaceable>,
 <replaceable>b</replaceable>}</literal>, where <literal>r</literal>,
 <literal>g</literal> and <literal>b</literal> are either integers in 
-the range 0-65635 or floats in the range 0.0-1.0.
+the range 0-65535 or floats in the range 0.0-1.0.
 </para>
 
 <para>
 In a <literal>stock</literal> definition, icon sources are specified as a
-4-tuple of image filename, text direction, widget state, and size, in that
-order.  Each icon source specifies an image filename to use with a given
-direction, state, and size. The <literal>*</literal> character can be used as a
+4-tuple of image filename or icon name, text direction, widget state, and size, in that
+order.  Each icon source specifies an image filename or icon name to use with a given
+direction, state, and size. Filenames are specified as a string such
+as <literal>"itemltr.png"</literal>, while icon names (looked up
+in the current icon theme), are specified with a leading
+<literal>@</literal>, such as <literal>@"item-ltr"</literal>.
+The <literal>*</literal> character can be used as a
 wildcard, and if direction/state/size are omitted they default to
 <literal>*</literal>. So for example, the following specifies different icons to
 use for left-to-right and right-to-left languages:
@@ -723,6 +721,14 @@ Parses resource information directly from a string.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_rc_reset_styles ##### -->
+<para>
+
+</para>
+
+@settings: 
+
+
 <!-- ##### FUNCTION gtk_rc_add_default_file ##### -->
 <para>
 </para>