Go back to 2.13.0 as version for now, as there was no consensus to do the

2008-02-15  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Go back to 2.13.0 as version for now,
        as there was no consensus to do the jump.

        * many other places: Update Since: tags.



svn path=/trunk/; revision=19586

36 files changed, 325 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index e44ff69873..b7851a982c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-02-15  Matthias Clasen  <mclasen@redhat.com>
 
+	* configure.in: Go back to 2.13.0 as version for now,
+	as there was no consensus to do the jump.
+
+	* many other places: Update Since: tags.
+
+2008-02-15  Matthias Clasen  <mclasen@redhat.com>
+
 	* gtk/gtk.symbols: Add gtk_tool_shell_get_type
 
 	* gtk/gtktestutils.c: Don't generate unnecessary PLT entries
diff --git a/configure.in b/configure.in
index 240dc3e2cb..3dcf1d2b2d 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_PREREQ(2.54)
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [2])
-m4_define([gtk_minor_version], [15])
+m4_define([gtk_minor_version], [13])
 m4_define([gtk_micro_version], [0])
 m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
index c962fd305d..6ea2ac1ed3 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
@@ -148,8 +148,8 @@
   <index role="2.8">
     <title>Index of new symbols in 2.8</title>
   </index>  
-  <index role="2.16">
-    <title>Index of new symbols in 2.16</title>
+  <index role="2.14">
+    <title>Index of new symbols in 2.14</title>
   </index>  
 
   &Porting-From-Imlib;
diff --git a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
index 4b070d5d1a..8e51ce9c3c 100644
--- a/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-loading.sgml
@@ -79,3 +79,28 @@ End:
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
+<para>
+
+</para>
+
+@stream: 
+@cancellable: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_pixbuf_new_from_stream_at_scale ##### -->
+<para>
+
+</para>
+
+@stream: 
+@width: 
+@height: 
+@preserve_aspect_ratio: 
+@cancellable: 
+@error: 
+@Returns: 
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
index a6360a16c3..13c5948cfd 100644
--- a/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/file-saving.sgml
@@ -124,3 +124,17 @@ will fail with the same error.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_pixbuf_save_to_stream ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@stream: 
+@type: 
+@cancellable: 
+@error: 
+@Varargs: 
+@Returns: 
+
+
diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
index 3c67abbc71..dbacc90779 100644
--- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
+++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
@@ -567,14 +567,3 @@ End:
   </para>
 
 
-<!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
-<para>
-
-</para>
-
-@stream_length: 
-@stream: 
-@copy_pixels: 
-@error: 
-@Returns: 
-
diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index f253596262..a0f24fa3ed 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -116,8 +116,8 @@
   <index role="2.12">
     <title>Index of new symbols in 2.12</title>
   </index>  
-  <index role="2.16">
-    <title>Index of new symbols in 2.16</title>
+  <index role="2.14">
+    <title>Index of new symbols in 2.14</title>
   </index>  
 
 </book>
diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml
index 0800761820..31a09f72ae 100644
--- a/docs/reference/gdk/tmpl/colors.sgml
+++ b/docs/reference/gdk/tmpl/colors.sgml
@@ -126,7 +126,7 @@ The colormap structure contains the following public fields.
 
 @colormap: 
 @colors: 
-@ncolors: 
+@n_colors: 
 @writeable: 
 @best_match: 
 @success: 
@@ -150,7 +150,7 @@ The colormap structure contains the following public fields.
 
 @colormap: 
 @colors: 
-@ncolors: 
+@n_colors: 
 
 
 <!-- ##### FUNCTION gdk_colormap_query_color ##### -->
diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml
index 2ba253cc67..73071405cf 100644
--- a/docs/reference/gdk/tmpl/drawing.sgml
+++ b/docs/reference/gdk/tmpl/drawing.sgml
@@ -179,7 +179,7 @@ or a #GdkWindow.
 @drawable: 
 @gc: 
 @points: 
-@npoints: 
+@n_points: 
 
 
 <!-- ##### FUNCTION gdk_draw_line ##### -->
@@ -202,7 +202,7 @@ or a #GdkWindow.
 @gc: 
 @points: 
 lines.
-@npoints: 
+@n_points: 
 
 
 <!-- ##### FUNCTION gdk_draw_pixbuf ##### -->
@@ -231,7 +231,7 @@ lines.
 @drawable: 
 @gc: 
 @segs: 
-@nsegs: 
+@n_segs: 
 
 
 <!-- ##### STRUCT GdkSegment ##### -->
@@ -285,7 +285,7 @@ function.
 @gc: 
 @filled: 
 @points: 
-@npoints: 
+@n_points: 
 
 
 <!-- ##### FUNCTION gdk_draw_trapezoids ##### -->
diff --git a/docs/reference/gdk/tmpl/gdkscreen.sgml b/docs/reference/gdk/tmpl/gdkscreen.sgml
index 8bd87835d4..df081b9c84 100644
--- a/docs/reference/gdk/tmpl/gdkscreen.sgml
+++ b/docs/reference/gdk/tmpl/gdkscreen.sgml
@@ -41,6 +41,13 @@ when GDK gets multihead support.
 
 @gdkscreen: the object which received the signal.
 
+<!-- ##### SIGNAL GdkScreen::monitors-changed ##### -->
+<para>
+
+</para>
+
+@gdkscreen: the object which received the signal.
+
 <!-- ##### SIGNAL GdkScreen::size-changed ##### -->
 <para>
 
@@ -277,6 +284,36 @@ when GDK gets multihead support.
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_screen_get_monitor_height_mm ##### -->
+<para>
+
+</para>
+
+@screen: 
+@monitor_num: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_screen_get_monitor_width_mm ##### -->
+<para>
+
+</para>
+
+@screen: 
+@monitor_num: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gdk_screen_get_monitor_plug_name ##### -->
+<para>
+
+</para>
+
+@screen: 
+@monitor_num: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_screen_broadcast_client_message ##### -->
 <para>
 
diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml
index 88c4771142..6c58600217 100644
--- a/docs/reference/gdk/tmpl/regions.sgml
+++ b/docs/reference/gdk/tmpl/regions.sgml
@@ -95,7 +95,7 @@ A GdkRegion represents a set of pixels on the screen.
 </para>
 
 @points: 
-@npoints: 
+@n_points: 
 @fill_rule: 
 @Returns: 
 
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index e719044fb8..2af1f6845d 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -433,6 +433,16 @@ Since: 2.2
 @Returns: 
 
 
+<!-- ##### FUNCTION gdk_x11_screen_get_monitor_output ##### -->
+<para>
+
+</para>
+
+@screen: 
+@monitor_num: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gdk_x11_screen_lookup_visual ##### -->
 <para>
 
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index e8a05bcc67..0fd2de55b6 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -688,7 +688,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
   <index role="2.12">
     <title>Index of new symbols in 2.12</title>
   </index>  
-  <index role="2.16">
-    <title>Index of new symbols in 2.16</title>
+  <index role="2.14">
+    <title>Index of new symbols in 2.14</title>
   </index>  
 </book>
diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 3e134f8ec0..5587839084 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -3276,13 +3276,6 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de
 @tool_item: 
 @pack_end: 
 
-<!-- ##### FUNCTION gtk_tool_item_toolbar_reconfigured ##### -->
-<para>
-
-</para>
-
-@tool_item: 
-
 <!-- ##### FUNCTION gtk_trace_referencing ##### -->
 <para>
 Private: print debugging information while doing a gtk_object_ref() or 
diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml
index bcac0b38ae..230306ce23 100644
--- a/docs/reference/gtk/tmpl/gtkcalendar.sgml
+++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml
@@ -118,6 +118,16 @@ calendar.
 
 </para>
 
+<!-- ##### ARG GtkCalendar:detail-height-rows ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG GtkCalendar:detail-width-chars ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCalendar:month ##### -->
 <para>
 
@@ -133,6 +143,11 @@ calendar.
 
 </para>
 
+<!-- ##### ARG GtkCalendar:show-details ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkCalendar:show-heading ##### -->
 <para>
 
@@ -148,10 +163,30 @@ calendar.
 
 </para>
 
+<!-- ##### USER_FUNCTION GtkCalendarDetailFunc ##### -->
+<para>
+
+</para>
+
+@calendar: 
+@year: 
+@month: 
+@day: 
+@user_data: 
+@Returns: 
+
+
 <!-- ##### ENUM GtkCalendarDisplayOptions ##### -->
 <para>
 </para>
 
+@GTK_CALENDAR_SHOW_HEADING: 
+@GTK_CALENDAR_SHOW_DAY_NAMES: 
+@GTK_CALENDAR_NO_MONTH_CHANGE: 
+@GTK_CALENDAR_SHOW_WEEK_NUMBERS: 
+@GTK_CALENDAR_WEEK_START_MONDAY: 
+@GTK_CALENDAR_SHOW_DETAILS: 
+
 <!-- ##### FUNCTION gtk_calendar_new ##### -->
 <para>
 </para>
@@ -220,23 +255,70 @@ calendar.
 @flags: 
 
 
-<!-- ##### FUNCTION gtk_calendar_display_options ##### -->
+<!-- ##### FUNCTION gtk_calendar_get_date ##### -->
 <para>
 </para>
 
 @calendar: 
-@flags: 
-@Deprecated: 
+@year: 
+@month: 
+@day: 
 
 
-<!-- ##### FUNCTION gtk_calendar_get_date ##### -->
+<!-- ##### FUNCTION gtk_calendar_set_detail_func ##### -->
 <para>
+
 </para>
 
 @calendar: 
-@year: 
-@month: 
-@day: 
+@func: 
+@data: 
+@destroy: 
+
+
+<!-- ##### FUNCTION gtk_calendar_get_detail_width_chars ##### -->
+<para>
+
+</para>
+
+@calendar: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_calendar_set_detail_width_chars ##### -->
+<para>
+
+</para>
+
+@calendar: 
+@chars: 
+
+
+<!-- ##### FUNCTION gtk_calendar_get_detail_height_rows ##### -->
+<para>
+
+</para>
+
+@calendar: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_calendar_set_detail_height_rows ##### -->
+<para>
+
+</para>
+
+@calendar: 
+@rows: 
+
+
+<!-- ##### FUNCTION gtk_calendar_display_options ##### -->
+<para>
+</para>
+
+@calendar: 
+@flags: 
+@Deprecated: 
 
 
 <!-- ##### FUNCTION gtk_calendar_freeze ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 0baf505499..b6efb0c792 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -193,8 +193,8 @@ as any other #GtkHButtonBox.
 
 </para>
 
-@dialog:
-@arg1:
+@dialog: 
+@arg1: 
 
 <!-- ##### ARG GtkDialog:has-separator ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkmenuitem.sgml b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
index c405b7861b..69905a859b 100644
--- a/docs/reference/gtk/tmpl/gtkmenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkmenuitem.sgml
@@ -78,6 +78,11 @@ submenu. For normal applications, the relevant signal is "activate".
 
 </para>
 
+<!-- ##### ARG GtkMenuItem:arrow-scaling ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkMenuItem:arrow-spacing ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml
index ba13035ad9..4316b4f755 100644
--- a/docs/reference/gtk/tmpl/gtkobject.sgml
+++ b/docs/reference/gtk/tmpl/gtkobject.sgml
@@ -134,6 +134,8 @@ Tells about the state of the object.
 
 @GTK_IN_DESTRUCTION: the object is currently being destroyed. This is used 
   internally by GTK+ to prevent reinvokations during destruction.
+@GTK_FLOATING: 
+@GTK_RESERVED_1: 
 @GTK_RESERVED_2: reserved for future use
 
 <!-- ##### MACRO GTK_OBJECT_FLAGS ##### -->
diff --git a/docs/reference/gtk/tmpl/gtkpagesetup.sgml b/docs/reference/gtk/tmpl/gtkpagesetup.sgml
index 630770f6f6..7739b35866 100644
--- a/docs/reference/gtk/tmpl/gtkpagesetup.sgml
+++ b/docs/reference/gtk/tmpl/gtkpagesetup.sgml
@@ -270,6 +270,29 @@ Printing support was added in GTK+ 2.10.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_page_setup_load_file ##### -->
+<para>
+
+</para>
+
+@setup: 
+@file_name: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_page_setup_load_key_file ##### -->
+<para>
+
+</para>
+
+@setup: 
+@key_file: 
+@group_name: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_page_setup_to_file ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkprintsettings.sgml b/docs/reference/gtk/tmpl/gtkprintsettings.sgml
index 9a2f9a9203..5cf9be6fe3 100644
--- a/docs/reference/gtk/tmpl/gtkprintsettings.sgml
+++ b/docs/reference/gtk/tmpl/gtkprintsettings.sgml
@@ -882,6 +882,29 @@ only "file://" URIs.
 @Returns: 
 
 
+<!-- ##### FUNCTION gtk_print_settings_load_file ##### -->
+<para>
+
+</para>
+
+@settings: 
+@file_name: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_print_settings_load_key_file ##### -->
+<para>
+
+</para>
+
+@settings: 
+@key_file: 
+@group_name: 
+@error: 
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_print_settings_to_file ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtksettings.sgml b/docs/reference/gtk/tmpl/gtksettings.sgml
index 7d0fc9e050..23b0043756 100644
--- a/docs/reference/gtk/tmpl/gtksettings.sgml
+++ b/docs/reference/gtk/tmpl/gtksettings.sgml
@@ -153,6 +153,11 @@ Sharing settings between applications
 
 </para>
 
+<!-- ##### ARG GtkSettings:gtk-im-module ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG GtkSettings:gtk-key-theme-name ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml
index 97f0944aeb..1cd903ae59 100644
--- a/docs/reference/gtk/tmpl/gtkstyle.sgml
+++ b/docs/reference/gtk/tmpl/gtkstyle.sgml
@@ -745,7 +745,7 @@ Deprecated alias for gtk_style_apply_default_background().
 @widget: 
 @detail: 
 @points: 
-@npoints: 
+@n_points: 
 @fill: 
 
 
@@ -932,6 +932,14 @@ Deprecated alias for gtk_style_apply_default_background().
 @top: 
 @bottom: 
 
+<!-- ##### FUNCTION gtk_border_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
 <!-- ##### FUNCTION gtk_border_copy ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 030855ee96..d0e7df52bc 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -52,6 +52,8 @@ accessed through the function described below.
 @orientation: 
 @style: 
 @icon_size: 
+@tooltips: 
+@_tooltips: 
 
 <!-- ##### SIGNAL GtkToolbar::focus-home-or-end ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml
index ee97752dc7..a7a30455b0 100644
--- a/docs/reference/gtk/tmpl/gtktoolitem.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml
@@ -3,6 +3,7 @@ GtkToolItem
 
 <!-- ##### SECTION Short_Description ##### -->
 
+
 <!-- ##### SECTION Long_Description ##### -->
 <para>
 
@@ -298,3 +299,11 @@ GtkToolItem
 @tool_item: 
 
 
+<!-- ##### FUNCTION gtk_tool_item_toolbar_reconfigured ##### -->
+<para>
+
+</para>
+
+@tool_item: 
+
+
diff --git a/docs/reference/gtk/tmpl/gtktooltip.sgml b/docs/reference/gtk/tmpl/gtktooltip.sgml
index b1c3b21cbf..0640729b57 100644
--- a/docs/reference/gtk/tmpl/gtktooltip.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltip.sgml
@@ -122,6 +122,16 @@ return %TRUE to show the window, %FALSE to not show it.
 @size: 
 
 
+<!-- ##### FUNCTION gtk_tooltip_set_icon_from_icon_name ##### -->
+<para>
+
+</para>
+
+@tooltip: 
+@icon_name: 
+@size: 
+
+
 <!-- ##### FUNCTION gtk_tooltip_set_custom ##### -->
 <para>
 
diff --git a/docs/reference/libgail-util/tmpl/gailmisc.sgml b/docs/reference/libgail-util/tmpl/gailmisc.sgml
index 6e9642df9d..6cb5571f6e 100644
--- a/docs/reference/libgail-util/tmpl/gailmisc.sgml
+++ b/docs/reference/libgail-util/tmpl/gailmisc.sgml
@@ -18,6 +18,9 @@ Atk interfaces for custom widgets.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### FUNCTION gail_misc_add_attribute ##### -->
 <para>
 
diff --git a/docs/reference/libgail-util/tmpl/gailtextutil.sgml b/docs/reference/libgail-util/tmpl/gailtextutil.sgml
index 6b35c2d37b..8fb464fa92 100644
--- a/docs/reference/libgail-util/tmpl/gailtextutil.sgml
+++ b/docs/reference/libgail-util/tmpl/gailtextutil.sgml
@@ -20,6 +20,9 @@ GtkLabel, GtkCellRendererText and GtkTextview.
 
 </para>
 
+<!-- ##### SECTION Stability_Level ##### -->
+
+
 <!-- ##### STRUCT GailTextUtil ##### -->
 <para>
 The GailTextCell structure should not be accessed directly.
diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 30cffb37e2..0255cbfb40 100644
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -1290,7 +1290,7 @@ load_from_stream (GdkPixbufLoader  *loader,
  * not supported, there was not enough memory to allocate the image buffer, 
  * the stream contained invalid data, or the operation was cancelled.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 GdkPixbuf *
 gdk_pixbuf_new_from_stream_at_scale (GInputStream  *stream,
@@ -1340,7 +1340,7 @@ gdk_pixbuf_new_from_stream_at_scale (GInputStream  *stream,
  * not supported, there was not enough memory to allocate the image buffer, 
  * the stream contained invalid data, or the operation was cancelled.
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 GdkPixbuf *
 gdk_pixbuf_new_from_stream (GInputStream  *stream,
@@ -2274,7 +2274,7 @@ save_to_stream (const gchar  *buffer,
  * Returns: %TRUE if the pixbuf was saved successfully, %FALSE if an
  *     error was set.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 gboolean
 gdk_pixbuf_save_to_stream (GdkPixbuf      *pixbuf,
diff --git a/gdk/gdkapplaunchcontext.c b/gdk/gdkapplaunchcontext.c
index 5ceddaf04e..1128adb769 100644
--- a/gdk/gdkapplaunchcontext.c
+++ b/gdk/gdkapplaunchcontext.c
@@ -111,7 +111,7 @@ gdk_app_launch_context_init (GdkAppLaunchContext *context)
  * Sets the display on which applications will be launched when
  * using this context. See also gdk_app_launch_context_set_screen().
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
@@ -136,7 +136,7 @@ gdk_app_launch_context_set_display (GdkAppLaunchContext *context,
  * using this context. See also gdk_app_launch_context_set_display().
  * If both @screen and @display are set, the @screen takes priority.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
@@ -163,7 +163,7 @@ gdk_app_launch_context_set_screen (GdkAppLaunchContext *context,
  * <ulink url="http://www.freedesktop.org/Standards/wm-spec">Extended 
  * Window Manager Hints</ulink>. 
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
@@ -180,7 +180,7 @@ gdk_app_launch_context_set_desktop (GdkAppLaunchContext *context,
  * Sets the timestamp of @context. The timestamp should ideally
  * be taken from the event that triggered the launch.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
@@ -197,7 +197,7 @@ gdk_app_launch_context_set_timestamp (GdkAppLaunchContext *context,
  * Sets the icon for applications that are launched with this
  * context. See also gdk_app_launch_context_set_icon_name().
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gdk_app_launch_context_set_icon (GdkAppLaunchContext *context, 
@@ -224,7 +224,7 @@ gdk_app_launch_context_set_icon (GdkAppLaunchContext *context,
  * See also gdk_app_launch_context_set_icon(). If both @icon 
  * and @icon_name are set, the @icon_name takes priority.
  * 
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
@@ -241,7 +241,7 @@ gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
  *
  * Returns: a new #GdkAppLaunchContext
  *
- * Since: 2.16
+ * Since: 2.14
  */
 GdkAppLaunchContext *
 gdk_app_launch_context_new (void)
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 3c9a1d3dc0..69071d1942 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -539,7 +539,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  * Width of a detail cell, in characters.
  * A value of 0 allows any width. See gtk_calendar_set_detail_func().
  *
- * Since: 2.16
+ * Since: 2.14
  */
   g_object_class_install_property (gobject_class,
                                    PROP_DETAIL_WIDTH_CHARS,
@@ -555,7 +555,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  * Height of a detail cell, in rows.
  * A value of 0 allows any width. See gtk_calendar_set_detail_func().
  *
- * Since: 2.16
+ * Since: 2.14
  */
   g_object_class_install_property (gobject_class,
                                    PROP_DETAIL_HEIGHT_ROWS,
@@ -572,7 +572,7 @@ gtk_calendar_class_init (GtkCalendarClass *class)
  * available only as tooltip. When this property is set days with details are
  * marked.
  *
- * Since: 2.16
+ * Since: 2.14
  */
   g_object_class_install_property (gobject_class,
                                    PROP_SHOW_DETAILS,
@@ -3863,7 +3863,7 @@ gtk_calendar_get_date (GtkCalendar *calendar,
  * #GtkCalendar:detail-width-chars and #GtkCalendar:detail-height-rows
  * properties.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gtk_calendar_set_detail_func (GtkCalendar           *calendar,
@@ -3897,7 +3897,7 @@ gtk_calendar_set_detail_func (GtkCalendar           *calendar,
  * Updates the width of detail cells.
  * See #GtkCalendar:detail-width-chars.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gtk_calendar_set_detail_width_chars (GtkCalendar *calendar,
@@ -3925,7 +3925,7 @@ gtk_calendar_set_detail_width_chars (GtkCalendar *calendar,
  * Updates the height of detail cells.
  * See #GtkCalendar:detail-height-rows.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gtk_calendar_set_detail_height_rows (GtkCalendar *calendar,
@@ -3952,7 +3952,7 @@ gtk_calendar_set_detail_height_rows (GtkCalendar *calendar,
  * Queries the width of detail cells, in characters.
  * See #GtkCalendar:detail-width-chars.
  *
- * Since: 2.16
+ * Since: 2.14
  *
  * Return value: The width of detail cells, in characters.
  */
@@ -3970,7 +3970,7 @@ gtk_calendar_get_detail_width_chars (GtkCalendar *calendar)
  * Queries the height of detail cells, in rows.
  * See #GtkCalendar:detail-width-chars.
  *
- * Since: 2.16
+ * Since: 2.14
  *
  * Return value: The height of detail cells, in rows.
  */
diff --git a/gtk/gtkpagesetup.c b/gtk/gtkpagesetup.c
index f123bd565d..ab6a224dd3 100644
--- a/gtk/gtkpagesetup.c
+++ b/gtk/gtkpagesetup.c
@@ -482,7 +482,7 @@ gtk_page_setup_get_page_height (GtkPageSetup *setup,
  *
  * Return value: %TRUE on success
  *
- * Since: 2.16
+ * Since: 2.14
  */
 gboolean
 gtk_page_setup_load_file (GtkPageSetup *setup,
@@ -568,7 +568,7 @@ string_to_enum (GType type,
  * 
  * Return value: %TRUE on success
  *
- * Since: 2.16
+ * Since: 2.14
  */
 gboolean
 gtk_page_setup_load_key_file (GtkPageSetup *setup,
diff --git a/gtk/gtkprintsettings.c b/gtk/gtkprintsettings.c
index 74effed9be..803163de87 100644
--- a/gtk/gtkprintsettings.c
+++ b/gtk/gtkprintsettings.c
@@ -1511,7 +1511,7 @@ gtk_print_settings_set_output_bin (GtkPrintSettings *settings,
  *
  * Return value: %TRUE on success
  *
- * Since: 2.16
+ * Since: 2.14
  */
 gboolean
 gtk_print_settings_load_file (GtkPrintSettings *settings,
@@ -1574,7 +1574,7 @@ gtk_print_settings_new_from_file (const gchar  *file_name,
  *
  * Return value: %TRUE on success
  * 
- * Since: 2.16
+ * Since: 2.14
  */
 gboolean
 gtk_print_settings_load_key_file (GtkPrintSettings *settings,
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index fe122208d8..0ec086ad57 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -6441,9 +6441,10 @@ gtk_paint_resize_grip (GtkStyle           *style,
  *
  * Allocates a new #GtkBorder structure and initializes its elements to zero.
  * 
- * Returns: a new empty #GtkBorder. The newly allocated #GtkBorder should be freed
- * with gtk_border_free()
- * Since: 2.16
+ * Returns: a new empty #GtkBorder. The newly allocated #GtkBorder should be 
+ *     freed with gtk_border_free()
+ *
+ * Since: 2.14
  **/
 GtkBorder *
 gtk_border_new (void)
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index c6cbb8e776..48e1f5219e 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -1174,7 +1174,7 @@ gtk_tool_item_set_proxy_menu_item (GtkToolItem *tool_item,
  * #GtkToolbar and other #GtkToolShell implementations use this function
  * to notify children, when some aspect of their configuration changes.
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 void
 gtk_tool_item_toolbar_reconfigured (GtkToolItem *tool_item)
diff --git a/gtk/gtktoolshell.c b/gtk/gtktoolshell.c
index 2eab8bb219..1421820fb5 100644
--- a/gtk/gtktoolshell.c
+++ b/gtk/gtktoolshell.c
@@ -67,7 +67,7 @@ gtk_tool_shell_get_type (void)
  *
  * Return value: the current size for icons of @shell
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 GtkIconSize
 gtk_tool_shell_get_icon_size (GtkToolShell *shell)
@@ -85,7 +85,7 @@ gtk_tool_shell_get_icon_size (GtkToolShell *shell)
  *
  * Return value: the current orientation of @shell
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 GtkOrientation
 gtk_tool_shell_get_orientation (GtkToolShell *shell)
@@ -103,7 +103,7 @@ gtk_tool_shell_get_orientation (GtkToolShell *shell)
  *
  * Return value: the current style of @shell
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 GtkToolbarStyle
 gtk_tool_shell_get_style (GtkToolShell *shell)
@@ -120,7 +120,7 @@ gtk_tool_shell_get_style (GtkToolShell *shell)
  *
  * Return value: The relief style of buttons on @shell.
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 GtkReliefStyle
 gtk_tool_shell_get_relief_style (GtkToolShell *shell)
@@ -144,7 +144,7 @@ gtk_tool_shell_get_relief_style (GtkToolShell *shell)
  * Tool items must not call this function directly, but rely on
  * gtk_tool_item_rebuild_menu() instead.
  *
- * Since: 2.16
+ * Since: 2.14
  **/
 void
 gtk_tool_shell_rebuild_menu (GtkToolShell *shell)
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 63f9cc55cd..ec283f68ba 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -312,7 +312,7 @@ gtk_tooltip_set_icon_from_stock (GtkTooltip  *tooltip,
  * the icon indicated by @icon_name with the size indicated
  * by @size.  If @icon_name is %NULL, the image will be hidden.
  *
- * Since: 2.16
+ * Since: 2.14
  */
 void
 gtk_tooltip_set_icon_from_icon_name(GtkTooltip  *tooltip,