Delete test

it will also be renamed to .repositories in the near future

closes odoo/documentation#2160

X-original-commit: 1afee9e2c7
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>

.gitattributes

@@ -0,0 +1,2 @@
+# Include RST files in language statistics on GitHub.
+*.rst linguist-detectable

.gitignore

@@ -1,6 +1,7 @@
 *.pyc
-.*
 *.mo
+.*
+!.gitattributes
 
 # Sphinx build files
 _build/

Makefile

@@ -19,6 +19,8 @@ SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSIO
                  -D versions=$(VERSIONS) -D languages=$(LANGUAGES) -D language=$(CURRENT_LANG) \
                  -D is_remote_build=$(IS_REMOTE_BUILD) \
                  -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \
+                 -A plausible_script=$(PLAUSIBLE_SCRIPT) \
+                 -A plausible_domain=$(PLAUSIBLE_DOMAIN) \
 				 -j $(WORKERS)
 SOURCE_DIR     = content
 
@@ -77,6 +79,6 @@ $(HTML_BUILD_DIR)/_static/style.css: extensions/odoo_theme/static/style.scss ext
 fast: SPHINXOPTS += -A collapse_menu=True
 fast: html
 
-static: $(HTML_BUILD_DIR)/static/style.css
+static: $(HTML_BUILD_DIR)/_static/style.css
 	cp -r extensions/odoo_theme/static/* $(HTML_BUILD_DIR)/_static/
 	cp -r static/* $(HTML_BUILD_DIR)/_static/

conf.py

@@ -221,7 +221,7 @@ latex_elements = {
     'tableofcontents': '',  # no TOC
 
     # Output manually in latex docs
-    'releasename': '14.0',
+    'releasename': release,
 }
 
 latex_additional_files = ['static/latex/odoo.sty']

content/administration/install/deploy.rst

@@ -7,7 +7,7 @@ internet-facing server. It follows :ref:`installation <setup/install>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.
 
-.. warning:: If you are setting up a public server, be sure to check our :ref:`security` recommandations!
+.. warning:: If you are setting up a public server, be sure to check our :ref:`security` recommendations!
 
 .. _db_filter:
 

content/administration/maintain/domain_names.rst

@@ -21,6 +21,11 @@ You can use a custom domain name to access your Odoo database and websites:
    databases for one year. Visitors can then access your website with an address such as
    ``www.example.com`` rather than the default ``example.odoo.com``.
 
+.. seealso::
+   - `Odoo Tutorials: Register a Free Domain Name
+     <https://www.odoo.com/slides/slide/register-a-free-domain-name-1663>`_
+   - `Odoo Quick Tips: Get a free domain name! <https://www.youtube.com/watch?v=eAfgeNOHLP4>`_
+
 .. _domain-name/about:
 
 About domain names
@@ -112,7 +117,7 @@ that you proceed with the following actions in this order:
 #. :ref:`Add a CNAME record <domain-name/cname>` on your domain name's DNS zone.
 #. :ref:`Map your domain name with your Odoo database <domain-name/db-map>`.
 #. :ref:`Map your domain name with your Odoo website <domain-name/website-map>`.
-#. Optionnally: :ref:`Change the web base address of your database <domain-name/web-base-url>`. 
+#. Optionally: :ref:`Change the web base address of your database <domain-name/web-base-url>`.
 
 .. _domain-name/cname:
 

content/administration/maintain/hosting_changes.rst

@@ -11,8 +11,6 @@ Depending on the platforms, you have to do it by yourself or contact our support
 From on-premises to Odoo Online
 ===============================
 
-.. warning:: Odoo Online is not compatible with **non-standard apps**.
-
 1. Create a :ref:`duplicate <duplicate_premise>` of your database: in this duplicate, uninstall all the **non-standard apps**.
 2. Grab a "dump with filestore" of your database by using the Database Manager.
 3. **If you have time constraints, contact us earlier to schedule the transfer.**
@@ -20,6 +18,11 @@ From on-premises to Odoo Online
 5. We will make sure your database is compatible and upload it to our cloud. In case of technical issues, we will get in touch with you.
 6. It's done!
 
+.. important::
+   - Odoo Online is not compatible with **non-standard apps**.
+   - The database you are moving to Odoo Online must be in a :doc:`supported version
+     <supported_versions>`.
+
 From on-premises to Odoo.sh
 ===========================
 
@@ -45,13 +48,37 @@ From Odoo Online to Odoo.sh
 From Odoo.sh to Odoo Online
 ===========================
 
-.. warning:: Odoo Online is not compatible with **non-standard apps**.
+#. Uninstall all the **non-standard apps**.
+#. `Create a support ticket <https://www.odoo.com/help>`_ and include the following:
 
-1.  Uninstall all the **non-standard apps**: test it in a staging build first, then do it in your production build.
-2.  **If you have time constraints, contact us earlier to schedule the transfer.**
-3. `Create a support ticket <https://www.odoo.com/help>`_ and include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com).
-4.  We will make sure your database is compatible and upload it to our cloud. In case of technical issues, we will get in touch with you.
-5.  It's done!
+   - Your subscription number
+   - The URL you want to use for your database (e.g., `example.odoo.com`)
+   - Which brand you want to migrate
+   - In which region you want to be hosted:
+
+     - Americas
+     - Europe
+     - Asia
+
+   - Which user(s) will be the administrator(s)
+   - When (and in which timezone) you want the database to be up and running
+
+#. We will make sure your database is compatible and upload it to our cloud. In case of technical
+   issues, we will get in touch with you.
+#. All done!
+
+.. important::
+   - Odoo Online is not compatible with **non-standard apps**.
+   - Make sure to uninstall all the **non-standard apps** in a staging build before doing it in your
+     production build.
+
+.. note::
+   - Make sure you select the **region** that is closest to your users to reduce latency.
+   - The future **administrator(s)** must have an odoo.com account.
+   - The specific **date and time** at which you want the database to be up and running are mainly
+     helpful to organize the switch from the odoo.sh server to the Odoo Online servers.
+   - Databases are **not reachable** during their migration.
+   - **If you have time constraints, contact us earlier to schedule the transfer**.
 
 From Odoo.sh to on-premises
 ===========================

content/administration/maintain/online.rst

@@ -36,8 +36,8 @@ Upgrade
 =======
 
 If you are *not* on the latest **Online version**, you should receive an invitation to :doc:`upgrade
-<../upgrade/process>` your database. A **Rolling Release button** on your database's main screen
-proposes an upgrade to the latest version (e.g., 13.0 to 15.1).
+<../upgrade>` your database. A **Rolling Release button** on your database's main screen proposes an
+upgrade to the latest version (e.g., 13.0 to 15.1).
 
 .. important::
    - | **If your Odoo database's version is lower than the latest major release:**
@@ -53,7 +53,7 @@ proposes an upgrade to the latest version (e.g., 13.0 to 15.1).
    allows you to request a test upgrade of your database to check for any discrepancies.
 
 .. seealso::
-   - :doc:`../upgrade/process`
+   - :doc:`../upgrade`
    - :doc:`supported_versions`
 
 .. _online/duplicate:

content/administration/maintain/supported_versions.rst

@@ -11,8 +11,7 @@ Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
    Odoo releases intermediary versions called **Online versions** on the :doc:`Odoo Online <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 <../upgrade/process>` them
-     regularly.
+   - Admins of Odoo Online databases are invited to :doc:`upgrade <../upgrade>` them regularly.
    - Online versions are *not* released for Odoo.sh and On-Premise installations.
    - Online versions are listed below as *SaaS*.
 
@@ -26,7 +25,9 @@ This matrix shows the support status of every version.
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 |                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
 +=================+=============+==========+=============+================+========================+
-| Odoo 15.saas~1  | |green|     | N/A      | N/A         | February 2022  |                        |
+| Odoo saas~15.2  | |green|     | N/A      | N/A         | March 2022     |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo saas~15.1  | |red|       | N/A      | N/A         | February 2022  |                        |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | **Odoo 15.0**   | |green|     | |green|  | |green|     | October 2021   | October 2024 (planned) |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
@@ -34,11 +35,11 @@ This matrix shows the support status of every version.
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | **Odoo 13.0**   | |green|     | |green|  | |green|     | October 2019   | October 2022 (planned) |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 12.saas~3  | |red|       | N/A      | N/A         | August 2019    |                        |
+| Odoo saas~12.3  | |red|       | N/A      | N/A         | August 2019    |                        |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | **Odoo 12.0**   | |red|       | |red|    | |red|       | October 2018   | October 2021           |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 11.saas~3  | |red|       | N/A      | N/A         | April 2018     |                        |
+| Odoo saas~11.3  | |red|       | N/A      | N/A         | April 2018     |                        |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | **Odoo 11.0**   | |red|       | |red|    | |red|       | October 2017   | October 2020           |
 +-----------------+-------------+----------+-------------+----------------+------------------------+

content/administration/odoo_sh/advanced/containers.rst

@@ -232,6 +232,6 @@ Save the file and then run the Odoo Shell:
 Finally, *via* the Odoo Shell, you can trigger the piece of code/function/method
 you want to debug.
 
-.. image:: ./media/pdb_sh.png
+.. image:: containers/pdb_sh.png
     :align: center
     :alt: Console screenshot showing ``pdb`` running in an Odoo.sh shell.

content/administration/odoo_sh/advanced/submodules.rst

@@ -44,7 +44,7 @@ On Odoo.sh, in the branches view of your project, choose the branch in which you
 
 In the upper right corner, click on the *Submodule* button, and then on *Run*.
 
-.. image:: ./media/advanced-submodules-button.png
+.. image:: submodules/advanced-submodules-button.png
    :align: center
 
 A dialog with a form is shown. Fill the inputs as follows:
@@ -53,12 +53,12 @@ A dialog with a form is shown. Fill the inputs as follows:
 * Branch: The branch you want to use.
 * Path: The folder in which you want to add this submodule in your branch.
 
-.. image:: ./media/advanced-submodules-dialog.png
+.. image:: submodules/advanced-submodules-dialog.png
    :align: center
 
 On Github, you can get the repository URL with the *Clone or download* button of the repository. Make sure to *use SSH*.
 
-.. image:: ./media/advanced-submodules-github-sshurl.png
+.. image:: submodules/advanced-submodules-github-sshurl.png
   :align: center
 
 .. _odoosh-advanced-submodules-withgit:

content/administration/odoo_sh/getting_started/branches.rst

@@ -8,7 +8,7 @@ Overview
 
 The branches view gives you an overview of the different branches your repository has.
 
-.. image:: ./media/interface-branches.png
+.. image:: branches/interface-branches.png
    :align: center
 
 .. _odoosh-gettingstarted-branches-stages:
@@ -20,7 +20,7 @@ Odoo.sh offers three different stages for your branches: production, staging and
 
 You can change the stage of a branch by drag and dropping it into the stage section title.
 
-.. image:: ./media/interface-branches-stagechange.png
+.. image:: branches/interface-branches-stagechange.png
    :align: center
 
 .. _stage_production:
@@ -109,7 +109,7 @@ Merging your branches
 ---------------------
 You can merge your branches easily by drag and dropping them into each other.
 
-.. image:: ./media/interface-branches-merge.png
+.. image:: branches/interface-branches-merge.png
    :align: center
 
 When you want to test the changes of your development branches with the production data,
@@ -156,7 +156,7 @@ An overview of your branch history:
 * The messages of the commits and their authors,
 * The various events linked to the platform, such as stage changes, database imports, backup restores.
 
-.. image:: ./media/interface-branches-history.png
+.. image:: branches/interface-branches-history.png
    :align: center
 
 For each event, a status is displayed in the top right-hand corner.
@@ -172,7 +172,7 @@ This tab contains the mail catcher. It displays an overview of the emails sent b
 The mail catcher is available for your development and
 staging branches as the emails of your production database are really sent instead of being intercepted.
 
-.. image:: ./media/interface-branches-mails.png
+.. image:: branches/interface-branches-mails.png
    :align: center
    :scale: 50%
 
@@ -181,7 +181,7 @@ Shell
 A shell access to your container. You can perform basic linux commands (:code:`ls`, :code:`top`)
 and open a shell on your database by typing :code:`psql`.
 
-.. image:: ./media/interface-branches-shell.png
+.. image:: branches/interface-branches-shell.png
    :align: center
 
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
@@ -197,7 +197,7 @@ Editor
 An online integrated development environment (IDE) to edit the source code.
 You can also open terminals, Python consoles and even Odoo Shell consoles.
 
-.. image:: ./media/interface-branches-editor.png
+.. image:: branches/interface-branches-editor.png
    :align: center
 
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
@@ -207,7 +207,7 @@ Monitoring
 ----------
 This link contains various monitoring metrics of the current build.
 
-.. image:: ./media/interface-branches-monitoring.png
+.. image:: branches/interface-branches-monitoring.png
    :align: center
 
 You can zoom, change the time range or select a specific metric on each graph.
@@ -219,7 +219,7 @@ Logs
 ----
 A viewer to have a look to your server logs.
 
-.. image:: ./media/interface-branches-logs.png
+.. image:: branches/interface-branches-logs.png
    :align: center
 
 Different logs are available:
@@ -243,7 +243,7 @@ Backups
 A list of the backups available for download and restore, the ability to perform a manual backup and to import a
 database.
 
-.. image:: ./media/interface-branches-backups.png
+.. image:: branches/interface-branches-backups.png
    :align: center
 
 Odoo.sh makes daily backups of the production database. It keeps 7 daily, 4 weekly and 3 monthly backups.
@@ -285,7 +285,7 @@ Settings
 --------
 Here you can find a couple of settings that only apply to the currently selected branch.
 
-.. image:: ./media/interface-branches-settings.jpg
+.. image:: branches/interface-branches-settings.jpg
    :align: center
 
 **Behaviour upon new commit**
@@ -302,7 +302,7 @@ back from staging to development will automatically be set to 'Do nothing'.
 
 Choose the modules to install automatically for your development builds.
 
-.. image:: ./media/interface-settings-modulesinstallation.png
+.. image:: branches/interface-settings-modulesinstallation.png
    :align: center
 
 * *Install only my modules* will install the modules of the branch only. This is the default option.
@@ -397,7 +397,7 @@ Shell commands
 ==============
 In the top right-hand corner of the view, different shell commands are available.
 
-.. image:: ./media/interface-branches-shellcommands.png
+.. image:: branches/interface-branches-shellcommands.png
    :align: center
 
 Each command can be copied in the clipboard to be used in a terminal,
@@ -466,12 +466,12 @@ To do so, follow these steps:
    (only apply the step 1)
 #. Paste the copied content to your profile SSH keys and press "Add"
 
-   .. image:: ./media/SSH-key-pasting.png
+   .. image:: branches/SSH-key-pasting.png
       :align: center
 
 #. The key should appear below
 
-   .. image:: ./media/SSH-key-appearing.png
+   .. image:: branches/SSH-key-appearing.png
       :align: center
 
 Connection
@@ -485,7 +485,7 @@ To connect to your builds using ssh use the following command in a terminal:
 
 You will find a shortcut for this command into the SSH tab in the upper right corner.
 
-.. image:: ./media/SSH-panel.png
+.. image:: branches/SSH-panel.png
    :align: center
 
 Provided you have the :ref:`correct access rights <odoosh-gettingstarted-settings-collaborators>` on the project,

content/administration/odoo_sh/getting_started/builds.rst

@@ -13,7 +13,7 @@ In Odoo.sh, a build is considered as a database loaded by an Odoo server
 running on a specific revision of your project repository in a containerized environment.
 Its purpose is to test the well-behavior of the server, the database and the features with this revision.
 
-.. image:: ./media/interface-builds.png
+.. image:: builds/interface-builds.png
    :align: center
 
 In this view, a row represents a branch, and a cell of a row represents a build of this branch.
@@ -95,7 +95,7 @@ Features
 The production branch will always appear first,
 and then the other branches are ordered by last build created. You can filter out the branches.
 
-.. image:: ./media/interface-builds-branches.png
+.. image:: builds/interface-builds-branches.png
    :align: center
 
 For each branch, you can access the last build's database using the *Connect* link and jump to the branch code using
@@ -103,7 +103,7 @@ the *Github* link. For other branches than the production, you can create a new
 of the branch using the link *rebuild*. This last link is not available when there is already a build in progress for
 the branch.
 
-.. image:: ./media/interface-builds-build.png
+.. image:: builds/interface-builds-build.png
    :align: center
 
 For each build, you can access the revision changes using the button with the Github icon.
@@ -113,7 +113,7 @@ in the dropdown menu of the *Connect* button.
 
 .. _odoosh-gettingstarted-builds-download-dump:
 
-.. image:: ./media/interface-builds-build-dropdown.png
+.. image:: builds/interface-builds-build-dropdown.png
    :align: center
 
 .. _odoosh-gettingstarted-builds-dropdown-menu:

content/administration/odoo_sh/getting_started/create.rst

@@ -10,7 +10,7 @@ Deploy your platform
 
 Go to `Odoo.sh <https://www.odoo.sh/>`_ and hit the *Deploy your platform* button.
 
-.. image:: ./media/deploy.png
+.. image:: create/deploy.png
    :align: center
 
 Sign in with Github
@@ -18,7 +18,7 @@ Sign in with Github
 
 Sign in with your Github account. If you do not have an account yet, hit the *Create an account* link.
 
-.. image:: ./media/github-signin.png
+.. image:: create/github-signin.png
    :align: center
 
 Authorize Odoo.sh
@@ -26,7 +26,7 @@ Authorize Odoo.sh
 
 Grant Odoo.sh the required accesses to your account by clicking the *Authorize* button.
 
-.. image:: ./media/github-authorize.png
+.. image:: create/github-authorize.png
    :align: center
 
 Odoo.sh basically needs:
@@ -62,7 +62,7 @@ When submitting the form, if you are notified your subscription is not valid, it
 
 In case of doubt with your subscription, please contact the `Odoo support <https://www.odoo.com/help>`_.
 
-.. image:: ./media/deploy-form.png
+.. image:: create/deploy-form.png
    :align: center
 
 You're done !
@@ -70,7 +70,7 @@ You're done !
 
 You can start using Odoo.sh. Your first build is about to be created. You will soon be able to connect to your first database.
 
-.. image:: ./media/deploy-done.png
+.. image:: create/deploy-done.png
    :align: center
 
 .. _odoo_sh_import_your_database:
@@ -113,12 +113,12 @@ Access the URL :file:`/web/database/manager` of your on-premise database and dow
 
 You will need the master password of your database server. If you do not have it, contact your system administrator.
 
-.. image:: ./media/create-import-onpremise-backup.png
+.. image:: create/create-import-onpremise-backup.png
    :align: center
 
 Choose a zip including the filestore as the backup format.
 
-.. image:: ./media/create-import-onpremise-backup-dialog.png
+.. image:: create/create-import-onpremise-backup-dialog.png
   :align: center
 
 Odoo Online databases
@@ -126,7 +126,7 @@ Odoo Online databases
 
 `Access your databases manager <https://accounts.odoo.com/my/databases/manage>`_ and download a backup of your database.
 
-.. image:: ./media/create-import-online-backup.png
+.. image:: create/create-import-online-backup.png
   :align: center
 
 .. Warning::
@@ -138,12 +138,12 @@ Upload the backup
 
 Then, in your Odoo.sh project, in the backups tab of your production branch, import the backup you just downloaded.
 
-.. image:: ./media/create-import-production.png
+.. image:: create/create-import-production.png
    :align: center
 
 Once the backup imported, you can access the database using the *Connect* button in the history of the branch.
 
-.. image:: ./media/create-import-production-done.png
+.. image:: create/create-import-production-done.png
   :align: center
 
 Check your outgoing email servers

content/administration/odoo_sh/getting_started/first_module.rst

@@ -37,20 +37,20 @@ In the branches view:
 
   |pic1|  |pic2|
 
-.. |pic1| image:: ./media/firstmodule-development-+.png
+.. |pic1| image:: first_module/firstmodule-development-+.png
    :width: 45%
 
-.. |pic2| image:: ./media/firstmodule-development-fork.png
+.. |pic2| image:: first_module/firstmodule-development-fork.png
    :width: 45%
 
 
 Once the build created, you can access the editor and browse to the folder *~/src/user* to access
 to the code of your development branch.
 
-.. image:: ./media/firstmodule-development-editor.png
+.. image:: first_module/firstmodule-development-editor.png
   :align: center
 
-.. image:: ./media/firstmodule-development-editor-interface.png
+.. image:: first_module/firstmodule-development-editor-interface.png
   :align: center
 
 From your computer
@@ -95,7 +95,7 @@ Or, from your computer, if you have an :ref:`installation of Odoo <setup/install
   $ ./odoo-bin scaffold my_module ~/src/odoo-addons/
 
 If you do not want to bother installing Odoo on your computer,
-you can also :download:`download this module structure template <media/my_module.zip>` in which you replace every occurrences of
+you can also :download:`download this module structure template <first_module/my_module.zip>` in which you replace every occurrences of
 *my_module* to the name of your choice.
 
 The below structure will be generated:
@@ -201,19 +201,19 @@ Test your module
 
 Your branch should appear in your development branches in your project.
 
-.. image:: ./media/firstmodule-test-branch.png
+.. image:: first_module/firstmodule-test-branch.png
   :align: center
 
 In the branches view of your project,
 you can click on your branch name in the left navigation panel to access its history.
 
-.. image:: ./media/firstmodule-test-branch-history.png
+.. image:: first_module/firstmodule-test-branch-history.png
   :align: center
 
 You can see here the changes you just pushed, including the comment you set.
 Once the database ready, you can access it by clicking the *Connect* button.
 
-.. image:: ./media/firstmodule-test-database.png
+.. image:: first_module/firstmodule-test-database.png
   :align: center
 
 If your Odoo.sh project is configured to install your module automatically,
@@ -234,12 +234,12 @@ You can either:
 
 * Make your development branch a staging branch, by drag and dropping it onto the *staging* section title.
 
-  .. image:: ./media/firstmodule-test-devtostaging.png
+  .. image:: first_module/firstmodule-test-devtostaging.png
     :align: center
 
 * Merge it in an existing staging branch, by drag and dropping it onto the given staging branch.
 
-  .. image:: ./media/firstmodule-test-devinstaging.png
+  .. image:: first_module/firstmodule-test-devinstaging.png
     :align: center
 
 You can also use the :code:`git merge` command to merge your branches.
@@ -247,7 +247,7 @@ You can also use the :code:`git merge` command to merge your branches.
 This will create a new staging build, which will duplicate the production database and make it run using a server
 updated with your latest changes of your branch.
 
-.. image:: ./media/firstmodule-test-mergedinstaging.png
+.. image:: first_module/firstmodule-test-mergedinstaging.png
   :align: center
 
 Once the database ready, you can access it using the *Connect* button.
@@ -267,12 +267,12 @@ Your module may not appear directly in your apps to install either, you need to
 * in the apps menu, click the *Update Apps List* button,
 * in the dialog that appears, click the *Update* button.
 
-  .. image:: ./media/firstmodule-test-updateappslist.png
+  .. image:: first_module/firstmodule-test-updateappslist.png
     :align: center
 
 Your module will then appear in the list of available apps.
 
-.. image:: ./media/firstmodule-test-mymoduleinapps.png
+.. image:: first_module/firstmodule-test-mymoduleinapps.png
   :align: center
 
 Deploy in production
@@ -283,7 +283,7 @@ and believe it is ready for production, you can merge your branch in the product
 
 Drag and drop your staging branch on the production branch.
 
-.. image:: ./media/firstmodule-test-mergeinproduction.png
+.. image:: first_module/firstmodule-test-mergeinproduction.png
   :align: center
 
 You can also use the :code:`git merge` command to merge your branches.
@@ -291,7 +291,7 @@ You can also use the :code:`git merge` command to merge your branches.
 This will merge the latest changes of your staging branch in the production branch,
 and update your production server with these latest changes.
 
-.. image:: ./media/firstmodule-test-mergedinproduction.png
+.. image:: first_module/firstmodule-test-mergedinproduction.png
   :align: center
 
 Once the database ready, you can access it using the *Connect* button.
@@ -411,7 +411,7 @@ Or, from your computer terminal:
 
 The platform will then create a new build for the branch *feature-1*.
 
-.. image:: ./media/firstmodule-test-addachange-build.png
+.. image:: first_module/firstmodule-test-addachange-build.png
   :align: center
 
 Once you tested your changes, you can merge your changes in the production branch, for instance by drag-and-dropping the

content/administration/odoo_sh/getting_started/online-editor.rst

@@ -12,7 +12,7 @@ The online editor allows you to edit the source code of your builds from a web b
 It also gives you the possibility to open terminals, Python consoles, Odoo Shell consoles and
 `Notebooks <https://jupyterlab.readthedocs.io/en/stable/user/notebook.html>`_.
 
-.. image:: ./media/interface-editor.png
+.. image:: online-editor/interface-editor.png
    :align: center
 
 You can access the editor of a build through
@@ -37,7 +37,6 @@ The working directory is composed of the following folders:
   │         │    ├── enterprise          Odoo Enterprise source code
   │         │    ├── themes              Odoo Themes source code
   │         │    └── user                Your repository branch source code
-  │         ├── repositories             The Git repositories used by your project
   │         ├── data
   │         │    ├── filestore           database attachments, as well as the files of binary fields
   │         │    └── sessions            visitors and users sessions
@@ -66,20 +65,20 @@ server is not a good practice.
 
 To open a file in the editor, just double-click on it in the file browser panel on the left.
 
-.. image:: ./media/interface-editor-open-file.png
+.. image:: online-editor/interface-editor-open-file.png
    :align: center
 
 You can then begin to make your changes. You can save your changes with the menu
 :menuselection:`File --> Save .. File` or by hitting the :kbd:`Ctrl+S` shortcut.
 
-.. image:: ./media/interface-editor-save-file.png
+.. image:: online-editor/interface-editor-save-file.png
    :align: center
 
 If you save a Python file which is under your Odoo server addons path,
 Odoo will detect it and reload automatically so your changes are reflected immediately,
 without having to restart the server manually.
 
-.. image:: ./media/interface-editor-automaticreload.gif
+.. image:: online-editor/interface-editor-automaticreload.gif
    :align: center
 
 However, if the change is a data stored in database, such as the label of a field, or a view,
@@ -88,7 +87,7 @@ You can update the module of the currently opened file by using the menu
 :menuselection:`Odoo --> Update current module`. Note that the file considered as currently opened
 is the file focused in the text editor, not the file highlighted in the file browser.
 
-.. image:: ./media/interface-editor-update-current-module.png
+.. image:: online-editor/interface-editor-update-current-module.png
    :align: center
 
 You can also open a terminal and execute the command:
@@ -118,7 +117,7 @@ In this last command,
 * <branch> must be replaced by the name of the branch to which you want to push the changes,
   most-likely the current branch if you work in a development build.
 
-.. image:: ./media/interface-editor-commit-push.png
+.. image:: online-editor/interface-editor-commit-push.png
    :align: center
 
 .. Note::
@@ -160,7 +159,7 @@ Thanks to this, you will be able to display objects in HTML.
 You can for instance display cells of a CSV file using
 `pandas <https://pandas.pydata.org/pandas-docs/stable/tutorials.html>`_.
 
-.. image:: ./media/interface-editor-console-python-read-csv.png
+.. image:: online-editor/interface-editor-console-python-read-csv.png
    :align: center
 
 You can also open an Odoo Shell console to play around
@@ -189,12 +188,12 @@ to easily display lists and dicts in a pretty way, using the
 `rich display <https://ipython.readthedocs.io/en/stable/config/integrating.html#rich-display>`_
 mentioned above.
 
-.. image:: ./media/interface-editor-console-odoo-pretty.png
+.. image:: online-editor/interface-editor-console-odoo-pretty.png
    :align: center
 
 You can also use
 `pandas <https://pandas.pydata.org/pandas-docs/stable/tutorials.html>`_
 to display graphs.
 
-.. image:: ./media/interface-editor-console-odoo-graph.png
+.. image:: online-editor/interface-editor-console-odoo-graph.png
   :align: center

content/administration/odoo_sh/getting_started/settings.rst

@@ -8,7 +8,7 @@ Overview
 
 The settings allow you to manage the configuration of your project.
 
-.. image:: ./media/interface-settings.png
+.. image:: settings/interface-settings.png
    :align: center
 
 Project name
@@ -16,7 +16,7 @@ Project name
 
 The name of your project.
 
-.. image:: ./media/interface-settings-projectname.png
+.. image:: settings/interface-settings-projectname.png
    :align: center
 
 This defines the address that will be used to access your production database.
@@ -31,7 +31,7 @@ Collaborators
 
 Manage the Github users who can access your project.
 
-.. image:: ./media/interface-settings-collaborators.png
+.. image:: settings/interface-settings-collaborators.png
    :align: center
 
 There are two levels of users:
@@ -87,7 +87,7 @@ Public Access
 
 Allow public access to your development builds.
 
-.. image:: ./media/interface-settings-public.png
+.. image:: settings/interface-settings-public.png
    :align: center
 
 If activated, this option exposes the Builds page publicly, allowing visitors to connect to your development builds.
@@ -117,7 +117,7 @@ as submodules in your branches to allow Odoo.sh to download them.
   If you are looking on how to set up your submodules,
   instructions are available in the chapter :ref:`Submodules <odoosh-advanced-submodules>` of this documentation.
 
-.. image:: ./media/interface-settings-submodules.png
+.. image:: settings/interface-settings-submodules.png
    :align: center
 
 When a repository is private, it is not possible to publicly download its branches and revisions.
@@ -148,7 +148,7 @@ Storage Size
 
 This section shows the storage size used by your project.
 
-.. image:: ./media/interface-settings-storage.png
+.. image:: settings/interface-settings-storage.png
    :align: center
 
 Storage size is computed as follows:
@@ -170,7 +170,7 @@ Additional database workers can be configured here. More workers help increase t
 production database is able to handle. If you add more, it will automatically be synchronized
 with your subscription.
 
-.. image:: ./media/interface-settings-workers.png
+.. image:: settings/interface-settings-workers.png
    :align: center
 
 .. Warning::
@@ -185,7 +185,7 @@ Staging Branches
 Additional staging branches allow you to develop and test more features at the same time. If you
 add more, it will automatically be synchronized with your subscription.
 
-.. image:: ./media/interface-settings-staging-branches.png
+.. image:: settings/interface-settings-staging-branches.png
    :align: center
 
 Activation
@@ -193,5 +193,5 @@ Activation
 
 Shows the status of the project's activation. You can change the project's activation code if needed.
 
-.. image:: ./media/interface-settings-activation.png
+.. image:: settings/interface-settings-activation.png
    :align: center

content/administration/odoo_sh/getting_started/status.rst

@@ -8,5 +8,5 @@ Overview
 
 The status page shows statistics regarding the servers your project uses. It includes the servers availability.
 
-.. image:: ./media/interface-status.png
+.. image:: status/interface-status.png
    :align: center

content/administration/upgrade.rst

@@ -1,12 +1,257 @@
-:nosearch:
+:show-content:
+
+.. |assistance-contact| replace::
+   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
+   our `Sales department`_.
+.. _Sales department: mailto:sales@odoo.com
 
 =======
 Upgrade
 =======
 
 .. toctree::
+   :titlesonly:
 
-    upgrade/process
-    upgrade/odoo_sh
-    upgrade/service_level
-    upgrade/faq
+   upgrade/online_hosting
+   upgrade/odoo_sh
+   upgrade/on_premise
+   upgrade/faq
+
+An upgrade is switching to a newer version of Odoo (e.g., Odoo 14.0 to Odoo 15.0).
+
+An upgrade does not cover:
+
+* Changing :ref:`editions <upgrade-faq/editions-change>` (i.e., Community to Enterprise edition)
+* Switching :ref:`hosting type <upgrade-faq/hosting-types-switch>` (i.e., On-Premise to Online or
+  Odoo.sh)
+* Migration from another ERP to Odoo
+
+.. note:: |assistance-contact|
+
+.. seealso::
+   - :ref:`upgrade/sla`
+
+.. _upgrade/process-workflow:
+
+Process workflow
+================
+
+The upgrade process in a nutshell:
+
+#. You create a test upgrade request.
+#. Odoo processes the request automatically by running the database through an upgrade script, which
+   takes between 20 and 120 minutes.
+#. Odoo delivers a test database.
+#. You test your database for possible discrepancies (see :ref:`upgrade/test-guidance`).
+#. If there are any discrepancies, you report them to the Upgrade support team via the help portal
+   (see :ref:`upgrade/test-assistance`).
+#. We fix the issues and send you a new test database.
+#. Once you have completed the testing and are happy with the result, you decide on a date and time
+   when you stop users from accessing Odoo, freeze all data entries, and create an upgrade request
+   for the production upgrade.
+#. Odoo delivers the production database through the automated process.
+#. You restore it in your Production environment a few short hours later and continue working on the
+   newly upgraded database (this is done automatically on Odoo Online).
+
+.. seealso::
+   - :doc:`Upgrade process for Odoo Online (SaaS) <upgrade/online_hosting>`
+   - :doc:`Upgrade process for Odoo.sh <upgrade/odoo_sh>`
+   - :doc:`Upgrade process for On-Premise <upgrade/on_premise>`
+
+.. _upgrade/testing-phase:
+
+Testing
+=======
+
+This phase allows you to review an upgraded version of your database without affecting your
+production database in any way. We suggest that you run the test upgrade process at least once, but
+you can do it as many times as you need (one at a time).
+
+Once you receive your upgraded test database, check that all data, processes, and functionality are
+still correct and working as expected.
+
+If you do find discrepancies, :ref:`report your issues <upgrade/test-assistance>` and :ref:`request
+a new test database <upgrade/test-db-request>` when the reported issues are fixed in the upgrade
+script.
+
+If you do not find any discrepancies, you can move on to the upgrade of your production database.
+
+.. important::
+   A test database is only intended for testing and remains completely unrelated to your present or
+   future production database. Any data you add, or changes you make, will not be reflected in your
+   upgraded production database.
+
+.. note::
+   Test databases are neutered and features are disabled to prevent them from having an impact on
+   the production database:
+
+   #. The serial number of the database is modified (to prevent it from sending information as if it
+      was the production database).
+   #. The :ref:`base URL of the database <domain-name/web-base-url>` is reset to
+      ``http://localhost:8069`` and the email domain to ``localhost``.
+   #. Scheduled actions are disabled (the calendar synchronization, the bank statement
+      synchronization, the planned automated actions, the fetching of incoming mail servers, etc.).
+   #. Outgoing mail servers are disabled by archiving the existing ones and adding a
+      fake/non-working one.
+   #. Payment providers and delivery carriers are reset to test environment.
+   #. Accounting localization Electronic Data Interchange (EDI) services are disabled.
+   #. A system parameter is set to tell the database has been neutered.
+
+.. _upgrade/test-db-request:
+
+Request a test database
+=======================
+
+Follow the instructions available per hosting type on the `website form
+<https://upgrade.odoo.com>`_ and select *Testing* purpose.
+
+.. image:: upgrade/test-purpose.png
+   :align: center
+   :alt: Selection of the "Testing" purpose in the upgrade form on Odoo
+
+.. _upgrade/test-guidance:
+
+Test guidance
+=============
+
+Every business and organization has its own operational needs and has to test its specific Odoo
+database individually. We recommend you look at `the test scenario
+<https://docs.google.com/document/d/1ypNs7JKPOsjNbKpdiKFH7Al6g6whZ9jr7f7duAQ5E1w/>`_ for further
+information.
+
+.. todo:: change link "test scenario" once the related doc is published
+
+.. _upgrade/test-assistance:
+
+Assistance
+----------
+
+If you encounter an issue in the **test database**, please get in touch with Odoo Upgrade Support
+via the `Odoo Support page <https://www.odoo.com/help>`_.
+
+Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
+
+   .. image:: upgrade/test-assistance.png
+      :align: center
+      :alt: Selection of "An issue related to my upgrade" as Ticket Type in the support form on Odoo
+
+   .. warning::
+      If you choose another *Ticket Description* type, the request will be redirected to another
+      team. This will slow down the processing and response time.
+
+Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
+This will avoid clarifying questions and speed up the resolution process significantly.
+
+.. note::
+   * The purpose of the test phase is not to correct existing data or configurations in your
+     database.
+   * |assistance-contact|
+
+.. _upgrade/steps-production:
+
+The production launch
+=====================
+
+The production upgrade request is when you decide to upgrade your current database with all your
+production data (invoices, VAT returns, inventories, current orders) to a new version of your
+choice.
+
+After your :ref:`tests <upgrade/testing-phase>` are completed to your satisfaction, submit the
+request to upgrade your production database via our `website form <https://upgrade.odoo.com>`_.
+Select *Production* purpose.
+
+.. important::
+   Going into production without first testing may lead to:
+
+   - business interruptions (e.g., no longer having the possibility to validate an action)
+   - poor customer experiences (e.g., an eCommerce website that does not work correctly)
+
+.. _upgrade/production-assistance:
+
+Assistance
+----------
+
+If you encounter issues or problems in the **production database**, please get in touch with **Odoo
+Support**:
+
+#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
+#. Under the *Ticket Description* section, select the appropriate type related to your issue but
+   **do not select** the option *An issue related to my upgrade*.
+
+   .. note::
+      After upgrading to production, the support will be provided by the Support team instead of the
+      Upgrade team.
+
+#. Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
+   This will avoid clarifying questions and speed up the resolution process significantly.
+
+   .. warning::
+      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
+      to another team than the support one and will slow down the processing and response time.
+
+.. _upgrade/assistance:
+
+Help
+====
+
+.. _upgrade/contact:
+
+Contact our Upgrade service support
+-----------------------------------
+
+Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
+Upgrade Team <mailto:upgrade@odoo.com>`_. We will be happy to answer it as soon as possible.
+
+.. _upgrade/supported-versions:
+
+Supported versions
+------------------
+
+Please note that Odoo provides support and bug fixing only for the three last major versions of
+Odoo.
+
+This is a factor to take into consideration before upgrading. If you are on an older version, we
+suggest you to prefer the most recent version to benefit from longer support (before having to
+upgrade again).
+
+.. seealso::
+   :doc:`maintain/supported_versions`
+
+.. _upgrade/sla:
+
+Service Level Agreement
+=======================
+
+What is covered by the Enterprise Licence?
+------------------------------------------
+
+Databases hosted on Odoo’s Cloud platforms (Saas and Odoo.sh) or On-Premise (Self-Hosting) enjoy the
+following services at all times.
+
+The upgrade of:
+
+* standard applications
+* Studio customization (as long as the :guilabel:`Studio` app is still active)
+* customizations done by our consulting and developer services *if* they are covered by a
+  ‘Maintenance of Customisations’ subscription
+
+The Upgrade Service is limited to your database's technical conversion and adaptation (standard
+modules and data) to make it compatible with the targeted version.
+
+What upgrading does NOT cover
+-----------------------------
+
+* The cleaning of pre-existing data & configuration while upgrading
+* Any new developments and/or upgrades of your own :ref:`custom modules
+  <upgrade-faq/custom-modules>`
+* `Training <https://www.odoo.com/learn>`_ on the latest version
+
+You can get more information about your Enterprise Licence on our :ref:`Odoo Enterprise Subscription
+Agreement <upgrade>` page.
+
+.. note:: |assistance-contact|
+
+.. seealso::
+   - :doc:`upgrade/faq`
+   - :doc:`odoo_sh`
+   - :doc:`maintain/supported_versions`

content/administration/upgrade/faq.rst

@@ -47,13 +47,13 @@ In general, the "smaller" the database, the quickest the upgrade request is comp
 database that uses only CRM will be processed faster than a multi-company, multi-user database that
 uses Accounting, Sales, Purchase, and Manufacturing.
 
-You can expect the time it takes for the platform to upgrade the test database will be similar to
-the production upgrade.
+You can expect the time it takes for the platform to upgrade the test database to be similar to the
+production upgrade.
 
 .. _upgrade-faq/project:
 
-The upgrade project
-===================
+Duration of the upgrade project
+-------------------------------
 
 It depends on the user involvement (the time spent on testing, reporting problems, etc.) and the
 issues encountered that might need to be addressed by our technical team.
@@ -80,6 +80,17 @@ partners, or you can do it yourself.
 
 .. note:: |assistance-contact|
 
+.. _upgrade-faq/upgrade-or-migration:
+
+Upgrade or Migration
+====================
+
+An upgrade is switching to a newer version of Odoo, while a migration reflects the change of
+:ref:`editions <upgrade-faq/editions-change>` or change of :ref:`hosting type
+<upgrade-faq/hosting-types-switch>`.
+
+.. note:: |assistance-contact|
+
 .. _upgrade-faq/editions-change:
 
 Editions change (from Community to Enterprise)
@@ -88,7 +99,9 @@ Editions change (from Community to Enterprise)
 The upgrade always returns an Enterprise edition of Odoo, whether the database you sent was a
 community or enterprise edition. It is required to have an enterprise subscription to upgrade.
 
-.. note:: |assistance-contact|
+ .. note::
+    If you need assistance on this matter,  please contact us via the `Odoo Support page
+    <https://www.odoo.com/help>`_.
 
 .. seealso::
    - `Editions <https://www.odoo.com/page/editions>`_
@@ -105,6 +118,28 @@ Open the following link to get :doc:`more information about how to change your h
 
 .. note:: |assistance-contact|
 
+.. _upgrade-faq/upgrade-report:
+
+The Upgrade Report
+==================
+
+When an upgrade request completes successfully (test or production), you receive an email
+notification about it that includes an 'Upgrade Report'. This report is also sent to you via the
+Discuss app. It contains valuable information regarding changes that occurred during the upgrade.
+While it serves as a guide to possible issues to look out for, it is not an exhaustive list. It
+remains imperative that you test the upgraded database thoroughly and report any discrepancies you
+might find, before you decide to upgrade your production database.
+
+.. _upgrade-faq/custom-views:
+
+Custom views
+============
+
+During the upgrade, some custom views might get disabled for technical reasons. Therefore they might
+have to be fixed after the upgrade. The :ref:`Upgrade Report <upgrade-faq/upgrade-report>` that is
+generated after the upgrade is available in the Discuss app, and lists all the custom views that
+might be impacted by this.
+
 .. _upgrade-faq/release-notes:
 
 Release Notes by version
@@ -114,38 +149,37 @@ Open our `Release Note <https://www.odoo.com/page/release-notes>`_ page to get a
 features and improvements made in each version.
 
 How long is my test available for
----------------------------------
+=================================
 
 An Odoo Online (SaaS) test database is available for one month by default. We can extend this trial
 period upon request. For Odoo.sh or on-premise, there is no restriction.
 
 How many tests to perform before upgrading to production?
----------------------------------------------------------
+=========================================================
 
 As many as needed. When you are comfortable with the database, run a last test upgrade 48 hours
 before requesting your production upgrade and test your workflows one last time.
 
 How to/Where to report upgrade issues?
---------------------------------------
+======================================
 
 If you encounter issues during the upgrade process, please contact the Odoo Support through the
-`Odoo Support page <https://www.odoo.com/help>`_
+`Odoo Support page <https://www.odoo.com/help>`_.
 
 - To report an issue discovered during the testing phase, please select **An issue related to my
   upgrade (test phase)**.
 - To report an issue discovered post-upgrade, please select **An issue related to my upgrade
-  (production)**
+  (production)**.
 
 Upgrading to production
------------------------
+=======================
 
 Once you have completed testing and are happy with the result, you decide on a date and time when
 you stop users from accessing Odoo, freeze all data entries, and create an upgrade request for the
 production upgrade.
 
-
 How is my data handled in the Upgrade Platform?
------------------------------------------------
+===============================================
 
 The Odoo Upgrade platform uses the same Privacy Policy as the rest of Odoo.com services.
 
@@ -168,4 +202,27 @@ The uploaded and migrated databases uploaded to the Upgrade platform are kept fo
 are permanently deleted following that period.
 
 You can learn more about privacy and data handling at Odoo by visiting our `General Data Protection
-Regulation page <https://www.odoo.com/gdpr>`_.
+Regulation page <https://www.odoo.com/gdpr>`_.
+
+Rolling Release (applicable to Odoo Online databases)
+=====================================================
+
+This feature allows customers to upgrade their database directly from a message prompt sent to the
+database administrator as soon as the new version is released. Odoo first tests the upgrade to the
+next version. The rolling release upgrade option is displayed if the automated tests are successful.
+The message offers two options:
+
+#. To 'Upgrade Now', which immediately triggers the upgrade of your live production database.
+
+#. To take you to your `database manager <https://www.odoo.com/my/databases/>`_ where you can
+   `request an upgraded test database <https://upgrade.odoo.com/#online/>`_ and check the upgraded
+   test database for any discrepancies.
+
+When you choose to proceed with the production upgrade directly, make sure all users have saved
+their work and are logged out. The upgrade takes approximately 15 minutes. During this time your
+database is unreachable. If you notice any problem after the upgrade, please report it via the `Odoo
+Support page <https://www.odoo.com/help>`_.
+
+.. note::
+   If you are using the Website or Studio app, we recommend you always do a test upgrade before
+   upgrading your production instance.

content/administration/upgrade/odoo_sh.rst

@@ -1,46 +1,66 @@
 
-=======================
-Odoo.sh version upgrade
-=======================
+=======
+Odoo.sh
+=======
 
-Download and Upload your database
-=================================
+Test upgrade request
+====================
 
-Download a dump of your database (from the :ref:`Builds view <odoosh-gettingstarted-builds-download-dump>`), choose the
-exact copy and without filestore options. Upload the .sql.gz dump on https://upgrade.odoo.com/upload and
-select the Testing Purpose. If you have custom code, you can choose to have it upgraded by us, or do it yourself. Once
-it's processed, you'll get a dump of the database in return.
+Download a dump of your database (from the :ref:`Builds view
+<odoosh-gettingstarted-builds-download-dump>`), choose the **exact copy** and **without filestore**
+options. Upload the .sql.gz dump on https://upgrade.odoo.com/upload and select the testing purpose.
+Once it's processed, you'll get a dump of the database in return.
 
-.. warning::
-   Do *not* upload *backups* of your production database (found in the Backups tab of the production branch) as these
-   are incompatible with the Upgrade platform - they contain your complete sources, etc. that are not needed for the
-   upgrade. Make sure to download a **Dump** instead - either through the Backups tab using the *Download Dump* button
-   or through the Builds page by using the *Download Dump* entry of the contextual menu of your latest production build.
+.. important::
+   To have the most up-to-date test version of your database, create a backup of your production
+   database just before creating your request. Upload it in your staging branch, select **Exact
+   dump** and **Without filestore**, and then click *start*.
 
 Test your upgraded database
 ===========================
 
-Create a staging branch that will run the upgraded database. Either make sure your production branch's code is
-compatible between the two Odoo versions and fork your production branch, or make a new staging branch containing
-the upgraded code.
+At the beginning of your upgrade project, make sure that you create a new staging branch for testing
+purposes by forking your main branch.
 
-Once the staging build is done (it doesn't matter if it failed due to the version incompatibility), import your
-upgraded dump in the backups tab of the branch. The platform will automatically detect the version of the dump and
-change the version of Odoo's source code to the corresponding version for the build.
+Once the staging build is complete (it doesn't matter if it failed due to the version
+incompatibility), import your upgraded dump in the *Backups* tab of the branch.
+
+.. note::
+   The platform automatically detects the version of the dump and changes the version of Odoo's
+   source code to the corresponding version of the build.
 
 Test the upgraded database and make sure everything runs as it's supposed to.
 
-Replace your existing production database
-=========================================
+Upgrade your production database
+================================
 
-Once you've tested everything and you're satisfied, start the process over to get an up-to-date upgraded dump:
+Once you've tested everything and you're satisfied, start the process over to get an up-to-date
+upgraded dump:
 
 * Make a new dump of your production database (as described in step 1)
 * Upload it on upgrade.odoo.com and select the Production purpose
-* Receive the newly upgraded dump and import it in your production branch. The build might get marked as failed because
-  the platform will run it with the upgraded databases' Odoo version together with the old custom code.
+* Receive the newly upgraded dump and import it in your production branch. The build might get
+  marked as failed because the platform will run it with the upgraded databases' Odoo version
+  together with the old custom code.
 * Merge or commit the upgraded custom code in the production branch
 
-If anything goes wrong, remember you can restore a backup. The platform will always make one before you make any
-Odoo.sh operation on the production database. If the restored backup comes from a previous version, the platform will
-detect it and change the project's Odoo version back if it needs to.
+If anything goes wrong, remember you can restore a backup. The platform will always make one before
+you make any Odoo.sh operation on the production database. If the restored backup comes from a
+previous version, the platform will detect it and change the project's Odoo version back if it needs
+to.
+
+Custom modules (if applicable)
+==============================
+
+The upgrade of a database that contains custom modules is a 2 step process.
+
+#. The standard upgrade is done when your upgrade request is completed.
+#. Your custom modules also need to be upgraded to keep them compatible with the new version.
+
+Depending on your contract, the upgrade of your custom modules can be done
+- by yourself
+- by your Partner
+- by Odoo (if you hold a subscription to 'Maintenance of Customizations')
+
+.. seealso::
+   - :ref:`upgrade/sla`

content/administration/upgrade/on_premise.rst

@@ -0,0 +1,59 @@
+==========
+On-Premise
+==========
+
+Test upgrade request
+====================
+
+There are two ways to create your upgrade request.
+
+Upgrade request via command line
+--------------------------------
+
+For technically-advanced users and partners, the upgrade process can be initiated via the following
+command line on the server where the database is hosted:
+
+:command:`python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t
+<target version>`
+
+The above command creates the database dump, sends it to the upgrade platform, and initiates the
+automated upgrade process. During the upgrade, you can follow the live logs on your screen.
+Once the upgrade process is completed successfully, the upgraded database is restored onto the
+server (as a duplicate test database).
+
+Upgrade request via the Odoo Upgrade Portal
+-------------------------------------------
+
+#. Download a recent copy of your database and select the option :guilabel:`pg_dump custom format
+   (without filestore)`.
+#. Upload this dump file at https://upgrade.odoo.com and select *Testing* as the aim.
+   Odoo performs the automated upgrade process. Once it is completed, you receive an email with a
+   link to download the upgrade database dump file.
+#. Import the upgraded database into your on-premise environment and manually test all processes and
+   workflows.
+
+.. note::
+   - For security reasons, only the person who submitted the upgrade request is able to download it.
+   - Any problem found during testing should be reported via the `helpdesk
+     <https://odoo.com/help>`_.
+
+Upgrade your production database
+================================
+
+Once you have completed the testing successfully, you can proceed to upgrade your live database in
+production. Download your upgraded database from the link in the email and import it onto your live
+environment.
+
+Custom modules (if applicable)
+==============================
+
+The upgrade of a database that contains custom modules is a two-step process.
+
+#. The standard upgrade is done when your upgrade request is completed.
+#. Your custom modules also need to be upgraded to keep them compatible with the new version.
+
+Depending on your contract, the upgrade of your custom modules can be done
+
+#. by yourself.
+#. by your Partner.
+#. by Odoo (if you hold a subscription to 'Maintenance of Customizations').

content/administration/upgrade/online_hosting.rst

@@ -0,0 +1,28 @@
+==================
+Odoo Online (SaaS)
+==================
+
+Requesting a test upgrade
+=========================
+
+#. Go to your `database manager <https://www.odoo.com/my/databases/>`_
+#. Click on your profile icon and select *My Databases*.
+
+   .. image:: online_hosting/accessing-my-databases.png
+      :alt: Selecting My Databases under my profile
+
+#. Click on the action settings icon next to your main database and select the *Upgrade* option.
+
+   .. image:: online_hosting/upgrade-option.png
+      :alt: Selecting the action settings icon
+
+#. In the pop-up message that will appear, select Test Upgrade.
+
+   .. image:: online_hosting/select-test-upgrade.png
+      :alt: Selecting test upgrade
+
+#. This triggers the automated upgrade process. A confirmation email is then sent to you with the
+   the link to the upgraded database or to provide information if the upgrade failed.
+
+   .. note::
+      You can also see and access your test database from your *My Databases* page.

content/administration/upgrade/process.rst

@@ -1,256 +0,0 @@
-.. |assistance-contact| replace::
-   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
-   our `Sales department`_.
-.. _Sales department: mailto:sales@odoo.com
-
-===============
-Upgrade process
-===============
-
-.. _upgrade/overview:
-
-Overview
-========
-
-An upgrade is switching to a newer version of Odoo (e.g., Odoo 14.0 to Odoo 15.0).
-
-An upgrade does not cover:
-
-* Changing :ref:`editions <upgrade-faq/editions-change>` (i.e., Community to Enterprise edition)
-* Switching :ref:`hosting type <upgrade-faq/hosting-types-switch>` (i.e., On-Premise to Online or
-  Odoo.sh)
-* Migration from another ERP to Odoo
-
-.. note:: |assistance-contact|
-
-.. _upgrade/process-workflow:
-
-Process workflow
-----------------
-
-The upgrade process in a nutshell:
-
-#. You create a test upgrade request.
-#. | Odoo processes the request:
-   | This happens via an automated process that runs the database through an upgrade script and
-     takes between 20 and 120 minutes. Only if an issue(s) arises will we have to intervene
-     manually and adjust the script specifically to your database until the upgrade succeeds.
-#. Odoo delivers a test database.
-#. You test your database for possible discrepancies (see :ref:`upgrade/test-guidance`)
-#. If there are any discrepancies, you report them to the Upgrade support team via the help portal
-   (see :ref:`upgrade/test-assistance`).
-#. We will fix the issues and send you a new test database.
-#. Once you have completed the testing and are happy with the result, you decide on a date and time
-   when you stop users from accessing Odoo, freeze all data entries, and create an upgrade request
-   for the production upgrade.
-#. Odoo delivers the production database through the automated process.
-#. You restore it in your Production environment a few short hours later and continue working on the
-   newly upgraded database (this is done automatically on SaaS).
-
-.. _upgrade/get-started:
-
-Get started
-===========
-
-The upgrade process varies depending on where your database is hosted.
-
-.. _upgrade/online:
-
-Online Hosting (SaaS)
----------------------
-
-The upgrade request is made via your `database manager <https://www.odoo.com/my/databases>`_.
-
-.. image:: process/online-access-databases.png
-   :align: center
-   :alt: Click on the profile button then on "My Databases"
-
-.. image:: process/online-upgrade-button.png
-   :align: center
-   :alt: Click on the settings button next to your database, then on "Upgrade"
-
-.. _upgrade/odoo-sh:
-
-Cloud Platform (Odoo.sh)
-------------------------
-
-:doc:`odoo_sh`
-
-.. _upgrade/on-premise:
-
-Self-Hosting (On-Premise)
--------------------------
-
-There are two possibilities:
-
-#. Via `Odoo Upgrade service <https://upgrade.odoo.com>`_
-#. | For technically advanced users and partners, via the following command line on the machine
-     where your database is hosted:
-   | ``python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t <target
-     version>``
-
-The above command will dump your database to a file, send it to the upgrade platform for an upgrade,
-display you the live logs, and restore the upgraded database back on your server as a duplicate test
-database.
-
-.. _upgrade/testing-phase:
-
-Testing Phase (pre-production phase)
-====================================
-
-This phase allows you to review an upgraded version of your database without affecting your
-production database in any way.
-
-We suggest that you run the test upgrade process at least once, but you can do it as many times as
-you need (one at a time).
-
-Once you receive your upgraded test database, check that all data, processes, and functionality are
-still correct and working as expected.
-
-If you do find discrepancies, report your issues (see :ref:`upgrade/test-assistance`) and request
-a new test database (see :ref:`upgrade/test-db-request`) when the reported issues are fixed in
-the upgrade script.
-
-If you do not find any discrepancies, you'll be able to move on to the upgrade of your
-:ref:`production database <upgrade/production-live>`.
-
-.. _upgrade/test-db-request:
-
-Request a test database
------------------------
-
-When filling the `website form <https://upgrade.odoo.com>`_, select *Testing* purpose.
-
-.. image:: process/test-purpose.png
-   :align: center
-   :alt: Selection of the "Testing" purpose in the upgrade form on Odoo
-
-.. _upgrade/test-guidance:
-
-Test guidance
--------------
-
-Every business and organization has its own operational needs and has to test its specific Odoo
-instance respectively. We recommend you look at `the test scenario
-<https://docs.google.com/document/d/1ypNs7JKPOsjNbKpdiKFH7Al6g6whZ9jr7f7duAQ5E1w/>` for further
-information.
-
-.. todo:: change link "test scenario" once the related doc is published
-
-.. _upgrade/test-assistance:
-
-Assistance
-----------
-
-If you encounter an issue in the **test database**, please get in touch with Odoo Upgrade Support
-via the `Odoo Support page <https://www.odoo.com/help>`_.
-
-Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
-
-   .. image:: process/test-assistance.png
-      :align: center
-      :alt: Selection of "An issue related to my upgrade" as Ticket Type in the support form on Odoo
-
-   .. warning::
-      If you choose another *Ticket Description* type, the request will be redirected to another
-      team. This will slow down the processing and response time.
-
-Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
-This will avoid clarifying questions and speed up the resolution process significantly.
-
-   .. image:: process/test-assistance-details.png
-      :align: center
-      :alt: "Detailed Description" field in the support form on Odoo
-
-.. note::
-   * The purpose of the test phase is not to correct existing data or configurations in your
-     database.
-   * |assistance-contact|
-
-.. _upgrade/steps-production:
-
-The production launch
----------------------
-
-.. _upgrade/production-live:
-
-Production goes live
-~~~~~~~~~~~~~~~~~~~~
-
-The production upgrade request is when you decide to upgrade your current database with all your
-production data (invoices, VAT returns, inventories, current orders) to a new version of your
-choice.
-
-After your :ref:`tests <upgrade/testing-phase>` are completed to your satisfaction, submit the
-request to upgrade your production database via our `website form <https://upgrade.odoo.com>`_.
-Select *Production* purpose.
-
-.. image:: process/production-purpose.png
-   :align: center
-   :alt: Selection of the "Production" purpose in the upgrade form on Odoo
-
-.. danger::
-   Going into production without first testing may lead to:
-
-   - business interruptions (e.g., no longer having the possibility to validate an action)
-   - poor customer experiences (e.g., an eCommerce website that does not work correctly)
-
-.. _upgrade/production-assistance:
-
-Assistance
-~~~~~~~~~~
-
-If you encounter issues or problems in the **production database**, please get in touch with **Odoo
-Support**:
-
-#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
-#. Under the *Ticket Description* section, select the appropriate type related to your issue but
-   **do not select** the option *An issue related to my upgrade*.
-
-   .. note::
-      After upgrading to production, the support will be provided by the Support team instead of the
-      Upgrade team.
-
-#. Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
-   This will avoid clarifying questions and speed up the resolution process significantly.
-
-   .. image:: process/production-assistance-details.png
-      :align: center
-      :alt: "Detailed Description" field in the support form on Odoo
-
-   .. warning::
-      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
-      to another team than the support one and will slow down the processing and response time.
-
-.. _upgrade/assistance:
-
-Assistance
-==========
-
-.. _upgrade/contact:
-
-Contact our Upgrade service support
------------------------------------
-
-Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
-Upgrade Team <mailto:upgrade@odoo.com>`_. We will be happy to answer it as soon as possible.
-
-.. _upgrade/supported-versions:
-
-Supported versions
-------------------
-
-Please note that Odoo provides support and bug fixing only for the three last major versions of
-Odoo.
-
-This is a factor to take into consideration before upgrading. If you are on an older version, we
-suggest you to prefer the most recent version to benefit from longer support (before having to
-upgrade again).
-
-You can get more information about our :doc:`supported versions <../maintain/supported_versions>`.
-
-.. seealso::
-   - :doc:`faq`
-   - :doc:`odoo_sh`
-   - :doc:`service_level`
-   - :doc:`../maintain/supported_versions`