Misc doc formatting fixes

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 6edcb8b..c6b517a 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -746,7 +746,6 @@ g_static_private_free
 GThreadFunctions
 G_THREADS_ENABLED
 g_static_mutex_get_mutex_impl
-GSystemThread
 g_thread_use_default_impl
 g_threads_got_initialized
 g_thread_functions_for_glib_use

diff --git a/glib/gscanner.c b/glib/gscanner.c
index 8feb5fb..e7628f4 100644 (file)
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -180,11 +180,6 @@
 
 /**
  * GScannerConfig:
- *
- * Specifies the #GScanner parser configuration. Most settings can
- * be changed during the parsing phase and will affect the lexical
- * parsing of the next unpeeked token.
- *
  * @cset_skip_characters: specifies which characters should be skipped
  *     by the scanner (the default is the whitespace characters: space,
  *     tab, carriage-return and line-feed).
@@ -243,6 +238,10 @@
  * @scope_0_fallback: specifies if a symbol is searched for in the
  *     default scope in addition to the current scope (the default is %FALSE).
  * @store_int64:
+ *
+ * Specifies the #GScanner parser configuration. Most settings can
+ * be changed during the parsing phase and will affect the lexical
+ * parsing of the next unpeeked token.
  */
 
 /* --- defines --- */

diff --git a/glib/gthread.c b/glib/gthread.c
index e4ccdd8..b17280f 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -637,11 +637,10 @@ g_once_impl (GOnce       *once,
 
 /**
  * g_once_init_enter:
- * @value_location: location of a static initializable variable
- *     containing 0
+ * @location: location of a static initializable variable containing 0
  *
  * Function to be called when starting a critical initialization
- * section. The argument @value_location must point to a static
+ * section. The argument @location must point to a static
  * 0-initialized variable that will be set to a value other than 0 at
  * the end of the initialization section. In combination with
  * g_once_init_leave() and the unique address @value_location, it can
@@ -669,9 +668,9 @@ g_once_impl (GOnce       *once,
  * Since: 2.14
  */
 gboolean
-(g_once_init_enter) (volatile void *pointer)
+(g_once_init_enter) (volatile void *location)
 {
-  volatile gsize *value_location = pointer;
+  volatile gsize *value_location = location;
   gboolean need_init = FALSE;
   g_mutex_lock (&g_once_mutex);
   if (g_atomic_pointer_get (value_location) == NULL)
@@ -692,8 +691,7 @@ gboolean
 
 /**
  * g_once_init_leave:
- * @value_location: location of a static initializable variable
- *     containing 0
+ * @location: location of a static initializable variable containing 0
  * @result: new non-0 value for *@value_location
  *
  * Counterpart to g_once_init_enter(). Expects a location of a static
@@ -705,10 +703,10 @@ gboolean
  * Since: 2.14
  */
 void
-(g_once_init_leave) (volatile void *pointer,
+(g_once_init_leave) (volatile void *location,
                      gsize          result)
 {
-  volatile gsize *value_location = pointer;
+  volatile gsize *value_location = location;
 
   g_return_if_fail (g_atomic_pointer_get (value_location) == NULL);
   g_return_if_fail (result != 0);

diff --git a/glib/gthread.h b/glib/gthread.h
index 90008d6..fc927da 100644 (file)
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -181,7 +181,7 @@ void            g_cond_signal                   (GCond          *cond);
 void            g_cond_broadcast                (GCond          *cond);
 gboolean        g_cond_wait_until               (GCond          *cond,
                                                  GMutex         *mutex,
-                                                 gint64          abs_time);
+                                                 gint64          end_time);
 
 gpointer        g_private_get                   (GPrivate       *key);
 void            g_private_set                   (GPrivate       *key,

diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c
index 9e3bac4..b5e7dec 100644 (file)
--- a/glib/gthreadpool.c
+++ b/glib/gthreadpool.c
@@ -744,8 +744,8 @@ g_thread_pool_unprocessed (GThreadPool *pool)
  *
  * If @wait_ is %TRUE, the functions does not return before all
  * tasks to be processed (dependent on @immediate, whether all
- * or only the currently running) are ready. Otherwise the function
- * returns immediately.
+ * or only the currently running) are ready.
+ * Otherwise the function returns immediately.
  *
  * After calling this function @pool must not be used anymore.
  */