From f5aa73e6ae41144018afcda945478248bc02ad8d Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Sat, 29 Nov 2008 07:29:25 +0000
Subject: [PATCH] better deprecation annotation

svn path=/trunk/; revision=21821
---
 docs/reference/ChangeLog              | 1 +
 docs/reference/gtk/tmpl/gtklabel.sgml | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 485d5a38da..a3fc712c53 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,6 @@
 2008-11-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/tmpl/gtklabel.sgml:
 	* gtk/tmpl/gtkdrawingarea.sgml:
 	* gtk/tmpl/gtkcheckmenuitem.sgml:
 	* gtk/tmpl/gtkcalendar.sgml: 
diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index 7841c63121..c7bc6f3603 100644
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -394,6 +394,7 @@ must not write to it.
 
 @label: The #GtkLabel widget you want to get the text from.
 @str: The reference to the pointer you want to point to the text.
+@Deprecated: Use gtk_label_get_text() instead.
 
 
 <!-- ##### FUNCTION gtk_label_parse_uline ##### -->
@@ -408,7 +409,7 @@ probably only used within the GTK+ library itself for menu items and such.
 @label: The #GtkLabel you want to affect.
 @string: The string you want to parse for underlines.
 @Returns: The lowercase keyval of the last character underlined.
-
+@Deprecated: Use gtk_label_set_use_underline() instead.
 
 <!-- ##### FUNCTION gtk_label_set_line_wrap ##### -->
 <para>
@@ -430,10 +431,10 @@ probably only used within the GTK+ library itself for menu items and such.
 
 <!-- ##### MACRO gtk_label_set ##### -->
 <para>
-Aliases gtk_label_set_text().  Probably used for backward compatibility with
-GTK+ 1.0.x.
+Sets the text within the GtkLabel widget.
 </para>
 
+@Deprecated: Use gtk_label_set_text() instead.
 
 
 <!-- ##### FUNCTION gtk_label_get_layout_offsets ##### -->