2.17.4GLIB_2_17_4

svn path=/trunk/; revision=7234

5 files changed, 73 insertions, 40 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 91a6fc4b4..aa136151f 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-21  Matthias Clasen  <mclasen2redhat.com>
+
+	* === Released 2.17.4 ===
+
 2008-07-18  Matthias Clasen  <mclasen@redhat.com>
 
 	* gobject/gobject-sections.txt: Add new signal api.
diff --git a/docs/reference/glib/tmpl/i18n.sgml b/docs/reference/glib/tmpl/i18n.sgml
index b9ce778e1..1fd69bd42 100644
--- a/docs/reference/glib/tmpl/i18n.sgml
+++ b/docs/reference/glib/tmpl/i18n.sgml
@@ -115,6 +115,40 @@ To get the translated string, call gettext() at runtime.
 @Since: 2.4
 
 
+<!-- ##### MACRO NC_ ##### -->
+<para>
+Only marks a string for translation, with context.
+This is useful in situations where the translated strings can't
+be directly used, e.g. in string array initializers. 
+To get the translated string, you should call g_dpgettext2() at runtime.
+</para>
+|[
+     {
+       static const char *messages[] = {
+         NC_("some context", "some very meaningful message"),
+         NC_("some context", "and another one")
+       };
+       const char *string;
+       ...
+       string
+         = index &gt; 1 ? g_dpgettext2 (NULL, "some context", "a default message") : g_dpgettext2 (NULL, "some context", messages[index]);
+<!-- -->     
+       fputs (string);
+       ...
+     }
+]|
+
+<note><para>
+If you are using the NC_() macro, you need to make sure that you
+pass <option>--keyword=NC_:1c,2</option> to xgettext when extracting
+messages. Note that this only works with GNU gettext >= 0.15.
+</para></note>
+
+@Context: a message context, must be a string literal
+@String: a message id, must be a string literal
+@Since: 2.18
+
+
 <!-- ##### FUNCTION g_dgettext ##### -->
 <para>
 
@@ -148,39 +182,15 @@ To get the translated string, call gettext() at runtime.
 @Returns: 
 
 
-<!-- ##### MACRO NC_ ##### -->
+<!-- ##### FUNCTION g_dpgettext2 ##### -->
 <para>
-Only marks a string for translation, with context.
-This is useful in situations where the translated strings can't
-be directly used, e.g. in string array initializers. 
-To get the translated string, you should call g_dpgettext2() at runtime.
-</para>
-|[
-     {
-       static const char *messages[] = {
-         NC_("some context", "some very meaningful message"),
-         NC_("some context", "and another one")
-       };
-       const char *string;
-       ...
-       string
-         = index &gt; 1 ? g_dpgettext2 (NULL, "some context", "a default message") : g_dpgettext2 (NULL, "some context", messages[index]);
-<!-- -->     
-       fputs (string);
-       ...
-     }
-]|
-
-<note><para>
-If you are using the NC_() macro, you need to make sure that you
-pass <option>--keyword=NC_:1c,2</option> to xgettext when extracting
-messages. Note that this only works with GNU gettext >= 0.15.
-</para></note>
 
+</para>
 
-@Context: a message context, must be a string literal
-@String: a message id, must be a string literal
-@Since: 2.18
+@domain: 
+@context: 
+@msgid: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_strip_context ##### -->
diff --git a/docs/reference/glib/tmpl/markup.sgml b/docs/reference/glib/tmpl/markup.sgml
index b02511f4b..f6a6064ea 100644
--- a/docs/reference/glib/tmpl/markup.sgml
+++ b/docs/reference/glib/tmpl/markup.sgml
@@ -267,6 +267,25 @@ g_markup_parse_context_parse() will report that error back to its caller.
 @Returns: 
 
 
+<!-- ##### FUNCTION g_markup_parse_context_push ##### -->
+<para>
+
+</para>
+
+@context: 
+@parser: 
+@user_data: 
+
+
+<!-- ##### FUNCTION g_markup_parse_context_pop ##### -->
+<para>
+
+</para>
+
+@context: 
+@Returns: 
+
+
 <!-- ##### ENUM GMarkupCollectType ##### -->
 <para>
 
diff --git a/docs/reference/glib/tmpl/string_utils.sgml b/docs/reference/glib/tmpl/string_utils.sgml
index 1e26e8027..4a0552306 100644
--- a/docs/reference/glib/tmpl/string_utils.sgml
+++ b/docs/reference/glib/tmpl/string_utils.sgml
@@ -141,6 +141,16 @@ The returned string should be freed when no longer needed.
 @Returns: 
 
 
+<!-- ##### FUNCTION g_strcmp0 ##### -->
+<para>
+
+</para>
+
+@str1: 
+@str2: 
+@Returns: 
+
+
 <!-- ##### FUNCTION g_strlcpy ##### -->
 <para>
 Portability wrapper that calls strlcpy() on systems which have it, and emulates
diff --git a/docs/reference/glib/tmpl/testing.sgml b/docs/reference/glib/tmpl/testing.sgml
index 2b7d052ce..12a132832 100644
--- a/docs/reference/glib/tmpl/testing.sgml
+++ b/docs/reference/glib/tmpl/testing.sgml
@@ -515,16 +515,6 @@ and @n2.
 @Since: 2.16
 
 
-<!-- ##### FUNCTION g_strcmp0 ##### -->
-<para>
-
-</para>
-
-@str1: 
-@str2: 
-@Returns: 
-
-
 <!-- ##### TYPEDEF GTestCase ##### -->
 <para>
 An opaque structure representing a test case.