diff --git a/content/administration.rst b/content/administration.rst
index 902a561bd..e779d0d53 100644
--- a/content/administration.rst
+++ b/content/administration.rst
@@ -10,7 +10,7 @@ Database management
These guides provide instructions on how to install, maintain and upgrade Odoo databases.
.. seealso::
- :doc:`History of Versions `
+ :doc:`History of Versions `
Installation
============
@@ -60,6 +60,6 @@ functionalities, including functional support, upgrades, and hosting. `Pricing
administration/on_premise
administration/upgrade
administration/neutralized_database
- administration/supported_versions
+ administration/standard_extended_support
administration/mobile
administration/odoo_accounts
diff --git a/content/administration/hosting.rst b/content/administration/hosting.rst
index cf4383e20..6c7e91719 100644
--- a/content/administration/hosting.rst
+++ b/content/administration/hosting.rst
@@ -18,7 +18,7 @@ To Odoo Online
.. important::
- Odoo Online is *not* compatible with **non-standard apps**.
- - The database's current version must be :doc:`supported `.
+ - The database's current version must be :doc:`supported `.
#. Create a :ref:`duplicate of the database `.
#. In this duplicate, uninstall all **non-standard apps**.
@@ -46,10 +46,10 @@ Transferring an Odoo Online database
====================================
.. important::
- Odoo Online's :ref:`intermediary versions ` are not supported by Odoo.sh or
- on-premise. Therefore, if the database to transfer is running an intermediary version, it must be
- upgraded first to the next :ref:`major version `, waiting for its release if
- necessary.
+ Odoo Online's :doc:`intermediary versions ` are not supported by
+ Odoo.sh or on-premise. Therefore, if the database to transfer is running an intermediary version,
+ it must be upgraded first to the next :doc:`major version `, waiting
+ for its release if necessary.
.. example::
Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo
diff --git a/content/administration/odoo_sh/getting_started/create.rst b/content/administration/odoo_sh/getting_started/create.rst
index 9c4dde14f..b0a1c6b1a 100644
--- a/content/administration/odoo_sh/getting_started/create.rst
+++ b/content/administration/odoo_sh/getting_started/create.rst
@@ -67,7 +67,7 @@ Import a database
=================
Once your platform is deployed, you can import a database into your Odoo.sh project, provided it
-uses a :doc:`supported version <../../supported_versions>` of Odoo.
+uses a :doc:`supported version <../../standard_extended_support>` of Odoo.
.. note::
Due to `Odoo's backup policy `_, the import process requires
diff --git a/content/administration/standard_extended_support.rst b/content/administration/standard_extended_support.rst
new file mode 100644
index 000000000..f18a19733
--- /dev/null
+++ b/content/administration/standard_extended_support.rst
@@ -0,0 +1,102 @@
+=============================
+Standard and extended support
+=============================
+
+.. warning::
+ The information presented on this page is not intended to amend, modify, or replace any terms of
+ the :doc:`Odoo Enterprise Subscription Agreement <../legal/terms/enterprise>`. In the event of
+ any inconsistency or conflict, the Subscription Agreement shall govern.
+
+Odoo provides **standard support** for all major versions for three years. It includes helpdesk
+support, bug fixing, and security updates.
+
+Beyond those three years, you can benefit from **extended support** by paying an extra fee. It
+includes helpdesk support and bug fixes (depending on feasibility).
+
+.. note::
+ - Odoo releases intermediary versions, called online or SaaS versions, every two to three months.
+ These versions are only available on Odoo Online and are not eligible for extended support.
+ - You can `upgrade `_ from any version.
+
+The table below shows the support status of every version. Major releases are highlighted in bold.
+
+.. list-table::
+ :header-rows: 1
+ :widths: auto
+
+ * -
+ - Odoo Online
+ - Odoo.sh
+ - On-premise
+ - Release date
+ - End of standard support
+ * - **Odoo 19.0**
+ - |green|
+ - |green|
+ - |green|
+ - September 2025
+ - September 2028 (planned)
+ * - Odoo SaaS 18.4
+ - |red|
+ - N/A
+ - N/A
+ - July 2025
+ -
+ * - Odoo SaaS 18.3
+ - |red|
+ - N/A
+ - N/A
+ - May 2025
+ -
+ * - Odoo SaaS 18.2
+ - |red|
+ - N/A
+ - N/A
+ - March 2025
+ -
+ * - **Odoo 18.0**
+ - |green|
+ - |green|
+ - |green|
+ - October 2024
+ - September 2027 (planned)
+ * - **Odoo 17.0**
+ - |green|
+ - |green|
+ - |green|
+ - November 2023
+ - September 2026 (planned)
+ * - **Odoo 16.0**
+ - |red|
+ - |red|
+ - |red|
+ - October 2022
+ - September 2025
+ * - **Odoo 15.0**
+ - |red|
+ - |red|
+ - |red|
+ - October 2021
+ - October 2024
+ * - Older versions
+ - |red|
+ - |red|
+ - |red|
+ - Before 2021
+ - Before 2024
+
+.. admonition:: Legend
+
+ |green| : Standard support
+
+ |red| : Extended support available (with an extra fee)
+
+ N/A : Never released for this platform
+
+.. |green| raw:: html
+
+ ●
+
+.. |red| raw:: html
+
+ ●
diff --git a/content/administration/supported_versions.rst b/content/administration/supported_versions.rst
deleted file mode 100644
index 2ff7f1973..000000000
--- a/content/administration/supported_versions.rst
+++ /dev/null
@@ -1,107 +0,0 @@
-:hide-page-toc:
-
-.. _supported_versions:
-
-==================
-Supported versions
-==================
-
-Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
-
-.. note::
- Odoo releases intermediary versions called **Online versions** on the :doc:`Odoo Online
- ` hosting every two months. Odoo Online users can then benefit from the latest
- features of Odoo.
-
- - Admins of Odoo Online databases are invited to :doc:`upgrade ` them regularly.
- - Online versions are *not* released for Odoo.sh and On-Premise installations.
- - Online versions are listed below as *SaaS*.
-
-This matrix shows the support status of every version.
-
-**Major releases are in bold type.**
-
-.. list-table::
- :header-rows: 1
- :widths: auto
-
- * -
- - Odoo Online
- - Odoo.sh
- - On-Premise
- - Release date
- - End of support
- * - **Odoo 19.0**
- - |green|
- - |green|
- - |green|
- - September 2025
- - September 2028 (planned)
- * - Odoo SaaS 18.4
- - |red|
- - N/A
- - N/A
- - July 2025
- -
- * - Odoo SaaS 18.3
- - |red|
- - N/A
- - N/A
- - May 2025
- -
- * - Odoo SaaS 18.2
- - |red|
- - N/A
- - N/A
- - March 2025
- -
- * - **Odoo 18.0**
- - |green|
- - |green|
- - |green|
- - October 2024
- - September 2027 (planned)
- * - **Odoo 17.0**
- - |green|
- - |green|
- - |green|
- - November 2023
- - September 2026 (planned)
- * - **Odoo 16.0**
- - |red|
- - |red|
- - |red|
- - October 2022
- - September 2025
- * - **Odoo 15.0**
- - |red|
- - |red|
- - |red|
- - October 2021
- - October 2024
- * - Older versions
- - |red|
- - |red|
- - |red|
- - Before 2021
- - Before 2024
-
-.. admonition:: Legend
-
- |green| Supported version
-
- |red| End-of-support
-
- N/A Never released for this platform
-
-.. important::
- Even though we don't support older versions, you can always `upgrade from any version
- `_.
-
-.. |green| raw:: html
-
- ●
-
-.. |red| raw:: html
-
- ●
diff --git a/content/administration/upgrade.rst b/content/administration/upgrade.rst
index 7d06815e0..92702b473 100644
--- a/content/administration/upgrade.rst
+++ b/content/administration/upgrade.rst
@@ -4,8 +4,8 @@ Upgrade
An upgrade involves moving a database from an older version to a newer supported version (e.g., from
Odoo 16.0 to Odoo 18.0). Regular upgrades are crucial as each version offers new features, bug
-fixes, and security patches. Using a :doc:`supported version ` is strongly
-recommended. Each major version is supported for three years.
+fixes, and security patches. Using a :doc:`supported version ` is
+strongly recommended. Each major version is supported for three years.
Depending on the hosting type and Odoo version used, a database upgrade can be **mandatory**.
@@ -429,4 +429,4 @@ The following upgrade-related services are **not** included:
.. seealso::
- :doc:`Odoo.sh documentation `
- - :doc:`Supported Odoo versions `
+ - :doc:`Supported Odoo versions `
diff --git a/content/applications/finance/fiscal_localizations/belgium.rst b/content/applications/finance/fiscal_localizations/belgium.rst
index 99c181496..4a5c0b084 100644
--- a/content/applications/finance/fiscal_localizations/belgium.rst
+++ b/content/applications/finance/fiscal_localizations/belgium.rst
@@ -559,7 +559,7 @@ The Odoo POS system is certified for databases hosted on **Odoo Online**, **Odoo
**On-Premise**.
.. seealso::
- :doc:`/administration/supported_versions`
+ :doc:`/administration/standard_extended_support`
A `certified POS system `_ must
adhere to rigorous government regulations, which means it operates differently from a non-certified
diff --git a/content/applications/general/apps_modules.rst b/content/applications/general/apps_modules.rst
index 0561f01e6..f85c4e3eb 100644
--- a/content/applications/general/apps_modules.rst
+++ b/content/applications/general/apps_modules.rst
@@ -45,7 +45,7 @@ Upgrade apps and modules
========================
On some occasions, new improvements or app features are added to :doc:`supported versions of Odoo
-`. To be able to use them, you must **upgrade** your app.
+`. To be able to use them, you must **upgrade** your app.
Go to :menuselection:`Apps`, click on the *dropdown menu* of the app you want to upgrade, then on
*Upgrade*.
diff --git a/content/contributing.rst b/content/contributing.rst
index f052074ea..e468c1500 100644
--- a/content/contributing.rst
+++ b/content/contributing.rst
@@ -31,10 +31,10 @@ lists the most important of them.
- Anyone interested in Odoo
* - Submit bug reports
- Help improve the stability of Odoo by reporting the bugs that you discover in :doc:`supported
- versions ` directly to Odoo support. Make sure to include
- as many details (version, environment, test scenario...) as possible. If you don't have the
- Odoo Enterprise license required for contacting the support, open a new issue on the GitHub
- repository of Odoo.
+ versions ` directly to Odoo support. Make sure to
+ include as many details (version, environment, test scenario...) as possible. If you don't
+ have the Odoo Enterprise license required for contacting the support, open a new issue on the
+ GitHub repository of Odoo.
- * `Odoo support `_
* `Issue tracker on GitHub `_
- Users of Odoo
diff --git a/content/contributing/development.rst b/content/contributing/development.rst
index 3bfc16993..43d1c5b05 100644
--- a/content/contributing/development.rst
+++ b/content/contributing/development.rst
@@ -103,9 +103,9 @@ Now that your environment is set up, you can start contributing to the codebase.
navigate to the directory where you installed Odoo from sources and follow the guide below.
#. Choose the version of Odoo to which you want to make changes. Keep in mind that contributions
- targeting an :doc:`unsupported version of Odoo ` are not
- accepted. This guide assumes that the changes target Odoo {CURRENT_VERSION}, which corresponds to
- branch `{CURRENT_BRANCH}`.
+ targeting an :doc:`unsupported version of Odoo ` are
+ not accepted. This guide assumes that the changes target Odoo {CURRENT_VERSION}, which
+ corresponds to branch `{CURRENT_BRANCH}`.
#. Create a new branch starting from branch {CURRENT_BRANCH}. Prefix the branch name with the base
branch: `{CURRENT_BRANCH}-...`. If you work at Odoo, suffix the branch name with your Odoo
handle: `{CURRENT_BRANCH}-...-xyz`.
diff --git a/content/contributing/documentation.rst b/content/contributing/documentation.rst
index 57e2f6b1f..bf03e5a6b 100644
--- a/content/contributing/documentation.rst
+++ b/content/contributing/documentation.rst
@@ -216,8 +216,8 @@ Contributing to the documentation
#. Choose the version of the documentation to which you want to make changes. Keep in mind
that contributions targeting an :doc:`unsupported version of Odoo
- ` are not accepted. This guide assumes that the changes
- target the documentation of Odoo {CURRENT_VERSION}, which corresponds to branch
+ ` are not accepted. This guide assumes that the
+ changes target the documentation of Odoo {CURRENT_VERSION}, which corresponds to branch
`{CURRENT_BRANCH}`.
#. Create a new branch starting from branch {CURRENT_BRANCH}. Prefix the branch name with the
base branch: `{CURRENT_BRANCH}-...`. If you work at Odoo, suffix the branch name with your
diff --git a/redirects/17.0.txt b/redirects/17.0.txt
index 538b0ec88..2f0383971 100644
--- a/redirects/17.0.txt
+++ b/redirects/17.0.txt
@@ -1,3 +1,7 @@
+# administration
+
+administration/supported_versions.rst administration/standard_extended_support.rst
+
# administration/odoo_sh
administration/odoo_sh/getting_started/first_module.rst administration/odoo_sh/first_module.rst