diff --git a/doc/api/api_changes/2020-04-26-merged-rasterizations.rst b/doc/api/next_api_changes/behavior/17159-ST.rst
similarity index 100%
rename from doc/api/api_changes/2020-04-26-merged-rasterizations.rst
rename to doc/api/next_api_changes/behavior/17159-ST.rst
diff --git a/doc/conf.py b/doc/conf.py
index 820b0fb3be9f..7da2dc80df6a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -58,7 +58,11 @@
     'sphinx_copybutton',
 ]
 
-exclude_patterns = ['api/api_changes/*', 'users/whats_new/*']
+exclude_patterns = [
+    'api/prev_api_changes/api_changes_*/*',
+    # Be sure to update users/whats_new.rst:
+    'users/prev_whats_new/whats_new_3.3.0.rst',
+]
 
 
 def _check_dependencies():
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
index 46cbc5022063..4131fccde0ba 100644
--- a/doc/users/whats_new.rst
+++ b/doc/users/whats_new.rst
@@ -25,4 +25,5 @@ What's new?
 
       next_whats_new/*
 
+.. Be sure to update the version in `exclude_patterns` in conf.py.
 .. include:: prev_whats_new/whats_new_3.3.0.rst