Mention that the second parameter of g_timer_elapsed can be NULL (#333916,

2006-03-09  Matthias Clasen  <mclasen@redhat.com>

        * glib/templ/timers.sgml: Mention that the second
        parameter of g_timer_elapsed can be NULL (#333916,
        Christian Neumair)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 226d896cbfd47e81281b933ed48c6ddbf11f51df..6af238d7812ece13803f160edda4584ce1fec5ae 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-09  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/templ/timers.sgml: Mention that the second
+       parameter of g_timer_elapsed can be NULL (#333916,
+       Christian Neumair)
+
 2006-03-07  Matthias Clasen  <mclasen@redhat.com>
 
        * ===  Released 2.10.1 ===

diff --git a/docs/reference/glib/tmpl/timers.sgml b/docs/reference/glib/tmpl/timers.sgml
index d361c9fed1bf59bc5208a635dce706d7cf68fd38..b14a8db549c285a6f35909a0dc52dbf9b9a7d5c9 100644 (file)
--- a/docs/reference/glib/tmpl/timers.sgml
+++ b/docs/reference/glib/tmpl/timers.sgml
@@ -75,9 +75,9 @@ out parameter is essentially useless.
 </para>
 
 @timer: a #GTimer.
-@microseconds: fractional part of seconds elapsed, in microseconds
-  (that is, the total number of microseconds elapsed, modulo 
-   1000000)
+@microseconds: return location for the fractional part of seconds elapsed, 
+  in microseconds (that is, the total number of microseconds elapsed, modulo 
+   1000000), or %NULL
 @Returns: seconds elapsed as a floating point value, including 
   any fractional part.