diff --git a/developer_manual/app_publishing_maintenance/index.rst b/developer_manual/app_publishing_maintenance/index.rst index 4f5bc498e46..c5a33dc935a 100644 --- a/developer_manual/app_publishing_maintenance/index.rst +++ b/developer_manual/app_publishing_maintenance/index.rst @@ -4,6 +4,10 @@ App publishing and maintenance Transforming source files into a deliverable is documented in the :ref:`app-release-process`. +.. note:: + + For the latest release notes, critical API changes and deprecations, see the :doc:`Release Notes `. + .. toctree:: :maxdepth: 2 @@ -14,4 +18,3 @@ Transforming source files into a deliverable is documented in the :ref:`app-rele publishing code_signing release_automation - app_upgrade_guide/index diff --git a/developer_manual/conf.py b/developer_manual/conf.py index 169beb8e347..96a85db63ed 100644 --- a/developer_manual/conf.py +++ b/developer_manual/conf.py @@ -174,9 +174,15 @@ "core/static-analysis": "../server/static-analysis.html", "core/unit-testing": "../server/unit-testing.html", # Removed 2024-09 - "digging_deeper/changelog": "../app_publishing_maintenance/app_upgrade_guide/index.html", + "digging_deeper/changelog": "../release_notes/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", + # Moved 2026-04 - Previous versions moved to release notes + "app_publishing_maintenance/app_upgrade_guide/index": "../../release_notes/index.html", + "app_publishing_maintenance/app_upgrade_guide/upgrade_to_33": "../../release_notes/previous/upgrade_to_33.html", + "app_publishing_maintenance/app_upgrade_guide/upgrade_to_32": "../../release_notes/previous/upgrade_to_32.html", + "app_publishing_maintenance/app_upgrade_guide/upgrade_to_31": "../../release_notes/previous/upgrade_to_31.html", + "app_publishing_maintenance/app_upgrade_guide/upgrade_to_30": "../../release_notes/previous/upgrade_to_30.html", } diff --git a/developer_manual/prologue/compatibility_app_ecosystem.rst b/developer_manual/prologue/compatibility_app_ecosystem.rst index 47531988095..703113f33b0 100644 --- a/developer_manual/prologue/compatibility_app_ecosystem.rst +++ b/developer_manual/prologue/compatibility_app_ecosystem.rst @@ -20,7 +20,7 @@ There are three procedures in place to facilitate communication to app developer This means the development of your pull request cannot be considered done if you introduced changes (additions, removals or modifications) that affect app developers that you did not document. -2. A change necessary for app developers to execute for app compatibility in a new version, has to be reported and documented by the author of the pull request in the :ref:`App Upgrade guide ` section. +2. A change necessary for app developers to execute for app compatibility in a new version, has to be reported and documented by the author of the pull request in the :ref:`Release Notes ` section. The requirements for this documentation are: diff --git a/developer_manual/release_notes/deprecations.rst b/developer_manual/release_notes/deprecations.rst index cf7e9814c0e..27420ed9002 100644 --- a/developer_manual/release_notes/deprecations.rst +++ b/developer_manual/release_notes/deprecations.rst @@ -26,6 +26,6 @@ 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. + This is where we will move the deprecations after the branch off. Entries will stay until actual removal. -Also see the older :ref:`app-upgrade-guide` for deprecations. +Also see the older :ref:`Release Notes ` for deprecations. diff --git a/developer_manual/release_notes/index.rst b/developer_manual/release_notes/index.rst index 7e110ab52ab..fca66a96ec1 100644 --- a/developer_manual/release_notes/index.rst +++ b/developer_manual/release_notes/index.rst @@ -9,6 +9,7 @@ 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 +- :ref:`previous-versions` - Critical changes and deprecations of previous Nextcloud versions .. toctree:: :maxdepth: 3 @@ -17,3 +18,4 @@ On this page you will find: critical_changes new deprecations + previous/index diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst b/developer_manual/release_notes/previous/index.rst similarity index 89% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst rename to developer_manual/release_notes/previous/index.rst index 168942e9b08..3600c6f740c 100644 --- a/developer_manual/app_publishing_maintenance/app_upgrade_guide/index.rst +++ b/developer_manual/release_notes/previous/index.rst @@ -1,8 +1,8 @@ -.. _app-upgrade-guide: +.. _previous-versions: -================= -App upgrade guide -================= +====================== +Previous release notes +====================== 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. diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_14.rst b/developer_manual/release_notes/previous/upgrade_to_14.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_14.rst rename to developer_manual/release_notes/previous/upgrade_to_14.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_15.rst b/developer_manual/release_notes/previous/upgrade_to_15.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_15.rst rename to developer_manual/release_notes/previous/upgrade_to_15.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_16.rst b/developer_manual/release_notes/previous/upgrade_to_16.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_16.rst rename to developer_manual/release_notes/previous/upgrade_to_16.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_17.rst b/developer_manual/release_notes/previous/upgrade_to_17.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_17.rst rename to developer_manual/release_notes/previous/upgrade_to_17.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_18.rst b/developer_manual/release_notes/previous/upgrade_to_18.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_18.rst rename to developer_manual/release_notes/previous/upgrade_to_18.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_19.rst b/developer_manual/release_notes/previous/upgrade_to_19.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_19.rst rename to developer_manual/release_notes/previous/upgrade_to_19.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_20.rst b/developer_manual/release_notes/previous/upgrade_to_20.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_20.rst rename to developer_manual/release_notes/previous/upgrade_to_20.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_21.rst b/developer_manual/release_notes/previous/upgrade_to_21.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_21.rst rename to developer_manual/release_notes/previous/upgrade_to_21.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_22.rst b/developer_manual/release_notes/previous/upgrade_to_22.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_22.rst rename to developer_manual/release_notes/previous/upgrade_to_22.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_23.rst b/developer_manual/release_notes/previous/upgrade_to_23.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_23.rst rename to developer_manual/release_notes/previous/upgrade_to_23.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst b/developer_manual/release_notes/previous/upgrade_to_24.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_24.rst rename to developer_manual/release_notes/previous/upgrade_to_24.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_25.rst b/developer_manual/release_notes/previous/upgrade_to_25.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_25.rst rename to developer_manual/release_notes/previous/upgrade_to_25.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_26.rst b/developer_manual/release_notes/previous/upgrade_to_26.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_26.rst rename to developer_manual/release_notes/previous/upgrade_to_26.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_27.rst b/developer_manual/release_notes/previous/upgrade_to_27.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_27.rst rename to developer_manual/release_notes/previous/upgrade_to_27.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_28.rst b/developer_manual/release_notes/previous/upgrade_to_28.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_28.rst rename to developer_manual/release_notes/previous/upgrade_to_28.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_29.rst b/developer_manual/release_notes/previous/upgrade_to_29.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_29.rst rename to developer_manual/release_notes/previous/upgrade_to_29.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.rst b/developer_manual/release_notes/previous/upgrade_to_30.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_30.rst rename to developer_manual/release_notes/previous/upgrade_to_30.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_31.rst b/developer_manual/release_notes/previous/upgrade_to_31.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_31.rst rename to developer_manual/release_notes/previous/upgrade_to_31.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_32.rst b/developer_manual/release_notes/previous/upgrade_to_32.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_32.rst rename to developer_manual/release_notes/previous/upgrade_to_32.rst diff --git a/developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_33.rst b/developer_manual/release_notes/previous/upgrade_to_33.rst similarity index 100% rename from developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_33.rst rename to developer_manual/release_notes/previous/upgrade_to_33.rst diff --git a/developer_manual/server/code-back-end.rst b/developer_manual/server/code-back-end.rst index 63e979b5c4a..26f339e4a0e 100644 --- a/developer_manual/server/code-back-end.rst +++ b/developer_manual/server/code-back-end.rst @@ -16,5 +16,7 @@ Compatibility documentation --------------------------- - New APIs (interfaces, constants, methods, classes, traits, enums) added to the public namespace ``OCP`` have to be annotated with a ``@since X.Y.Z`` attribute of the version it was added in. -- When it is backported the version should be adjusted to the X.Y.Z of the stable version it was backported in only in that stable branch. The master branch should still contain the newest Major version shipping the API. -- Once an API was shipped, unless it is marked as experimental, it has to be deprecated in similar fashion using ``@deprecated X.Y.Z`` for 3 years (9 Nextcloud releases) before it can be removed. Deprecations have to be clearly documented in the :ref:`app-upgrade-guide` for the upcoming Major version. +- When it is backported the version should be adjusted to the X.Y.Z of the stable version it was backported in only in that stable branch. + The master branch should still contain the newest Major version shipping the API. +- Once an API was shipped, unless it is marked as experimental, it has to be deprecated in similar fashion using ``@deprecated X.Y.Z`` for 3 years (9 Nextcloud releases) before it can be removed. + Deprecations have to be clearly documented in the :ref:`critical-changes` for the upcoming Major version.