From 66fd4b640927eac4ff6f61851e97b44998a304b2 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
Date: Fri, 24 Apr 2026 13:38:17 +0200
Subject: [PATCH] feat(devmanual): clean up the new release notes
Signed-off-by: Christoph Wurst <1374172+ChristophWurst@users.noreply.github.com>
---
.../app_upgrade_guide/index.rst | 5 ++++-
developer_manual/conf.py | 2 ++
.../critical_changes.rst} | 10 +++++-----
developer_manual/release_notes/deprecations.rst | 17 +++++++++++++++--
developer_manual/release_notes/index.rst | 11 ++++++++---
5 files changed, 34 insertions(+), 11 deletions(-)
rename developer_manual/{app_publishing_maintenance/app_upgrade_guide/upgrade_to_34.rst => release_notes/critical_changes.rst} (96%)
diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst b/developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst
index f8a6f27d862..168942e9b08 100644
--- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst
+++ b/developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst
@@ -6,12 +6,15 @@ App upgrade guide
Once you've created and published the first version of your app, you will want to keep it up to date with the latest Nextcloud features.
+.. note::
+
+ For the latest release notes, see the :doc:`Release Notes `.
+
These sub pages will cover the most important changes in Nextcloud, as well as some guides on how to upgrade existing apps.
.. toctree::
:maxdepth: 1
- upgrade_to_34.rst
upgrade_to_33.rst
upgrade_to_32.rst
upgrade_to_31.rst
diff --git a/developer_manual/conf.py b/developer_manual/conf.py
index 1f09db3ce0c..169beb8e347 100644
--- a/developer_manual/conf.py
+++ b/developer_manual/conf.py
@@ -177,4 +177,6 @@
"digging_deeper/changelog": "../app_publishing_maintenance/app_upgrade_guide/index.html",
# Removed 2025-04
"basics/front-end/l10n": "../translations.html",
+ # Moved 2026-04 - Upgrade to 34 moved to release notes
+ "app_publishing_maintenance/app_upgrade_guide/upgrade_to_34": "../../release_notes/critical_changes.html",
}
diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_34.rst b/developer_manual/release_notes/critical_changes.rst
similarity index 96%
rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_34.rst
rename to developer_manual/release_notes/critical_changes.rst
index c06f9b54a01..1a2b29e6c56 100644
--- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_34.rst
+++ b/developer_manual/release_notes/critical_changes.rst
@@ -1,8 +1,8 @@
-.. _upgrade_to_34:
+.. _critical-changes:
-=======================
-Upgrade to Nextcloud 34
-=======================
+================
+Critical changes
+================
..
Add one section for each change.
@@ -18,7 +18,7 @@ Update info.xml to add Nextcloud 34 to the support range:
.. code-block:: xml
-
+
To allow installation on older versions too, just keep the previous min-version.
diff --git a/developer_manual/release_notes/deprecations.rst b/developer_manual/release_notes/deprecations.rst
index 07dec0f5e6c..cf7e9814c0e 100644
--- a/developer_manual/release_notes/deprecations.rst
+++ b/developer_manual/release_notes/deprecations.rst
@@ -4,15 +4,28 @@
Deprecations
============
-In order to improve our platform we are phasing out some APIs. Deprecated APIs are not removed before ???,
-unless the breakage can not be avoided.
+In order to improve our platform we are phasing out some APIs. Deprecated APIs are kept for at least
+three years before removal, unless the breakage can not be avoided.
We highly recommend using the `Nextcloud Rector `_
rules, which can fix some API changes automatically.
+New deprecations
+----------------
+
..
Add one section for each group of deprecations (e.g. group files api changes, authentication changes).
Also deprecate the feature at their dedicated documentation page.
After branch-off the contents below will be cleared.
+.. todo:: This page needs a section for every new deprecation.
+
+Older deprecations
+------------------
+
+You find all current deprecations in this section.
+
+..
+ This is where we will move the deprecations after the branch off. Enties will stay until actual removal.
+Also see the older :ref:`app-upgrade-guide` for deprecations.
diff --git a/developer_manual/release_notes/index.rst b/developer_manual/release_notes/index.rst
index 9cb1067e443..7e110ab52ab 100644
--- a/developer_manual/release_notes/index.rst
+++ b/developer_manual/release_notes/index.rst
@@ -2,13 +2,18 @@
Release notes
=============
-This section is for developers and maintainers who are familiar with an earlier version of the documentation.
+Welcome to the release notes. This section is for developers and app maintainers upgrading from earlier versions.
-Here we try to summarize what's new. You will find the breaking changes at :ref:`upgrade_to_34`, new deprecations at :ref:`deprecated-apis` and new API features at :ref:`new-apis`.
+On this page you will find:
+
+- :ref:`critical-changes` - Critical changes that must be addressed for app compatibility
+- :ref:`new-apis` - New developer APIs and features
+- :ref:`deprecated-apis` - Deprecated APIs and their removal timeline
.. toctree::
:maxdepth: 3
+ :hidden:
+ critical_changes
new
deprecations
- ../app_publishing_maintenance/app_upgrade_guide/upgrade_to_34