diff --git a/ChangeLog b/ChangeLog
index a246e273e4..25710653c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): Add a comment regarding
+	cell renderers to the docs.
+
 	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes): 
 	Silently ignore info being NULL. This is unavoidable with the 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a246e273e4..25710653c6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): Add a comment regarding
+	cell renderers to the docs.
+
 	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes): 
 	Silently ignore info being NULL. This is unavoidable with the 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a246e273e4..25710653c6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): Add a comment regarding
+	cell renderers to the docs.
+
 	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes): 
 	Silently ignore info being NULL. This is unavoidable with the 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a246e273e4..25710653c6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-01  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkcombobox.c (gtk_combo_box_set_model): Add a comment regarding
+	cell renderers to the docs.
+
 	* gtk/gtkcellview.c (gtk_cell_view_cell_layout_clear_attributes): 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_clear_attributes): 
 	Silently ignore info being NULL. This is unavoidable with the 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index b4fc7a4ffd..73e721303d 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -3253,9 +3253,12 @@ gtk_combo_box_set_active_iter (GtkComboBox     *combo_box,
  * @combo_box: A #GtkComboBox.
  * @model: A #GtkTreeModel.
  *
- * Sets the model used by @combo_box to be @model. Will unset a
- * previously set model (if applicable).
- * If @model is %NULL, then it will unset the model.
+ * Sets the model used by @combo_box to be @model. Will unset a previously set 
+ * model (if applicable). If @model is %NULL, then it will unset the model.
+ * 
+ * Note that this function does not clear the cell renderers, you have to 
+ * call gtk_combo_box_cell_layout_clear() yourself if you need to set up 
+ * different cell renderers for the new model.
  *
  * Since: 2.4
  */