Replace homegrown "nbsp", "hash" and "percent" entities by standard ISO

	* gtk/tmpl/gtkprogress.sgml:
	* gtk/tmpl/gtkscale.sgml:
	* gtk/tmpl/gtktreemodel.sgml:
	* gtk/tmpl/gtkimage.sgml:
	* gtk/tmpl/gtksignal.sgml:
	* gtk/tmpl/gtkrc.sgml:
	* gtk/gtk-docs.sgml:
	* gdk/gdk-docs.sgml:
	* gdk/tmpl/threads.sgml:
	* gdk/tmpl/cursors.sgml:
	* gdk/tmpl/rgb.sgml: Replace homegrown "nbsp", "hash" and
	"percent" entities by standard ISO entities "nbsp", "num" and
	"percnt".

	* gtk/text_widget.sgml: Fix a link.

13 files changed, 45 insertions, 30 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 664c4a86d..a5c304509 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,21 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkprogress.sgml: 
+	* gtk/tmpl/gtkscale.sgml: 
+	* gtk/tmpl/gtktreemodel.sgml: 
+	* gtk/tmpl/gtkimage.sgml: 
+	* gtk/tmpl/gtksignal.sgml: 
+	* gtk/tmpl/gtkrc.sgml: 
+	* gtk/gtk-docs.sgml: 
+	* gdk/gdk-docs.sgml: 
+	* gdk/tmpl/threads.sgml: 
+	* gdk/tmpl/cursors.sgml: 
+	* gdk/tmpl/rgb.sgml: Replace homegrown "nbsp", "hash" and
+	"percent" entities by standard ISO entities "nbsp", "num" and
+	"percnt".
+
+	* gtk/text_widget.sgml: Fix a link.
+
 2002-05-30  Matthias Clasen  <maclas@gmx.de>
 
 	Make stock icons appear again (patch by Gediminas Paulauskas):
diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index 8537130e4..149980211 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY hash "#">
 <!ENTITY gdk-General SYSTEM "xml/general.xml">
 <!ENTITY gdk-Bitmaps-and-Pixmaps SYSTEM "xml/pixmaps.xml">
 <!ENTITY gdk-Images SYSTEM "xml/images.xml">
diff --git a/docs/reference/gdk/tmpl/cursors.sgml b/docs/reference/gdk/tmpl/cursors.sgml
index 4a3fe375b..2bbb0c39d 100644
--- a/docs/reference/gdk/tmpl/cursors.sgml
+++ b/docs/reference/gdk/tmpl/cursors.sgml
@@ -128,8 +128,8 @@ from inline data as in the below example.
 <programlisting>
 /* This data is in X bitmap format, and can be created with the 'bitmap'
    utility. */
-&hash;define cursor1_width 16
-&hash;define cursor1_height 16
+&num;define cursor1_width 16
+&num;define cursor1_height 16
 static unsigned char cursor1_bits[] = {
    0x80, 0x01, 0x40, 0x02, 0x20, 0x04, 0x10, 0x08, 0x08, 0x10, 0x04, 0x20,
    0x82, 0x41, 0x41, 0x82, 0x41, 0x82, 0x82, 0x41, 0x04, 0x20, 0x08, 0x10,
diff --git a/docs/reference/gdk/tmpl/rgb.sgml b/docs/reference/gdk/tmpl/rgb.sgml
index 1ed2c045a..4670cd4a9 100644
--- a/docs/reference/gdk/tmpl/rgb.sgml
+++ b/docs/reference/gdk/tmpl/rgb.sgml
@@ -37,10 +37,10 @@ in cases where a "better" visual than the default is available.
 <example>
 <title>A simple example program using GdkRGB.</title>
 <programlisting>
-&hash;include &lt;gtk/gtk.h&gt;
+&num;include &lt;gtk/gtk.h&gt;
 
-&hash;define IMAGE_WIDTH	256
-&hash;define IMAGE_HEIGHT	256
+&num;define IMAGE_WIDTH	256
+&num;define IMAGE_HEIGHT	256
 
 guchar rgbbuf[IMAGE_WIDTH * IMAGE_HEIGHT * 3];
 
diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml
index 017749677..f4cbfefdc 100644
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -104,16 +104,16 @@ illustrate how to use threads within GTK+ programs.
  *
  */
 
-&hash;include &lt;stdio.h&gt;
-&hash;include &lt;stdlib.h&gt;
-&hash;include &lt;unistd.h&gt;
-&hash;include &lt;time.h&gt;
-&hash;include &lt;gtk/gtk.h&gt;
-&hash;include &lt;glib.h&gt;
-&hash;include &lt;pthread.h&gt;
-
-&hash;define YES_IT_IS    (1)
-&hash;define NO_IT_IS_NOT (0)
+&num;include &lt;stdio.h&gt;
+&num;include &lt;stdlib.h&gt;
+&num;include &lt;unistd.h&gt;
+&num;include &lt;time.h&gt;
+&num;include &lt;gtk/gtk.h&gt;
+&num;include &lt;glib.h&gt;
+&num;include &lt;pthread.h&gt;
+
+&num;define YES_IT_IS    (1)
+&num;define NO_IT_IS_NOT (0)
 
 typedef struct 
 {
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 8e99570d4..dd66214cc 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -1,8 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY hash "#">
-<!ENTITY percent "&#37;">
 <!ENTITY GtkAccelLabel SYSTEM "xml/gtkaccellabel.xml">
 <!ENTITY GtkAdjustment SYSTEM "xml/gtkadjustment.xml">
 <!ENTITY GtkAlignment SYSTEM "xml/gtkalignment.xml">
diff --git a/docs/reference/gtk/text_widget.sgml b/docs/reference/gtk/text_widget.sgml
index bb33940a8..77551f0eb 100644
--- a/docs/reference/gtk/text_widget.sgml
+++ b/docs/reference/gtk/text_widget.sgml
@@ -162,7 +162,7 @@ font and foreground color &mdash; use standard
 functions such as 
 <link linkend="gtk-widget-modify-font">gtk_widget_modify_font()</link>
 or 
-<link linkend="gtk-widget-modify-fg">gtk_widget_modify_text()</link>.
+<link linkend="gtk-widget-modify-text">gtk_widget_modify_text()</link>.
 For other attributes there are dedicated methods on 
 <link linkend="GtkTextView">GtkTextView</link> such as 
 <link linkend="gtk-text-view-set-tabs">gtk_text_view_set_tabs()</link>.
diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml
index cb473615c..68eb6ea3a 100644
--- a/docs/reference/gtk/tmpl/gtkimage.sgml
+++ b/docs/reference/gtk/tmpl/gtkimage.sgml
@@ -45,7 +45,7 @@ on the image, such as button clicks, place the image inside a
                          GdkEventButton *event,
                          gpointer        data)
   {
-    g_print ("Event box clicked at coordinates &percent;d,&percent;d\n", 
+    g_print ("Event box clicked at coordinates &percnt;d,&percnt;d\n", 
              event->x, event->y);
 
     /* Returning TRUE means we handled the event, so the signal 
diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml
index c4a7488fc..f6652bfd3 100644
--- a/docs/reference/gtk/tmpl/gtkprogress.sgml
+++ b/docs/reference/gtk/tmpl/gtkprogress.sgml
@@ -53,22 +53,22 @@ current progress.  The string can contain the following substitution characters:
 <itemizedlist>
 <listitem>
 <para>
-&percent;v - the current progress value.
+&percnt;v - the current progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-&percent;l - the lower bound for the progress value.
+&percnt;l - the lower bound for the progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-&percent;u - the upper bound for the progress value.
+&percnt;u - the upper bound for the progress value.
 </para>
 </listitem>
 <listitem>
 <para>
-&percent;p - the current progress percentage.
+&percnt;p - the current progress percentage.
 </para>
 </listitem>
 </itemizedlist>
diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index cd0fb1e59..7125ed739 100644
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -371,9 +371,9 @@ state of the widget. The states are:
 Colors can be specified as a string containing a color name (GTK+ knows
 all names from the X color database 
 <filename>/usr/lib/X11/rgb.txt</filename>),  
-in one of the hexadecimal forms <literal>&hash;rrrrggggbbbb</literal>,
-<literal>&hash;rrrgggbbb</literal>, <literal>&hash;rrggbb</literal>,
-or <literal>&hash;rgb</literal>, where <literal>r</literal>,
+in one of the hexadecimal forms <literal>&num;rrrrggggbbbb</literal>,
+<literal>&num;rrrgggbbb</literal>, <literal>&num;rrggbb</literal>,
+or <literal>&num;rgb</literal>, where <literal>r</literal>,
 <literal>g</literal> and <literal>b</literal> are
 hex digits, or they can be specified as a triplet 
 <literal>{ <replaceable>r</replaceable>, <replaceable>g</replaceable>,
diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml
index bca98aacb..8935f1164 100644
--- a/docs/reference/gtk/tmpl/gtkscale.sgml
+++ b/docs/reference/gtk/tmpl/gtkscale.sgml
@@ -121,7 +121,7 @@ static gchar*
 format_value_callback (GtkScale *scale,
                        gdouble   value)
 {
-  return g_strdup_printf ("--&gt;&percent;0.*g&lt;--",
+  return g_strdup_printf ("--&gt;&percnt;0.*g&lt;--",
                           gtk_scale_get_digits (scale), value);
 }
 </programlisting></informalexample>
diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml
index 67ecd70b0..744c9c378 100644
--- a/docs/reference/gtk/tmpl/gtksignal.sgml
+++ b/docs/reference/gtk/tmpl/gtksignal.sgml
@@ -450,7 +450,7 @@ as parameter to your function:
 <programlisting>
 static void button_clicked_int (GtkButton* button, gpointer func_data)
 {
-	g_print ("button pressed: &percent;d\n", GPOINTER_TO_INT (func_data));
+	g_print ("button pressed: &percnt;d\n", GPOINTER_TO_INT (func_data));
 }
 
 /* By calling this function, you will make the g_print above
diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml
index ebc39533c..6fc6e39c1 100644
--- a/docs/reference/gtk/tmpl/gtktreemodel.sgml
+++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml
@@ -177,7 +177,7 @@ enum
                           -1);
 
       /* Do something with the data */
-      g_print ("Row &percent;d: (&percent;s,&percent;d)\n", row_count, str_data, int_data);
+      g_print ("Row &percnt;d: (&percnt;s,&percnt;d)\n", row_count, str_data, int_data);
       g_free (str_data);
 
       row_count ++;