Make 3.0 parallel-installable to 2.x

[~andy/gtk] / docs / reference / gtk / tmpl / gtklabel.sgml

diff --git a/docs/reference/gtk/tmpl/gtklabel.sgml b/docs/reference/gtk/tmpl/gtklabel.sgml
index ac44baa5d826869992d989c587df7e3356296c3c..0740e5f4afff157cd6cd7a8d4b3a03d4f1315583 100644 (file)
--- a/docs/reference/gtk/tmpl/gtklabel.sgml
+++ b/docs/reference/gtk/tmpl/gtklabel.sgml
@@ -200,6 +200,9 @@ the #GtkLabel::activate-link signal and the gtk_label_get_current_uri() function
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkLabel ##### -->
 <para>
 This should not be accessed directly.  Use the accessor functions as
@@ -436,33 +439,6 @@ The pattern of underlines you want under the existing text within the
 @n_chars: 
 
 
-<!-- ##### FUNCTION gtk_label_get ##### -->
-<para>
-Gets the current string of text within the #GtkLabel and writes it to
-the given @str argument.  It does not make a copy of this string so you
-must not write to it.
-</para>
-
-@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 ##### -->
-<para>
-Parses the given string for underscores and converts the next
-character to an underlined character.  The last character that
-was underlined will have its lower-cased accelerator keyval returned  (i.e.
-&quot;_File&quot; would return the keyval for &quot;f&quot;.  This is
-probably only used within the GTK+ library itself for menu items and such.
-</para>
-
-@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>
 
@@ -481,14 +457,6 @@ probably only used within the GTK+ library itself for menu items and such.
 @wrap_mode: 
 
 
-<!-- ##### MACRO gtk_label_set ##### -->
-<para>
-Sets the text within the GtkLabel widget.
-</para>
-
-@Deprecated: Use gtk_label_set_text() instead.
-
-
 <!-- ##### FUNCTION gtk_label_get_layout_offsets ##### -->
 <para>