diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 34632c961e..f8d7cd7dc5 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-19  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/tmpl/gtkcellview.sgml: New template.
+
+	* gtk/Makefile.am (IGNORE_HFILES): Remove gtkcellview.h
+	and gtkcellviewmenuitem.h
+
+	* gtk/gtk-docs.sgml: Add GtkCellView section.
+
+	* gtk/gtk-sections.txt: Add new entry completion api.
+	Add GtkCellView section.
+
 Sat Jul 17 23:42:09 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtk-sections.txt: Add gtk_icon_view_[sg]et_orientation.
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index b566aa8509..3757ef2e4c 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -126,14 +126,15 @@
 <!ENTITY GtkTreeViewColumn SYSTEM "xml/gtktreeviewcolumn.xml">
 <!ENTITY GtkTreeView SYSTEM "xml/gtktreeview.xml">
 <!ENTITY GtkUIManager SYSTEM "xml/gtkuimanager.xml">
+<!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
 <!ENTITY GtkCellLayout SYSTEM "xml/gtkcelllayout.xml">
 <!ENTITY GtkCellRenderer SYSTEM "xml/gtkcellrenderer.xml">
-<!ENTITY GtkCellEditable SYSTEM "xml/gtkcelleditable.xml">
 <!ENTITY GtkCellRendererCombo SYSTEM "xml/gtkcellrenderercombo.xml">
 <!ENTITY GtkCellRendererPixbuf SYSTEM "xml/gtkcellrendererpixbuf.xml">
 <!ENTITY GtkCellRendererProgress SYSTEM "xml/gtkcellrendererprogress.xml">
 <!ENTITY GtkCellRendererText SYSTEM "xml/gtkcellrenderertext.xml">
 <!ENTITY GtkCellRendererToggle SYSTEM "xml/gtkcellrenderertoggle.xml">
+<!ENTITY GtkCellView SYSTEM "xml/gtkcellview.xml">
 <!ENTITY GtkListStore SYSTEM "xml/gtkliststore.xml">
 <!ENTITY GtkTreeDND SYSTEM "xml/gtktreednd.xml">
 <!ENTITY GtkVButtonBox SYSTEM "xml/gtkvbbox.xml">
@@ -373,13 +374,14 @@ that is, GUI components such as <link linkend="GtkButton">GtkButton</link> or
     </chapter>
 
     <chapter id="TreeWidgetObjects">
-      <title>Tree and List Widget</title>
+      <title>Tree, List and Icon Grid Widgets</title>
         &gtk-TreeWidget;
         &GtkTreeModel;
         &GtkTreeSelection;
         &GtkTreeViewColumn;
         &GtkTreeView;
         &GtkTreeDND;
+        &GtkCellView;
         &GtkIconView;
 	&GtkTreeSortable;
         &GtkTreeModelSort;
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index ac04ffcb1a..8a7e252fab 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -1089,11 +1089,16 @@ gtk_entry_completion_set_match_func
 gtk_entry_completion_set_minimum_key_length
 gtk_entry_completion_get_minimum_key_length
 gtk_entry_completion_complete
+gtk_entry_completion_insert_prefix
 gtk_entry_completion_insert_action_text
 gtk_entry_completion_insert_action_markup
 gtk_entry_completion_delete_action
 gtk_entry_completion_set_text_column
 gtk_entry_completion_get_text_column
+gtk_entry_completion_set_inline_completion
+gtk_entry_completion_get_inline_completion
+gtk_entry_completion_set_popup_completion
+gtk_entry_completion_get_popup_completion
 <SUBSECTION Standard>
 GTK_TYPE_ENTRY_COMPLETION
 GTK_ENTRY_COMPLETION
@@ -3978,6 +3983,36 @@ GTK_TREE_VIEW_GET_CLASS
 gtk_tree_view_get_type
 </SECTION>
 
+<SECTION>
+<FILE>gtkcellview</FILE>
+<TITLE>GtkCellView</TITLE>
+GtkCellView
+gtk_cell_view_new
+gtk_cell_view_new_with_text
+gtk_cell_view_new_with_markup
+gtk_cell_view_new_with_pixbuf
+gtk_cell_view_set_value
+gtk_cell_view_set_values
+gtk_cell_view_set_model
+gtk_cell_view_set_displayed_row
+gtk_cell_view_get_displayed_row
+gtk_cell_view_get_size_of_row
+gtk_cell_view_set_background_color
+gtk_cell_view_set_cell_data
+gtk_cell_view_get_cell_renderers
+<SUBSECTION Standard>
+GtkCellViewClass
+GTK_TYPE_CELL_VIEW
+GTK_CELL_VIEW
+GTK_CELL_VIEW_CLASS
+GTK_IS_CELL_VIEW
+GTK_IS_CELL_VIEW_CLASS
+GTK_CELL_VIEW_GET_CLASS
+<SUBSECTION Private>
+GtkCellViewPrivate
+gtk_cell_view_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkcelllayout</FILE>
 <TITLE>GtkCellLayout</TITLE>
diff --git a/docs/reference/gtk/tmpl/gtkcellview.sgml b/docs/reference/gtk/tmpl/gtkcellview.sgml
new file mode 100644
index 0000000000..6fc30909ca
--- /dev/null
+++ b/docs/reference/gtk/tmpl/gtkcellview.sgml
@@ -0,0 +1,143 @@
+<!-- ##### SECTION Title ##### -->
+GtkCellView
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### STRUCT GtkCellView ##### -->
+<para>
+
+</para>
+
+@parent_instance: 
+
+<!-- ##### FUNCTION gtk_cell_view_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_new_with_text ##### -->
+<para>
+
+</para>
+
+@text: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_new_with_markup ##### -->
+<para>
+
+</para>
+
+@markup: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_new_with_pixbuf ##### -->
+<para>
+
+</para>
+
+@pixbuf: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_set_value ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@renderer: 
+@property: 
+@value: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_set_values ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@renderer: 
+@Varargs: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_set_model ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@model: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_set_displayed_row ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@path: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_get_displayed_row ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_get_size_of_row ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@path: 
+@requisition: 
+@Returns: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_set_background_color ##### -->
+<para>
+
+</para>
+
+@cell_view: 
+@color: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_set_cell_data ##### -->
+<para>
+
+</para>
+
+@cellview: 
+
+
+<!-- ##### FUNCTION gtk_cell_view_get_cell_renderers ##### -->
+<para>
+
+</para>
+
+@cellview: 
+@Returns: 
+
+