diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a60fc44153..56a43c2434 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -446,7 +446,7 @@ reference:
             -Dintrospection=enabled
             -Ddocumentation=true
             -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:gtk_doc=true
+            -Dpango:documentation=true
             -Dbuild-demos=false
             -Dbuild-examples=false
             -Dbuild-tests=false
diff --git a/NEWS b/NEWS
index d7b77a162b..f1b04b7834 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,12 @@
 Overview of Changes in 4.15.0, xx-xx-xxxx
 =========================================
 
-This release changes the default GSK renderer to be vulkan.
+This release changes the default GSK renderer to be Vulkan, on
+Wayland. Other platforms still use ngl.
 
 The intent of this change is to get wider testing and verify that
-Vulkan drivers are good enough for this. If significant problems
-show up, we will revert this change for 4.16.
+Vulkan drivers are good enough for us to rely on. If significant
+problems show up, we will revert this change for 4.16.
 
 You can still override the renderer choice using the GSK_RENDERER
 environment variable.
@@ -77,6 +78,11 @@ the new property to 'manual'.
  - Require pango 1.52
  - Require cairo 1.18
  - Add a missing dependency that was causing build failures
+ - Drop deprecated build options:
+   gtk_doc -> documentation
+   update_screenshots -> screenshots
+   demo-profile -> profile
+   demos -> build-demos
 
 * Deprecations:
  - gdk_widget_set/get_font_options
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 752e22c7ba..6886c2a34b 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -73,7 +73,7 @@
  * utilities that let the user change these settings.
  *
  * On Wayland, the settings are obtained either via a settings portal,
- * or by reading desktop settings from DConf.
+ * or by reading desktop settings from [class@Gio.Settings].
  *
  * On macOS, the settings are obtained from `NSUserDefaults`.
  *
diff --git a/meson_options.txt b/meson_options.txt
index 07823a4fcc..83ff501812 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -93,23 +93,11 @@ option('documentation',
        value: false,
        description : 'Build API reference and tools documentation')
 
-option('gtk_doc',
-       type: 'boolean',
-       value: false,
-       description : 'Build API reference and tools documentation',
-       deprecated: 'documentation')
-
 option('screenshots',
        type: 'boolean',
        value: false,
        description : 'Regenerate screenshots for the documentation')
 
-option('update_screenshots',
-       type: 'boolean',
-       value: false,
-       description : 'Regenerate screenshots for the documentation',
-       deprecated: 'screenshots')
-
 option('man-pages',
        type: 'boolean',
        value: false,
@@ -117,12 +105,6 @@ option('man-pages',
 
 # Demos, examples and tests
 
-option('demo-profile',
-       type: 'combo',
-       choices: [ 'auto', 'default', 'devel' ],
-       value: 'auto',
-       deprecated: 'profile')
-
 option('profile',
        type: 'combo',
        choices: [ 'auto', 'default', 'devel' ],
@@ -134,11 +116,6 @@ option('build-demos',
        value: true,
        description : 'Build demo programs')
 
-option('demos',
-       type: 'boolean',
-       value: true,
-       deprecated: 'build-demos')
-
 option('build-testsuite',
        type: 'boolean',
        value: true,