diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 4a2aee9d7e..ba2f14510c 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -32,12 +32,12 @@
  * SECTION:gdkdevice
  * @Short_description: Object representing an input device
  * @Title: GdkDevice
- * @See_also: #GdkDeviceManager
+ * @See_also: #GdkSeat
  *
  * The #GdkDevice object represents a single input device, such
  * as a keyboard, a mouse, a touchpad, etc.
  *
- * See the #GdkDeviceManager documentation for more information
+ * See the #GdkSeat documentation for more information
  * about the various kinds of master and slave devices, and their
  * relationships.
  */
@@ -1375,7 +1375,7 @@ get_native_grab_event_mask (GdkEventMask grab_mask)
  * gdk_device_grab:
  * @device: a #GdkDevice. To get the device you can use gtk_get_current_event_device()
  *   or gdk_event_get_device() if the grab is in reaction to an event. Also, you can use
- *   gdk_device_manager_get_client_pointer() but only in code that isn’t triggered by a
+ *   gdk_seat_get_pointer() but only in code that isn’t triggered by a
  *   #GdkEvent and there aren’t other means to get a meaningful #GdkDevice to operate on.
  * @window: the #GdkWindow which will own the grab (the grab window)
  * @grab_ownership: specifies the grab ownership.
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index b86f5ca409..28a0c2072e 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -93,10 +93,9 @@ typedef enum
  *                          be an associated focus indicator on the screen.
  * @GDK_DEVICE_TYPE_SLAVE: Device is a slave (or physical) device.
  * @GDK_DEVICE_TYPE_FLOATING: Device is a physical device, currently not attached to
- *                            any virtual device.
+ *                            any seat.
  *
- * Indicates the device type. See [above][GdkDeviceManager.description]
- * for more information about the meaning of these device types.
+ * Indicates the device type.
  */
 typedef enum {
   GDK_DEVICE_TYPE_MASTER,
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 630815df25..f40b1e2d75 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -50,20 +50,17 @@
  *
  * - To manage and provide information about input devices (pointers and keyboards)
  *
- * - To manage and provide information about the available #GdkMonitors
+ * - To manage and provide information about output devices (monitors)
  *
- * GdkDisplay objects are the GDK representation of an X Display,
- * which can be described as a workstation consisting of
- * a keyboard, a pointing device (such as a mouse) and one or more
- * screens.
- * It is used to open and keep track of various GdkMonitor objects
- * currently instantiated by the application. It is also used to
- * access the keyboard(s) and mouse pointer(s) of the display.
+ * GdkDisplay objects are the GDK representation of a workstation, consisting
+ * of a keyboard, a pointing device (such as a mouse) and one or more screens.
  *
- * Most of the input device handling has been factored out into
- * the separate #GdkDeviceManager object. Every display has a
- * device manager, which you can obtain using
- * gdk_display_get_device_manager().
+ * Most of the input device handling has been factored out into separate #GdkSeat
+ * objects. Every display has a one or more seats, which can be accessed with
+ * gdk_display_get_default_seat() and gdk_display_list_seats().
+ *
+ * Output devices are represented by #GdkMonitor objects, which can be accessed
+ * with gdk-display_get_monitor() and similar APIs.
  */
 
 enum