diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 9bf976006a..9045bbe7a8 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,8 @@ 2008-12-28 Matthias Clasen + * docs/reference/gtk/gtk-sections.txt: Remove overridden INCLUDEs + + * gtk/tmpl/gtkfontsel.sgml: * gtk/tmpl/gtkeditable.sgml: Merge docs inline. 2008-12-27 Matthias Clasen diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index fce6729931..00b6b28f92 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -2028,7 +2028,6 @@ gtk_image_menu_item_get_type
-gtk/gtkimmodule.h gtkimcontext GtkIMContext GtkIMContext diff --git a/docs/reference/gtk/tmpl/gtkfontsel.sgml b/docs/reference/gtk/tmpl/gtkfontsel.sgml index e7ebf07aba..e436f995f5 100644 --- a/docs/reference/gtk/tmpl/gtkfontsel.sgml +++ b/docs/reference/gtk/tmpl/gtkfontsel.sgml @@ -62,19 +62,19 @@ only be accessed using the functions below. -Creates a new #GtkFontSelection. + -@Returns: a new #GtkFontSelection. +@Returns: -Gets the currently-selected font. + -@fontsel: a #GtkFontSelection. -@Returns: the currently-selected font, or NULL if no font is selected. +@fontsel: +@Returns: @@ -96,21 +96,20 @@ Gets the currently-selected font. -Gets the text displayed in the preview area. + -@fontsel: a #GtkFontSelection. -@Returns: the text displayed in the preview area. This string is - owned by the widget and should not be modified or freed. +@fontsel: +@Returns: -Sets the text displayed in the preview area. + -@fontsel: a #GtkFontSelection. -@text: the text to display in the preview area. +@fontsel: +@text: