diff --git a/docs/reference/gtk/migrating-3to4.md b/docs/reference/gtk/migrating-3to4.md
index 45b007549b..492e8628e4 100644
--- a/docs/reference/gtk/migrating-3to4.md
+++ b/docs/reference/gtk/migrating-3to4.md
@@ -1332,6 +1332,18 @@ pointer coordinates as inout arguments any more, but as normal in ones.
 
 See: [method@Gtk.TreeView.get_tooltip_context], [method@Gtk.IconView.get_tooltip_context]
 
+### Adapt to GtkPopover changes
+
+In GTK 3, a `GtkPopover` could be attached to any widget, using the `relative-to`
+property. This is no longer possible in GTK 4. The parent widget has to be aware
+of its popover children, and manage their size allocation. Therefore, only widgets
+with dedicated popover support can have them, such as [class@Gtk.MenuButton] or
+[class@Gtk.PopoverMenuBar].
+
+If you want to make a custom widget that has an attached popover, you need to call
+[method@Gtk.Popover.present] in your [vfunc@Gtk.Widget.size_allocate] vfunc, in order
+to update the positioning of the popover.
+
 ### Stop using GtkFileChooserButton
 
 The `GtkFileChooserButton` widget was removed, due to its shortcomings in
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 9ad392ba3c..399a065d04 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2295,7 +2295,7 @@ gtk_entry_get_overwrite_mode (GtkEntry *entry)
  * Sets the maximum allowed length of the contents of the widget.
  *
  * If the current contents are longer than the given length, then
- * they will be truncated to fit.
+ * they will be truncated to fit. The length is is in characters.
  *
  * This is equivalent to getting @entry's `GtkEntryBuffer` and
  * calling [method@Gtk.EntryBuffer.set_max_length] on it.