From b54e0af92f93322bb4f4469ba158771501a14486 Mon Sep 17 00:00:00 2001
From: "16:04:38  Tim Janik" <timj@gtk.org>
Date: Wed, 29 Oct 2008 15:14:29 +0000
Subject: [PATCH] Clarified/added docs for G_STRINGIFY, G_PASTE and
 G_STATIC_ASSERT, based

2008-10-29 16:04:38  Tim Janik  <timj@gtk.org>

        * glib/tmpl/macros_misc.sgml: Clarified/added docs for
        G_STRINGIFY, G_PASTE and G_STATIC_ASSERT, based on
        patches from Christian Persch and  Christian Dywan.


svn path=/trunk/; revision=7634
---
 docs/reference/ChangeLog                  |  6 ++++++
 docs/reference/glib/tmpl/macros_misc.sgml | 26 ++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 8a5c1e367..f280c2290 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-29 16:04:38  Tim Janik  <timj@gtk.org>
+
+	* glib/tmpl/macros_misc.sgml: Clarified/added docs for
+	G_STRINGIFY, G_PASTE and G_STATIC_ASSERT, based on
+	patches from Christian Persch and  Christian Dywan.
+
 2008-10-21  Alexander Larsson  <alexl@redhat.com>
 
         * gio/gio-sections.txt:
diff --git a/docs/reference/glib/tmpl/macros_misc.sgml b/docs/reference/glib/tmpl/macros_misc.sgml
index b84b5b93e..31d7c9f1a 100644
--- a/docs/reference/glib/tmpl/macros_misc.sgml
+++ b/docs/reference/glib/tmpl/macros_misc.sgml
@@ -96,12 +96,36 @@ does not include <function>string.h</function> for you.
 
 <!-- ##### MACRO G_STRINGIFY ##### -->
 <para>
-Accepts a macro or a string and converts it into a string.
+Accepts a macro or a string and converts it into a string after
+preprocessor argument expansion.
 </para>
 
 @macro_or_string: a macro or a string.
 
 
+<!-- ##### MACRO G_PASTE ##### -->
+<para>
+Yields a new preprocessor pasted identifier 'identifier1identifier2'
+from its expanded arguments 'identifier1' and 'identifier2'.
+</para>
+
+@identifier1: an identifier
+@identifier2: an identifier
+@Since: 2.20
+
+
+<!-- ##### MACRO G_STATIC_ASSERT ##### -->
+<para>
+The G_STATIC_ASSERT macro lets the programmer check a condition at compile time,
+the condition needs to be compile time computable.
+The macro can be used in any place where a <literal>typedef</literal> is valid.
+The macro should only be used once per source code line.
+</para>
+
+@expr: a constant expression.
+@Since: 2.20
+
+
 <!-- ##### MACRO G_GNUC_EXTENSION ##### -->
 <para>
 Expands to <literal>__extension__</literal> when <command>gcc</command> is