Make 3.0 parallel-installable to 2.x

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

diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml
index ba0ad64d6a7832a19c321946f0c0844e143deedb..154a6424cf4d06bf51a2fce0089363f43b3e8fb8 100644 (file)
--- a/docs/reference/gtk/tmpl/gtknotebook.sgml
+++ b/docs/reference/gtk/tmpl/gtknotebook.sgml
@@ -13,10 +13,10 @@ can be switched between using tab labels along one edge.
 There are many configuration options for #GtkNotebook. Among other
 things, you can choose on which edge the tabs appear
 (see gtk_notebook_set_tab_pos()), whether, if there are too many
-tabs to fit the noteobook should be made bigger or scrolling
+tabs to fit the notebook should be made bigger or scrolling
 arrows added (see gtk_notebook_set_scrollable), and whether there
 will be a popup menu allowing the users to switch pages.
-(see gtk_notebook_enable_popup(), gtk_noteobook_disable_popup())
+(see gtk_notebook_popup_enable(), gtk_notebook_popup_disable())
 </para>
 
 <refsect2 id="GtkNotebook-BUILDER-UI">
@@ -24,8 +24,15 @@ will be a popup menu allowing the users to switch pages.
 <para>
 The GtkNoteboopk implementation of the GtkBuildable interface
 supports placing children into tabs by specifying "tab" as the
-"type" attribbute of a &lt;child&gt; element. Note that the content
+"type" attribute of a &lt;child&gt; element. Note that the content
 of the tab must be created before the tab can be filled.
+A tab child can be specified without specifying a &lt;child&gt;
+type attribute.
+</para>
+<para>
+To add a child widget in the notebooks action area, specify
+"action-start" or "action-end" as the "type" attribute of the &lt;child&gt;
+element.
 </para>
 <example>
 <title>A UI definition fragment with GtkNotebook</title>
@@ -59,6 +66,9 @@ of the tab must be created before the tab can be filled.
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GtkNotebook ##### -->
 <para>
 
@@ -167,16 +177,6 @@ Emitted when the user or a function changes the current page.
 
 </para>
 
-<!-- ##### ARG GtkNotebook:group-id ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:homogeneous ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkNotebook:page ##### -->
 <para>
 
@@ -197,26 +197,11 @@ Emitted when the user or a function changes the current page.
 
 </para>
 
-<!-- ##### ARG GtkNotebook:tab-border ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkNotebook:tab-hborder ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkNotebook:tab-pos ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GtkNotebook:tab-vborder ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG GtkNotebook:detachable ##### -->
 <para>
 
@@ -254,7 +239,8 @@ Emitted when the user or a function changes the current page.
 
 <!-- ##### ARG GtkNotebook:tab-pack ##### -->
 <para>
-
+ Deprecated: 2.20: The tab packing functionality of children should not
+ be used anymore and support will be removed in the future.
 </para>
 
 <!-- ##### ARG GtkNotebook:arrow-spacing ##### -->
@@ -302,6 +288,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
 <para>
 </para>
 
+@void: 
 @Returns: 
 
 
@@ -378,14 +365,6 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook.
 @page_num: 
 
 
-<!-- ##### MACRO gtk_notebook_current_page ##### -->
-<para>
-Deprecated compatibility macro. Use
-gtk_notebook_get_current_page() instead.
-</para>
-
-
-
 <!-- ##### FUNCTION gtk_notebook_page_num ##### -->
 <para>
 </para>
@@ -395,14 +374,6 @@ gtk_notebook_get_current_page() instead.
 @Returns: 
 
 
-<!-- ##### MACRO gtk_notebook_set_page ##### -->
-<para>
-Deprecated compatibility macro. Use
-gtk_notebook_set_current_page() instead.
-</para>
-
-
-
 <!-- ##### FUNCTION gtk_notebook_next_page ##### -->
 <para>
 </para>
@@ -458,14 +429,6 @@ gtk_notebook_set_current_page() instead.
 @scrollable: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_tab_border ##### -->
-<para>
-</para>
-
-@notebook: 
-@border_width: 
-
-
 <!-- ##### FUNCTION gtk_notebook_popup_enable ##### -->
 <para>
 </para>
@@ -535,14 +498,6 @@ gtk_notebook_set_current_page() instead.
 @pack_type: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_homogeneous_tabs ##### -->
-<para>
-</para>
-
-@notebook: 
-@homogeneous: 
-
-
 <!-- ##### FUNCTION gtk_notebook_set_menu_label ##### -->
 <para>
 </para>
@@ -561,14 +516,6 @@ gtk_notebook_set_current_page() instead.
 @menu_text: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_tab_hborder ##### -->
-<para>
-</para>
-
-@notebook: 
-@tab_hborder: 
-
-
 <!-- ##### FUNCTION gtk_notebook_set_tab_label ##### -->
 <para>
 </para>
@@ -598,14 +545,6 @@ gtk_notebook_set_current_page() instead.
 @tab_text: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_tab_vborder ##### -->
-<para>
-</para>
-
-@notebook: 
-@tab_vborder: 
-
-
 <!-- ##### FUNCTION gtk_notebook_set_tab_reorderable ##### -->
 <para>
 
@@ -711,16 +650,16 @@ gtk_notebook_set_current_page() instead.
 @page_num: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_group_id ##### -->
+<!-- ##### FUNCTION gtk_notebook_set_group ##### -->
 <para>
 
 </para>
 
 @notebook: 
-@group_id: 
+@group: 
 
 
-<!-- ##### FUNCTION gtk_notebook_get_group_id ##### -->
+<!-- ##### FUNCTION gtk_notebook_get_group ##### -->
 <para>
 
 </para>
@@ -729,21 +668,23 @@ gtk_notebook_set_current_page() instead.
 @Returns: 
 
 
-<!-- ##### FUNCTION gtk_notebook_set_group ##### -->
+<!-- ##### FUNCTION gtk_notebook_set_action_widget ##### -->
 <para>
 
 </para>
 
 @notebook: 
-@group: 
+@widget: 
+@pack_type: 
 
 
-<!-- ##### FUNCTION gtk_notebook_get_group ##### -->
+<!-- ##### FUNCTION gtk_notebook_get_action_widget ##### -->
 <para>
 
 </para>
 
 @notebook: 
+@pack_type: 
 @Returns: