From be247c24c6b532b2acfe52424ffdcc79bdc48bf4 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Sun, 11 Jul 2010 12:51:33 -0400
Subject: [PATCH] This is glib 2.25.11

---
 NEWS                                            |  1 +
 docs/reference/glib/tmpl/atomic_operations.sgml | 42 ++++++++++++++-----------
 docs/reference/glib/tmpl/bookmarkfile.sgml      | 16 +++++-----
 docs/reference/glib/tmpl/conversions.sgml       | 22 -------------
 docs/reference/glib/tmpl/numerical.sgml         | 10 ++++++
 5 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/NEWS b/NEWS
index 8e7bc1c..6f03215 100644
--- a/NEWS
+++ b/NEWS
@@ -148,6 +148,7 @@ Tests:
 Updated translations:
  Galician
  Hebrew
+ Norwegian bokmål
  Spanish
 
 Overview of Changes from GLib 2.25.9 to GLib 2.25.10
diff --git a/docs/reference/glib/tmpl/atomic_operations.sgml b/docs/reference/glib/tmpl/atomic_operations.sgml
index 81e5f5a..ff54548 100644
--- a/docs/reference/glib/tmpl/atomic_operations.sgml
+++ b/docs/reference/glib/tmpl/atomic_operations.sgml
@@ -25,7 +25,8 @@ Atomic Operations
 
 </para>
 
-@atomic:
+@atomic: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_atomic_int_set ##### -->
@@ -33,8 +34,8 @@ Atomic Operations
 
 </para>
 
-@atomic:
-@newval:
+@atomic: 
+@newval: 
 
 
 <!-- ##### FUNCTION g_atomic_int_add ##### -->
@@ -42,8 +43,8 @@ Atomic Operations
 
 </para>
 
-@atomic:
-@val:
+@atomic: 
+@val: 
 
 
 <!-- ##### FUNCTION g_atomic_int_exchange_and_add ##### -->
@@ -51,8 +52,9 @@ Atomic Operations
 
 </para>
 
-@atomic:
-@val:
+@atomic: 
+@val: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_atomic_int_compare_and_exchange ##### -->
@@ -60,9 +62,10 @@ Atomic Operations
 
 </para>
 
-@atomic:
-@oldval:
-@newval:
+@atomic: 
+@oldval: 
+@newval: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_atomic_pointer_get ##### -->
@@ -70,7 +73,8 @@ Atomic Operations
 
 </para>
 
-@atomic:
+@atomic: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_atomic_pointer_set ##### -->
@@ -78,8 +82,8 @@ Atomic Operations
 
 </para>
 
-@atomic:
-@newval:
+@atomic: 
+@newval: 
 
 
 <!-- ##### FUNCTION g_atomic_pointer_compare_and_exchange ##### -->
@@ -87,9 +91,10 @@ Atomic Operations
 
 </para>
 
-@atomic:
-@oldval:
-@newval:
+@atomic: 
+@oldval: 
+@newval: 
+@Returns: 
 
 
 <!-- ##### FUNCTION g_atomic_int_inc ##### -->
@@ -97,7 +102,7 @@ Atomic Operations
 
 </para>
 
-@atomic:
+@atomic: 
 
 
 <!-- ##### FUNCTION g_atomic_int_dec_and_test ##### -->
@@ -105,6 +110,7 @@ Atomic Operations
 
 </para>
 
-@atomic:
+@atomic: 
+@Returns: 
 
 
diff --git a/docs/reference/glib/tmpl/bookmarkfile.sgml b/docs/reference/glib/tmpl/bookmarkfile.sgml
index 163eabf..d6da84b 100644
--- a/docs/reference/glib/tmpl/bookmarkfile.sgml
+++ b/docs/reference/glib/tmpl/bookmarkfile.sgml
@@ -38,14 +38,14 @@ Bookmark file parser
 
 </para>
 
-@G_BOOKMARK_FILE_ERROR_INVALID_URI:
-@G_BOOKMARK_FILE_ERROR_INVALID_VALUE:
-@G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED:
-@G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND:
-@G_BOOKMARK_FILE_ERROR_READ:
-@G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING:
-@G_BOOKMARK_FILE_ERROR_WRITE:
-@G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND:
+@G_BOOKMARK_FILE_ERROR_INVALID_URI: 
+@G_BOOKMARK_FILE_ERROR_INVALID_VALUE: 
+@G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED: 
+@G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND: 
+@G_BOOKMARK_FILE_ERROR_READ: 
+@G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING: 
+@G_BOOKMARK_FILE_ERROR_WRITE: 
+@G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND: 
 
 <!-- ##### FUNCTION g_bookmark_file_new ##### -->
 <para>
diff --git a/docs/reference/glib/tmpl/conversions.sgml b/docs/reference/glib/tmpl/conversions.sgml
index 3bfad72..af4b368 100644
--- a/docs/reference/glib/tmpl/conversions.sgml
+++ b/docs/reference/glib/tmpl/conversions.sgml
@@ -300,28 +300,6 @@ error domains.
 @Returns: 
 
 
-<!-- ##### FUNCTION g_filename_from_uri ##### -->
-<para>
-
-</para>
-
-@uri: 
-@hostname: 
-@error: 
-@Returns: 
-
-
-<!-- ##### FUNCTION g_filename_to_uri ##### -->
-<para>
-
-</para>
-
-@filename: 
-@hostname: 
-@error: 
-@Returns: 
-
-
 <!-- ##### FUNCTION g_get_filename_charsets ##### -->
 <para>
 
diff --git a/docs/reference/glib/tmpl/numerical.sgml b/docs/reference/glib/tmpl/numerical.sgml
index 30b7b54..ebb9589 100644
--- a/docs/reference/glib/tmpl/numerical.sgml
+++ b/docs/reference/glib/tmpl/numerical.sgml
@@ -20,9 +20,17 @@ supported (used for storage) by at least Intel, PPC and Sparc. See
 for more information about IEEE number formats.
 </para>
 
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### MACRO G_IEEE754_FLOAT_BIAS ##### -->
 <para>
 The bias by which exponents in single-precision floats are offset.
@@ -109,3 +117,5 @@ The square root of two.
 Multiplying the base 2 exponent by this number yields the base 10 exponent.
 </para>
 
+
+
-- 
2.7.4