From 43d0d79cc09d3e09f462666b7776f7f9daa763ff Mon Sep 17 00:00:00 2001
From: Matthias Clasen <maclas@gmx.de>
Date: Tue, 11 Feb 2003 00:32:28 +0000
Subject: [PATCH] Document that font and fontset declarations are ignored.

2003-02-11  Matthias Clasen  <maclas@gmx.de>

	* gtk/tmpl/gtkrc.sgml: Document that font and fontset declarations
	are ignored.
---
 docs/reference/ChangeLog           |  5 +++++
 docs/reference/gtk/tmpl/gtkrc.sgml | 22 ++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 71baed8e9d..7a9d69a947 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-11  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkrc.sgml: Document that font and fontset declarations
+	are ignored.
+
 2003-02-02  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtk-docs.sgml: 
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 422748d98e..be55c5abe9 100644
--- 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>