[glib/glib-2-26] bump version to 2.25.18

[Ryan Lortie <ryanl src gnome org>]

commit 0ac4e9899bb9d8b424b365b416cdb74365eeef48
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Sep 18 15:48:31 2010 -0400

    bump version to 2.25.18

 configure.ac                              |    2 +-
 docs/reference/glib/tmpl/glib-unused.sgml |   40 ----------------------------
 docs/reference/glib/tmpl/messages.sgml    |   27 +++++++++++++++----
 docs/reference/glib/tmpl/version.sgml     |   41 +++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 47 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a821267..8f65df7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ m4_define(glib_configure_ac)
 #
 m4_define([glib_major_version], [2])
 m4_define([glib_minor_version], [25])
-m4_define([glib_micro_version], [17])
+m4_define([glib_micro_version], [18])
 m4_define([glib_interface_age], [0])
 m4_define([glib_binary_age],
           [m4_eval(100 * glib_minor_version + glib_micro_version)])
diff --git a/docs/reference/glib/tmpl/glib-unused.sgml b/docs/reference/glib/tmpl/glib-unused.sgml
index 3d551f7..7b57189 100644
--- a/docs/reference/glib/tmpl/glib-unused.sgml
+++ b/docs/reference/glib/tmpl/glib-unused.sgml
@@ -937,46 +937,6 @@ Turns the argument into a string literal by using the '#' stringizing operator.
 </para>
 
 
-<!-- ##### VARIABLE glib_binary_age ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### FUNCTION glib_check_version ##### -->
-<para>
-
-</para>
-
- required_major: 
- required_minor: 
- required_micro: 
- Returns: 
-
-<!-- ##### VARIABLE glib_interface_age ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_major_version ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_micro_version ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### VARIABLE glib_minor_version ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO lseek ##### -->
 <para>
 
diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml
index 2c4e8d8..245a775 100644
--- a/docs/reference/glib/tmpl/messages.sgml
+++ b/docs/reference/glib/tmpl/messages.sgml
@@ -117,15 +117,18 @@ documentation.
 @args: the parameters to insert into the format string.
 
 
-<!-- ##### MACRO g_message ##### -->
+<!-- ##### FUNCTION g_message ##### -->
 <para>
 A convenience function/macro to log a normal message.
 </para>
 
+ format: 
+ Varargs: 
+<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### MACRO g_warning ##### -->
+<!-- ##### FUNCTION g_warning ##### -->
 <para>
 A convenience function/macro to log a warning message.
 </para>
@@ -135,10 +138,13 @@ You can make warnings fatal at runtime by setting the %G_DEBUG environment
 variable (see <ulink url="glib-running.html">Running GLib Applications</ulink>).
 </para>
 
+ format: 
+ Varargs: 
+<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### MACRO g_critical ##### -->
+<!-- ##### FUNCTION g_critical ##### -->
 <para>
 Logs a "critical warning" (#G_LOG_LEVEL_CRITICAL). It's more or less
 application-defined what constitutes a critical vs. a regular
@@ -153,10 +159,13 @@ the %G_DEBUG environment variable (see
 <ulink url="glib-running.html">Running GLib Applications</ulink>).
 </para>
 
+ format: 
+ Varargs: 
+<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### MACRO g_error ##### -->
+<!-- ##### FUNCTION g_error ##### -->
 <para>
 A convenience function/macro to log an error message.
 Error messages are always fatal, resulting in a call to
@@ -166,16 +175,22 @@ expect. Using this function indicates a bug in your program, i.e. an
 assertion failure.
 </para>
 
+ format: 
+ Varargs: 
+<!-- # Unused Parameters # -->
 @...: format string, followed by parameters to insert into the format string (as with printf())
 
 
-<!-- ##### MACRO g_debug ##### -->
+<!-- ##### FUNCTION g_debug ##### -->
 <para>
 A convenience function/macro to log a debug message.
 </para>
 
-    : format string, followed by parameters to insert into the format string (as with printf())
+ format: 
+ Varargs: 
 @Since: 2.6
+<!-- # Unused Parameters # -->
+    : format string, followed by parameters to insert into the format string (as with printf())
 
 
 <!-- ##### FUNCTION g_log_set_handler ##### -->
diff --git a/docs/reference/glib/tmpl/version.sgml b/docs/reference/glib/tmpl/version.sgml
index dca4ac9..027a0f4 100644
--- a/docs/reference/glib/tmpl/version.sgml
+++ b/docs/reference/glib/tmpl/version.sgml
@@ -22,6 +22,47 @@ typically use the features described here.
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### VARIABLE glib_major_version ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_minor_version ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_micro_version ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_binary_age ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### VARIABLE glib_interface_age ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION glib_check_version ##### -->
+<para>
+
+</para>
+
+ required_major: 
+ required_minor: 
+ required_micro: 
+ Returns: 
+
+
 <!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
 <para>
 The major version number of the GLib library.