diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-12-29 00:06:12 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-12-29 00:06:12 +0000 |
commit | 94e6589d2d44444c0ad7ee03146943e17a3fbf29 (patch) | |
tree | 5ed9d8a7f3f8d1d2b0c6b1a44d33cb3f23416552 /docs | |
parent | a07dea88030a7f666f949e3f805a423d0631780a (diff) | |
download | gtk+-94e6589d2d44444c0ad7ee03146943e17a3fbf29.tar.gz |
Documentation fixes
svn path=/trunk/; revision=21956
Diffstat (limited to 'docs')
-rw-r--r-- | docs/reference/ChangeLog | 3 | ||||
-rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 1 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkfontsel.sgml | 23 |
3 files changed, 14 insertions, 13 deletions
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 <mclasen@redhat.com> + * 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 <mclasen@redhat.com> 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 </SECTION> <SECTION> -<INCLUDE>gtk/gtkimmodule.h</INCLUDE> <FILE>gtkimcontext</FILE> <TITLE>GtkIMContext</TITLE> 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. <!-- ##### FUNCTION gtk_font_selection_new ##### --> <para> -Creates a new #GtkFontSelection. + </para> -@Returns: a new #GtkFontSelection. +@Returns: <!-- ##### FUNCTION gtk_font_selection_get_font ##### --> <para> -Gets the currently-selected font. + </para> -@fontsel: a #GtkFontSelection. -@Returns: the currently-selected font, or NULL if no font is selected. +@fontsel: +@Returns: <!-- ##### FUNCTION gtk_font_selection_get_font_name ##### --> @@ -96,21 +96,20 @@ Gets the currently-selected font. <!-- ##### FUNCTION gtk_font_selection_get_preview_text ##### --> <para> -Gets the text displayed in the preview area. + </para> -@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: <!-- ##### FUNCTION gtk_font_selection_set_preview_text ##### --> <para> -Sets the text displayed in the preview area. + </para> -@fontsel: a #GtkFontSelection. -@text: the text to display in the preview area. +@fontsel: +@text: <!-- ##### FUNCTION gtk_font_selection_get_face ##### --> |