diff --git a/docs/reference/gdk/gdk4-docs.xml b/docs/reference/gdk/gdk4-docs.xml
index 692a788038..58ac4eddde 100644
--- a/docs/reference/gdk/gdk4-docs.xml
+++ b/docs/reference/gdk/gdk4-docs.xml
@@ -29,7 +29,7 @@
     <xi:include href="xml/textures.xml" />
     <xi:include href="xml/rgba_colors.xml" />
     <xi:include href="xml/cursors.xml" />
-    <xi:include href="xml/windows.xml" />
+    <xi:include href="xml/gdksurface.xml" />
     <xi:include href="xml/gdkframeclock.xml" />
     <xi:include href="xml/gdkframetimings.xml" />
     <xi:include href="xml/gdkdrawcontext.xml" />
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 3ca6c13862..71a23259f7 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -167,8 +167,8 @@ gdk_rgba_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>Windows</TITLE>
-<FILE>windows</FILE>
+<TITLE>GdkSurface</TITLE>
+<FILE>gdksurface</FILE>
 GdkSurface
 GdkSurfaceType
 GdkSurfaceClass
@@ -655,7 +655,7 @@ gdk_event_get_crossing_detail
 gdk_event_get_crossing_mode
 gdk_event_get_drag_context
 gdk_event_get_focus_in
-gdk_event_get_grab_window
+gdk_event_get_grab_surface
 gdk_event_get_motion_history
 gdk_event_get_key_group
 gdk_event_get_key_is_modifier
@@ -1104,7 +1104,7 @@ gdk_draw_context_get_display
 gdk_draw_context_get_surface
 gdk_draw_context_begin_frame
 gdk_draw_context_end_frame
-gdk_draw_context_in_frame
+gdk_draw_context_is_in_frame
 gdk_draw_context_get_frame_region
 
 <SUBSECTION Standard>
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index d7a7337d4c..63437da78d 100644
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -2336,7 +2336,7 @@ gdk_event_get_touch_emulating_pointer (const GdkEvent *event,
  **/
 gboolean
 gdk_event_get_grab_surface (const GdkEvent  *event,
-                           GdkSurface      **surface)
+                            GdkSurface     **surface)
 {
   if (!event)
     return FALSE;
diff --git a/gdk/gdkmemorytexture.h b/gdk/gdkmemorytexture.h
index 067f164baa..7064455378 100644
--- a/gdk/gdkmemorytexture.h
+++ b/gdk/gdkmemorytexture.h
@@ -47,7 +47,7 @@ G_BEGIN_DECLS
  *
  * It describes formats by listing the contents of the memory passed to it.
  * So GDK_MEMORY_A8R8G8B8 will be 1 byte (8 bits) of alpha, followed by a
- * byte each of red, green and blue. It is not endian-dependant, so
+ * byte each of red, green and blue. It is not endian-dependent, so
  * CAIRO_FORMAT_ARGB32 is represented by different #GdkMemoryFormats on
  * architectures with different endiannesses.
  * 
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index c5c176df2d..be41a73674 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -55,7 +55,7 @@
 
 
 /**
- * SECTION:surfaces
+ * SECTION:gdksurface
  * @Short_description: Onscreen display areas in the target window system
  * @Title: Surfaces
  *
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 4999ce0905..8ba75e6ae9 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -2079,14 +2079,12 @@ gdk_wayland_display_get_output_scale (GdkWaylandDisplay *display_wayland,
 /**
  * gdk_wayland_display_query_registry:
  * @display: a wayland #GdkDisplay
- * @interface: global interface to query in the registry
+ * @global: global interface to query in the registry
  *
  * Returns %TRUE if the the interface was found in the display
  * wl_registry.global handler.
  *
  * Returns: %TRUE if the global is offered by the compositor
- *
- * Since: 3.94
  **/
 gboolean
 gdk_wayland_display_query_registry (GdkDisplay  *display,