Replace homegrown "hash" entity by standard ISO entity "num".

	* glib/gwin32.c (g_win32_get_package_installation_directory):
	Replace homegrown "hash" entity by standard ISO entity "num".

	* gobject/gobject-docs.sgml:
	* glib/glib-docs.sgml:
	* glib/tmpl/macros.sgml:
	* glib/tmpl/string_utils.sgml: Replace homegrown "nbsp", "hash"
	and "percent" entities by standard ISO entities "nbsp", "num" and
	"percnt".

diff --git a/ChangeLog b/ChangeLog
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 164b9e4d63f132ef30b1afc6c41bf7183f758c27..45b6f773a0d466daaf3b955d9b21f213602b7bfd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * glib/gwin32.c (g_win32_get_package_installation_directory):
+       Replace homegrown "hash" entity by standard ISO entity "num".
+
 2002-05-26  Matthias Clasen  <maclas@gmx.de>
 
        * glib/gmain.c: Remove references to nonexisting functions 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index ead47bfd33107cbe763febbd3a69397085ecdd17..02573bdc8efd7bb9aa75dfb06c1d1e981d1c8872 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-03  Matthias Clasen  <maclas@gmx.de>
+
+       * gobject/gobject-docs.sgml: 
+       * glib/glib-docs.sgml: 
+       * glib/tmpl/macros.sgml: 
+       * glib/tmpl/string_utils.sgml: Replace homegrown "nbsp", "hash"
+       and "percent" entities by standard ISO entities "nbsp", "num" and
+       "percnt". 
+
 2002-05-30  Matthias Clasen  <maclas@gmx.de>
 
        * glib/tmpl/string_utils.sgml: 

diff --git a/docs/reference/glib/glib-docs.sgml b/docs/reference/glib/glib-docs.sgml
index 444d61e04270cf0ffc793ed70b8a3e2021649bd8..5453710c2285d71edaba857557de4b8f6e0692b8 100644 (file)
--- a/docs/reference/glib/glib-docs.sgml
+++ b/docs/reference/glib/glib-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 nbsp "&#x00a0;">
-<!ENTITY hash "#">
 <!ENTITY glib-Basic-Types SYSTEM "xml/types.xml">
 <!ENTITY glib-Limits-of-Basic-Types SYSTEM "xml/limits.xml">
 <!ENTITY glib-Standard-Macros SYSTEM "xml/macros.xml">

diff --git a/docs/reference/glib/tmpl/macros.sgml b/docs/reference/glib/tmpl/macros.sgml
index 6e3f12a5aaae666286abf4a1ae1eea1ba2827c17..6ccb903c721fe6c93e615bd31cc2c6d44d187366 100644 (file)
--- a/docs/reference/glib/tmpl/macros.sgml
+++ b/docs/reference/glib/tmpl/macros.sgml
@@ -38,7 +38,7 @@ The micro version number of the GLib library.
 <!-- ##### MACRO G_OS_WIN32 ##### -->
 <para>
 This macro is defined only on Windows. So you can bracket
-Windows-specific code in "&hash;ifdef G_OS_WIN32".
+Windows-specific code in "&num;ifdef G_OS_WIN32".
 </para>
 
 
@@ -46,7 +46,7 @@ Windows-specific code in "&hash;ifdef G_OS_WIN32".
 <!-- ##### MACRO G_OS_BEOS ##### -->
 <para>
 This macro is defined only on BeOS. So you can bracket
-BeOS-specific code in "&hash;ifdef G_OS_BEOS".
+BeOS-specific code in "&num;ifdef G_OS_BEOS".
 </para>
 
 
@@ -54,7 +54,7 @@ BeOS-specific code in "&hash;ifdef G_OS_BEOS".
 <!-- ##### MACRO G_OS_UNIX ##### -->
 <para>
 This macro is defined only on UNIX. So you can bracket
-UNIX-specific code in "&hash;ifdef G_OS_UNIX".
+UNIX-specific code in "&num;ifdef G_OS_UNIX".
 </para>
 
 

diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml
index a7d97040a20a96d0accfc247c4787a5417fa2ac4..bbc32cce8cea7cefd12989c0224f04c16a773581 100644 (file)
--- a/docs/reference/glib/tmpl/string_utils.sgml
+++ b/docs/reference/glib/tmpl/string_utils.sgml
@@ -643,7 +643,7 @@ The typical usage would be something like:
 <informalexample><programlisting>
   char buf[G_ASCII_DTOSTR_BUF_SIZE];
 
-  fprintf (out, "value=&percent;s\n", g_ascii_dtostr (buf, sizeof (buf), value));
+  fprintf (out, "value=&percnt;s\n", g_ascii_dtostr (buf, sizeof (buf), value));
 </programlisting></informalexample>
 </para>
 

diff --git a/docs/reference/gobject/gobject-docs.sgml b/docs/reference/gobject/gobject-docs.sgml
index 434be968dc97bb4a28fa0a63d0f5c822cf5a6183..9dd4e019d66346d92fa938040ef118845f5df7f2 100644 (file)
--- a/docs/reference/gobject/gobject-docs.sgml
+++ b/docs/reference/gobject/gobject-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 nbsp "&#x00a0;">
 <!ENTITY gobject-GType SYSTEM "xml/gtype.xml">
 <!ENTITY gobject-GTypePlugin SYSTEM "xml/gtypeplugin.xml">
 <!ENTITY gobject-GTypeModule SYSTEM "xml/gtypemodule.xml">

diff --git a/glib/gwin32.c b/glib/gwin32.c
index 16a645efa676900c4499001165d15adea6ddfe79..796041781528ae0b824dfb15521cae60c0c21b5c 100644 (file)
--- a/glib/gwin32.c
+++ b/glib/gwin32.c
@@ -632,8 +632,8 @@ get_package_directory_from_module (gchar *module_name)
  * is the same identifier as used for
  * <literal>GETTEXT_PACKAGE</literal> in software configured according
  * to GNU standards. The function first looks in the Windows Registry
- * for the value <literal>&hash;InstallationDirectory</literal> in the key
- * <literal>&hash;HKLM\Software\@package</literal>, and if that value
+ * for the value <literal>&num;InstallationDirectory</literal> in the key
+ * <literal>&num;HKLM\Software\@package</literal>, and if that value
  * exists and is a string, returns that.
  *
  * If @package is %NULL, or the above value isn't found in the