[MOV] documentation structure reorganization

This commit aims to improve the documentation's navigability by
redefining some categories' purposes and titles.

There is a redirection rule for each documentation page moved.
This ensures that users won't have a 404 error message.

task-3217827

closes odoo/documentation#7981

Signed-off-by: Jonathan Castillo (jcs) <jcs@odoo.com>

content/administration.rst

@@ -3,20 +3,61 @@
 :hide-page-toc:
 :show-toc:
 
-====================
-Install and Maintain
-====================
+===================
+Database management
+===================
 
 These guides provide instructions on how to install, maintain and upgrade Odoo databases.
 
 .. seealso::
-    :doc:`History of Versions <administration/maintain/supported_versions>`
+    :doc:`History of Versions <administration/supported_versions>`
+
+Installation
+============
+
+Depending on the intended use case, there are multiple ways to install Odoo - or not install it at
+all.
+
+- :doc:`Online <administration/odoo_online>` is the easiest way to use Odoo in production or to try it.
+
+- :doc:`Packaged installers <administration/on_premise/packages>` are suitable for testing Odoo and
+  developing modules. They can be used for long-term production with additional deployment and
+  maintenance work.
+
+- :doc:`Source install <administration/on_premise/source>` provides greater flexibility, as it
+  allows, for example, running multiple Odoo versions on the same system. It is adequate to develop
+  modules and can be used as a base for production deployment.
+
+- A `Docker <https://hub.docker.com/_/odoo/>`_ base image is available for development or
+  deployment.
+
+.. _install/editions:
+
+Editions
+========
+
+There are two different editions.
+
+**Odoo Community** is the free and open-source version of the software, licensed under the `GNU
+LGPLv3 <https://github.com/odoo/odoo/blob/master/LICENSE>`_. It is the core upon which Odoo
+Enterprise is built.
+
+**Odoo Enterprise** is the shared source version of the software, giving access to more
+functionalities, including functional support, upgrades, and hosting. `Pricing
+<https://www.odoo.com/pricing-plan>`_ starts from one app free.
+
+.. tip::
+   :doc:`Switch from Community to Enterprise <administration/on_premise/community_to_enterprise>` at
+   any time (except for the source install).
 
 
 .. toctree::
     :titlesonly:
 
-    administration/install
-    administration/maintain
-    administration/upgrade
+    administration/hosting
+    administration/odoo_online
     administration/odoo_sh
+    administration/on_premise
+    administration/upgrade
+    administration/supported_versions
+    administration/odoo_accounts

content/administration/hosting.rst

@@ -1,4 +1,9 @@
-=======================
+=======
+Hosting
+=======
+
+.. _hosting/change-solution:
+
 Change hosting solution
 =======================
 

content/administration/install.rst

@@ -1,50 +0,0 @@
-:show-content:
-
-=======
-Install
-=======
-
-Depending on the intended use case, there are multiple ways to install Odoo - or not install it at
-all.
-
-- :doc:`Online <install/online>` is the easiest way to use Odoo in production or to try it.
-
-- :doc:`Packaged installers <install/packages>` are suitable for testing Odoo and developing
-  modules. They can be used for long-term production with additional deployment and maintenance
-  work.
-
-- :doc:`Source install <install/source>` provides greater flexibility, as it allows, for example,
-  running multiple Odoo versions on the same system. It is adequate to develop modules and can be
-  used as a base for production deployment.
-
-- A `Docker <https://hub.docker.com/_/odoo/>`_ base image is available for development or
-  deployment.
-
-.. _install/editions:
-
-Editions
-========
-
-There are two different editions.
-
-**Odoo Community** is the free and open-source version of the software, licensed under the `GNU
-LGPLv3 <https://github.com/odoo/odoo/blob/master/LICENSE>`_. It is the core upon which Odoo
-Enterprise is built.
-
-**Odoo Enterprise** is the shared source version of the software, giving access to more
-functionalities, including functional support, upgrades, and hosting. `Pricing
-<https://www.odoo.com/pricing-plan>`_ starts from one app free.
-
-.. tip::
-   :doc:`Switch from Community to Enterprise <maintain/enterprise>` at any time (except for the
-   source install).
-
-.. toctree::
-
-   install/online
-   install/packages
-   install/source
-   install/deploy
-   install/cdn
-   install/email_gateway
-   install/geo_ip

content/administration/install/online.rst

@@ -1,21 +0,0 @@
-======
-Online
-======
-
-Online instances are accessed using any web browser and do not require a local installation.
-
-Demo
-----
-
-To quickly try out Odoo, shared `demo <https://demo.odoo.com>`_ instances are available. No
-registration is required, but each instance only lives for a few hours.
-
-Odoo Online
------------
-
-`Odoo Online <https://www.odoo.com/trial>`_ provides private instances which are fully managed and
-hosted by Odoo. It can be used for long-term production or to test Odoo thoroughly, including
-customizations that don't require code.
-
-.. note::
-   Odoo Online is incompatible with custom modules or the Odoo App Store.

content/administration/maintain.rst

@@ -1,18 +0,0 @@
-:nosearch:
-
-========
-Maintain
-========
-
-.. toctree::
-
-    maintain/domain_names
-    maintain/azure_oauth
-    maintain/google_oauth
-    maintain/mailjet_api
-    maintain/update
-    maintain/enterprise
-    maintain/hosting_changes
-    maintain/odoo_online
-    maintain/on_premise
-    maintain/supported_versions

content/administration/odoo_accounts.rst

@@ -1,6 +1,6 @@
-========================
-Odoo.com account changes
-========================
+=================
+Odoo.com accounts
+=================
 
 This documentation is dedicated to edits made to an Odoo.com account. The following processes
 describe how to delete an Odoo.com account, and how to change the password on an Odoo.com account.

content/administration/odoo_online.rst

@@ -1,6 +1,21 @@
-===============================
-Odoo Online database management
-===============================
+===========
+Odoo Online
+===========
+
+`Odoo Online <https://www.odoo.com/trial>`_ provides private databases which are fully managed and
+hosted by Odoo. It can be used for long-term production or to test Odoo thoroughly, including
+customizations that don't require code.
+
+.. note::
+   Odoo Online is incompatible with custom modules or the Odoo App Store.
+
+Odoo Online databases are accessed using any web browser and do not require a local installation.
+
+To quickly try out Odoo, shared `demo <https://demo.odoo.com>`_ instances are available. No
+registration is required, but each instance only lives for a few hours.
+
+Database management
+===================
 
 To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
 as the database administrator.
@@ -69,7 +84,8 @@ Download a ZIP file containing a backup of the database.
 Domain names
 ============
 
-Use a custom :doc:`domain name <domain_names>` to access the database via another URL.
+Use a custom :doc:`domain name </applications/websites/website/configuration/domain_names>` to
+access the database via another URL.
 
 .. tip::
    You can :ref:`register a domain name for free <domain-name/register>`.
@@ -129,5 +145,5 @@ users, click :guilabel:`Add more users`.
 To remove users, select them and click :guilabel:`Remove`.
 
 .. seealso::
-   - :doc:`/applications/general/users/manage_users`
-   - :doc:`/applications/general/users/odoo_account`
+   - :doc:`/applications/general/users`
+   - :doc:`odoo_accounts`

content/administration/odoo_sh/getting_started/create.rst

@@ -91,7 +91,7 @@ Import your database
 ====================
 
 You can import your database in your Odoo.sh project as long as it is in a :doc:`supported version
-</administration/maintain/supported_versions>` of Odoo.
+</administration/supported_versions>` of Odoo.
 
 Push your modules in production
 -------------------------------
@@ -202,4 +202,4 @@ therefore removed, as you can only have one database linked per subscription.
 
 If you plan to make it your production, unlink your former database from the subscription, and
 register the newly imported database. Read the :doc:`database registration documentation
-<../../maintain/on_premise>` for instructions.
+<../../on_premise>` for instructions.

content/administration/odoo_sh/getting_started/first_module.rst

@@ -85,7 +85,7 @@ From the Odoo.sh editor, in a terminal:
 
   $ odoo-bin scaffold my_module ~/src/user/
 
-Or, from your computer, if you have an :doc:`installation of Odoo <../../install/source>`:
+Or, from your computer, if you have an :doc:`installation of Odoo <../../on_premise/source>`:
 
 .. code-block:: bash
 

content/administration/on_premise.rst

@@ -1,6 +1,8 @@
-==============================
-On-premise database management
-==============================
+:show-content:
+
+==========
+On-premise
+==========
 
 Register a database
 ===================
@@ -19,7 +21,6 @@ If you are unable to register your database, you will likely encounter this
 message:
 
 .. image:: on_premise/error_message_sub_code.png
-   :align: center
    :alt: Something went wrong while registering your database, you can try again or contact Odoo
          Help
 
@@ -42,13 +43,11 @@ Solutions
     <https://accounts.odoo.com/my/subscription>`__ with the button "Unlink database"
 
     .. image:: on_premise/unlink_single_db.png
-       :align: center
 
     A confirmation message will appear; make sure this is the correct database as
     it will be deactivated shortly:
 
     .. image:: on_premise/unlink_confirm_enterprise_edition.png
-       :align: center
 
 * Do you have the updated version of Odoo 9?
 
@@ -61,7 +60,6 @@ Solutions
     specifying which database is problematic:
 
     .. image:: on_premise/unlink_db_name_collision.png
-       :align: center
 
     In this case, you need to change the UUID on your test databases to solve this
     issue. You will find more information about this in :ref:`this section <duplicate_premise>`.
@@ -89,7 +87,6 @@ If you have more users in your local database than provisionned in your
 Odoo Enterprise subscription, you may encounter this message:
 
 .. image:: on_premise/add_more_users.png
-   :align: center
    :alt: This database will expire in X days, you have more users than your subscription allows
 
 
@@ -117,7 +114,6 @@ If your database reaches its expiration date before your renew your subscription
 you will encounter this message:
 
 .. image:: on_premise/database_expired.png
-   :align: center
    :alt: This database has expired.
 
 This **blocking** message appears after a non-blocking message that lasts 30 days.
@@ -147,7 +143,6 @@ server (<odoo-server>/web/database/manager). In this page, you can easily
 duplicate your database (among other things).
 
 .. image:: on_premise/db_manager.gif
-   :align: center
 
 When you duplicate a local database, it is **strongly** advised to change
 the duplicated database's uuid (Unniversally Unique Identifier), since this
@@ -165,4 +160,13 @@ use the unix command ``uuidgen`` to generate a new uuid. You can then simply rep
 other record by clicking on it and using the edit button.
 
 .. image:: on_premise/db_uuid.png
-   :align: center
+
+.. toctree::
+
+   on_premise/packages
+   on_premise/source
+   on_premise/update
+   on_premise/deploy
+   on_premise/email_gateway
+   on_premise/geo_ip
+   on_premise/community_to_enterprise

content/administration/on_premise/community_to_enterprise.rst

@@ -11,8 +11,8 @@ In any case the basic guidelines are:
 
 * Backup your community database
 
-  .. image:: enterprise/db_manager.png
-    :class: img-fluid
+  .. image:: community_to_enterprise/db_manager.png
+     :class: img-fluid
 
 * Shutdown your server
 
@@ -22,8 +22,8 @@ In any case the basic guidelines are:
 
 * Enter your Odoo Enterprise Subscription code
 
-.. image:: enterprise/enterprise_code.png
-  :class: img-fluid
+.. image:: community_to_enterprise/enterprise_code.png
+   :class: img-fluid
 
 On Linux, using an installer
 ============================
@@ -61,7 +61,7 @@ have your own favourite. You may need to adapt sections to your usual workflow.
 
 * Shutdown your server
 * Backup your community database
-* Update the ``--addons-path`` parameter of your launch command (see :doc:`../install/source`)
+* Update the ``--addons-path`` parameter of your launch command (see :doc:`../on_premise/source`)
 * Install the web_enterprise module by using
 
   .. code-block:: console
@@ -82,7 +82,7 @@ On Windows
 * Uninstall Odoo Community (using the Uninstall executable in the installation folder) -
   PostgreSQL will remain installed
 
-  .. image:: enterprise/windows_uninstall.png
+  .. image:: community_to_enterprise/windows_uninstall.png
     :class: img-fluid
 
 * Launch the Odoo Enterprise Installer and follow the steps normally. When choosing
@@ -90,8 +90,8 @@ On Windows
   (this folder still contains the PostgreSQL installation).
   Uncheck ``Start Odoo`` at the end of the installation
 
-  .. image:: enterprise/windows_setup.png
-   :class: img-fluid
+  .. image:: community_to_enterprise/windows_setup.png
+     :class: img-fluid
 
 * Using a command window, update your Odoo Database using this command (from the Odoo
   installation path, in the server subfolder)

content/administration/on_premise/deploy.rst

@@ -3,7 +3,7 @@ System configuration
 ====================
 
 This document describes basic steps to set up Odoo in production or on an
-internet-facing server. It follows :doc:`installation <../install>`, and is
+internet-facing server. It follows :doc:`installation <../on_premise>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.
 

content/administration/on_premise/source.rst

@@ -1,6 +1,6 @@
-======
-Source
-======
+==============
+Source install
+==============
 
 The source 'installation' is not about installing Odoo but running it directly from the source
 instead.
@@ -475,7 +475,7 @@ http://localhost:8069 in a web browser and log into the Odoo database with the b
 account: use `admin` as the email and, again, `admin` as the password.
 
 .. tip::
-   - From there, create and manage new :doc:`users <../../applications/general/users/manage_users>`.
+   - From there, create and manage new :doc:`users <../../applications/general/users>`.
    - The user account used to log into Odoo's web interface differs from the :option:`--db_user
      <odoo-bin -r>` CLI argument.
 

content/administration/on_premise/update.rst

@@ -46,7 +46,7 @@ Updating Odoo is accomplished by simply reinstalling the latest version of your
 Edition on top of your current installation. This will preserve your data without any alteration,
 as long as you do not uninstall PostgreSQL (the database engine that comes with Odoo).
 
-The main reference for updating is logically our :doc:`installation guide <../install>`,
+The main reference for updating is logically our :doc:`installation guide <../on_premise>`,
 which explains the common installation methods.
 
 Updating is also most appropriately accomplished by the person who deployed Odoo initially,

content/administration/supported_versions.rst

@@ -13,7 +13,7 @@ Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
    <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 <../upgrade>` 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*.
 

content/administration/upgrade.rst

@@ -3,8 +3,8 @@ Upgrade
 =======
 
 An upgrade is the process of moving your database from an older version to a newer :doc:`supported
-version <maintain/supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is
-essential as each version comes with new and improved features, bug fixes, and security patches.
+version <supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is essential as
+each version comes with new and improved features, bug fixes, and security patches.
 
 .. _upgrade_faq/rolling_release:
 
@@ -31,9 +31,9 @@ essential as each version comes with new and improved features, bug fixes, and s
 An upgrade does not cover:
 
   - Downgrading to a previous version of Odoo
-  - :doc:`Switching editions <maintain/enterprise>` (e.g., from Community to Enterprise)
-  - :doc:`Changing hosting type </administration/maintain/hosting_changes>` (e.g., from on-premise
-    to Odoo Online)
+  - :doc:`Switching editions <on_premise/community_to_enterprise>` (e.g., from Community to
+    Enterprise)
+  - :ref:`Changing hosting type <hosting/change-solution>` (e.g., from on-premise to Odoo Online)
   - Migrating from another ERP to Odoo
 
 .. warning::
@@ -405,4 +405,4 @@ The following upgrade-related services are **not** included:
 
 .. seealso::
    - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <maintain/supported_versions>`
+   - :doc:`Supported Odoo versions <supported_versions>`

content/applications.rst

@@ -14,6 +14,7 @@ Discover our user guides and configuration tutorials per application.
 .. toctree::
     :maxdepth: 2
 
+    applications/essentials
     applications/finance
     applications/sales
     applications/websites
@@ -22,4 +23,5 @@ Discover our user guides and configuration tutorials per application.
     applications/marketing
     applications/services
     applications/productivity
+    applications/studio
     applications/general

content/applications/essentials.rst

@@ -0,0 +1,9 @@
+===============
+Odoo essentials
+===============
+
+.. toctree::
+
+   essentials/activities
+   essentials/export_import_data
+   essentials/in_app_purchase

content/applications/essentials/activities.rst

@@ -40,8 +40,7 @@ Lastly, click one of the following buttons:
   opens a new activity window.
 - :guilabel:`Discard`: discards any changes made on the pop-up window.
 
-.. image:: plan_activities/schedule-pop-up.png
-   :align: center
+.. image:: activities/schedule-pop-up.png
    :alt: View of CRM leads and the option to schedule an activity.
 
 .. note::
@@ -50,8 +49,7 @@ Lastly, click one of the following buttons:
 
 Scheduled activities are added to the chatter for the record under :guilabel:`Planned activities`.
 
-.. image:: plan_activities/chatter-activities.png
-   :align: center
+.. image:: activities/chatter-activities.png
    :alt: View of CRM leads and the option to schedule an activity.
 
 Activities can also be scheduled from the kanban, list, or activities view of an application.
@@ -63,9 +61,8 @@ Activities can also be scheduled from the kanban, list, or activities view of an
       Select a record on which to schedule an activity. Click on the :guilabel:`🕘 (clock)` icon,
       then :guilabel:`Schedule An Activity`, and proceed to fill out the pop-up form.
 
-      .. image:: plan_activities/schedule-kanban-activity.png
-         :align: center
-         :alt: Kanban view of the CRM pipeline and the option to schedule an activity.
+      .. image:: activities/schedule-kanban-activity.png
+               :alt: Kanban view of the CRM pipeline and the option to schedule an activity.
 
    .. tab:: List view
 
@@ -73,9 +70,8 @@ Activities can also be scheduled from the kanban, list, or activities view of an
       then :guilabel:`Schedule An Activity`. If the record already has an activity scheduled, the
       clock icon may be replaced by a :guilabel:`📞 (phone)` or an :guilabel:`✉️ (envelope)` icon.
 
-      .. image:: plan_activities/schedule-list-activity.png
-         :align: center
-         :alt: List view of the CRM pipeline and the option to schedule an activity.
+      .. image:: activities/schedule-list-activity.png
+               :alt: List view of the CRM pipeline and the option to schedule an activity.
 
    .. tab:: Activity view
 
@@ -83,16 +79,14 @@ Activities can also be scheduled from the kanban, list, or activities view of an
       menu bar anywhere in the database. Select any application from the drop-down menu, and click
       the :guilabel:`🕘 (clock)` icon for the desired app.
 
-      .. image:: plan_activities/schedule-activity-view-menu.png
-         :align: center
-         :alt: Activity menu drop down with focus on where to open activity view for CRM.
+      .. image:: activities/schedule-activity-view-menu.png
+               :alt: Activity menu drop down with focus on where to open activity view for CRM.
 
       Select a record on which to schedule an activity. Move across the row to find the desired
       activity type, then click the :guilabel:`＋ (plus sign)`.
 
-      .. image:: plan_activities/schedule-activity-view.png
-         :align: center
-         :alt: Activity view of the CRM pipeline and the option to schedule an activity.
+      .. image:: activities/schedule-activity-view.png
+               :alt: Activity view of the CRM pipeline and the option to schedule an activity.
 
 .. note::
    Activity colors, and their relation to an activity's due date, is consistent throughout Odoo,
@@ -122,8 +116,7 @@ specific application in a drop-down menu.
 The possibility to :guilabel:`Add new note` and :guilabel:`Request a Document` appear at the bottom
 of this drop-down menu, when the :guilabel:`🕘 (clock)` icon on the header menu is clicked.
 
-.. image:: plan_activities/activities-menu.png
-   :align: center
+.. image:: activities/activities-menu.png
    :alt: View of CRM leads page emphasizing the activities menu.
 
 Configure activity types
@@ -132,8 +125,7 @@ Configure activity types
 To configure the types of activities in the database, go to :menuselection:`Settings app --> Discuss
 --> Activities --> Activity Types`.
 
-.. image:: plan_activities/settings-activities-types.png
-   :align: center
+.. image:: activities/settings-activities-types.png
    :alt: View of the settings page emphasizing the menu activity types.
 
 Doing so reveals the :guilabel:`Activity Types` page, where the existing activity types are found.
@@ -144,8 +136,7 @@ new activity type, click :guilabel:`Create`.
 At the top of a blank activity type form, start by choosing a :guilabel:`Name` for the new activity
 type.
 
-.. image:: plan_activities/new-activity-type.png
-   :align: center
+.. image:: activities/new-activity-type.png
    :alt: New activity type form.
 
 Activity settings
@@ -208,8 +199,7 @@ This :guilabel:`Schedule` field information can be altered before the activity i
 
 When all configurations are complete, click :guilabel:`Save`.
 
-.. image:: plan_activities/schedule-recommended-activity.png
-   :align: center
+.. image:: activities/schedule-recommended-activity.png
    :alt: Schedule activity popup with emphasis on recommended activities.
 
 .. note::
@@ -236,8 +226,7 @@ This :guilabel:`Schedule` field information can be altered before the activity i
 
 When all configurations are complete, click :guilabel:`Save`.
 
-.. image:: plan_activities/triggered-activities.png
-   :align: center
+.. image:: activities/triggered-activities.png
    :alt: Schedule new activity popup with emphasis on Done and launch next button.
 
 .. note::
@@ -246,5 +235,5 @@ When all configurations are complete, click :guilabel:`Save`.
    :guilabel:`Trigger` field.
 
 .. seealso::
-   - :doc:`get_started`
-   - :doc:`team_communication`
+   - :doc:`/applications/productivity/discuss`
+   - :doc:`/applications/productivity/discuss/team_communication`

content/applications/finance.rst

@@ -9,7 +9,5 @@ Finance
 
     finance/accounting
     finance/expenses
-    finance/documents
-    finance/sign
     finance/payment_acquirers
     finance/fiscal_localizations

content/applications/finance/accounting/customer_invoices/snailmail.rst

@@ -44,7 +44,7 @@ your customer’s address is set correctly, including the country, before sendin
 Pricing
 =======
 
-Snailmail is an :doc:`/applications/general/in_app_purchase` service that requires prepaid stamps
+Snailmail is an :doc:`/applications/essentials/in_app_purchase` service that requires prepaid stamps
 (=credits) to work. Sending one document consumes one stamp.
 
 To buy stamps, go to :menuselection:`Accounting --> Configuration --> Settings --> Customer

content/applications/finance/accounting/payments/follow_up.rst

@@ -94,6 +94,6 @@ select all the reports you would like to process, click on the :guilabel:`Action
 select :guilabel:`Process follow-ups`.
 
 .. seealso::
-   - :doc:`../../../general/in_app_purchase`
-   - :doc:`../../../marketing/sms_marketing/pricing/pricing_and_faq`
+   - :doc:`/applications/essentials/in_app_purchase`
+   - :doc:`/applications/marketing/sms_marketing/pricing/pricing_and_faq`
    - :doc:`../customer_invoices/snailmail`

content/applications/finance/accounting/vendor_bills/invoice_digitization.rst

@@ -11,7 +11,7 @@ created and populated based on the scanned invoices.
 
 .. seealso::
    - `Test Odoo's invoice digitization <https://www.odoo.com/app/invoice-automation>`_
-   - :doc:`/applications/general/in_app_purchase`.
+   - :doc:`/applications/essentials/in_app_purchase`.
    - `Odoo Tutorials: Invoice Digitization with OCR
      <https://www.odoo.com/slides/slide/digitize-bills-with-ocr-1712>`_.
 
@@ -49,8 +49,8 @@ You can modify the email alias of a journal by going to :menuselection:`Accounti
 --> Journals`, opening the appropriate journal, opening the :guilabel:`Advanced Settings` tab, and
 modifying the :guilabel:`Email Alias` field.
 
-If you use the :doc:`Documents <../../documents>` app, you can send your scanned invoices to the
-:guilabel:`Finance` workspace (e.g., `inbox-financial@example.odoo.com`).
+If you use the :doc:`Documents </applications/productivity/documents>` app, you can send your
+scanned invoices to the :guilabel:`Finance` workspace (e.g., `inbox-financial@example.odoo.com`).
 
 Invoice digitization
 ====================

content/applications/finance/expenses.rst

@@ -209,9 +209,9 @@ Configuration --> Settings`. Ensure :guilabel:`Incoming Emails` is enabled.
 .. note::
    If the domain alias needs to be set up, :guilabel:`Setup your domain alias` will appear beneath
    the incoming emails check box instead of the email address field. Refer to this documentation for
-   setup instructions and more information: :doc:`/administration/maintain/domain_names`. Once the
-   domain alias is configured, the email address field will be visible beneath the incoming emails
-   section.
+   setup instructions and more information:
+   :doc:`/applications/websites/website/configuration/domain_names`. Once the domain alias is
+   configured, the email address field will be visible beneath the incoming emails section.
 
 Next, enter the email address to be used in the email field, then click :guilabel:`Save`. Now that
 the email address has been entered, emails can be sent to that alias to create new expenses without
@@ -364,8 +364,8 @@ To see who has rights to approve, go to the main :menuselection:`Settings` app a
      the *Settings* app.
    - :guilabel:`Settings`: The user has access to the entire *Settings* app with no restrictions.
 
-   Please refer to :doc:`this document </applications/general/users/manage_users>` to learn more
-   about managing users and their access rights.
+   Please refer to :doc:`this document </applications/general/users>` to learn more about managing
+   users and their access rights.
 
 Click on an individual to view their card, which displays the :guilabel:`Access Rights` tab in the
 default view. Scroll down to the :guilabel:`Human Resources` section. Under :guilabel:`Expenses`,

content/applications/finance/fiscal_localizations/belgium.rst

@@ -53,7 +53,7 @@ The Odoo POS system is certified for the major versions of databases hosted on *
      - Not certified
 
 .. seealso::
-   :doc:`/administration/maintain/supported_versions`
+   :doc:`/administration/supported_versions`
 
 A `certified POS system <https://www.systemedecaisseenregistreuse.be/systemes-certifies>`_ must
 adhere to rigorous government regulations, which means it operates differently from a non-certified
@@ -153,7 +153,7 @@ following information:
 - your company's name, address, and legal structure; and
 - the Mac address of your IoT Box.
 
-Once your IoT box is certified, :doc:`connect <../../productivity/iot/config/connect>` it to your
+Once your IoT box is certified, :doc:`connect <../../general/iot/config/connect>` it to your
 database. To verify that the IoT Box recognizes the FDM, go to the IoT homepage and scroll down the
 :guilabel:`IOT Device` section, which should display the FDM.
 

content/applications/finance/fiscal_localizations/egypt.rst

@@ -220,7 +220,7 @@ Proxy. Copy the token and save it in a safe place for later use.
 
 .. seealso::
    - `Odoo: Download Odoo <https://www.odoo.com/page/download>`_
-   - :doc:`../../../administration/install`
+   - :doc:`../../../administration/on_premise`
 
 .. _egypt/e-invoicing-usb-configuration:
 

content/applications/finance/fiscal_localizations/france.rst

@@ -368,7 +368,7 @@ of conformity testifying that your software complies with the anti-fraud
 legislation. This certificate is granted by Odoo SA to Odoo Enterprise users
 `here <https://www.odoo.com/my/contract/french-certification/>`_.
 If you use Odoo Community, you should :doc:`upgrade to Odoo Enterprise
-</administration/maintain/enterprise>` or contact your Odoo service provider.
+</administration/on_premise/community_to_enterprise>` or contact your Odoo service provider.
 
 In case of non-conformity, your company risks a fine of €7,500.
 

content/applications/finance/fiscal_localizations/kenya.rst

@@ -73,7 +73,7 @@ agreement. On the next page, select the :guilabel:`type of install: Odoo IoT`. T
 :guilabel:`Next` and :guilabel:`Install`. Once completed, click :guilabel:`Next`. Check the
 :guilabel:`Start Odoo` box to be redirected to Odoo automatically, and then click :guilabel:`Finish`.
 
-A new page opens, confirming your :doc:`IoT Box <../../productivity/iot/config/connect>` is up and
+A new page opens, confirming your :doc:`IoT Box <../../general/iot/config/connect>` is up and
 running. Connect your physical device **Tremol G03 Control Unit (type C)** to your laptop via USB.
 In the :guilabel:`IoT Device` section, check that your Tremol G03 Control Unit (type C) appears,
 confirming the connection between the device and your computer.
@@ -87,7 +87,7 @@ confirming the connection between the device and your computer.
    in the top right corner.
 
 .. seealso::
-   :doc:`Connect an IoT box to your database <../../productivity/iot/config/connect>`
+   :doc:`Connect an IoT box to your database <../../general/iot/config/connect>`
 
 Sending the data to KRA using the Tremol G03 Control Unit
 ---------------------------------------------------------

content/applications/finance/fiscal_localizations/mexico.rst

@@ -253,7 +253,7 @@ Products
 To configure products, go to :menuselection:`Accounting --> Customers --> Products`, then select a
 product to configure, or :guilabel:`Create` a new one. In the :guilabel:`Accounting` tab, and in the
 :guilabel:`UNSPSC Product Category` field, select the category that represents the product. The
-process can be done manually, or through :doc:`a bulk import <../../general/export_import_data>`.
+process can be done manually, or through :doc:`a bulk import <../../essentials/export_import_data>`.
 
 .. note::
    All products need to have an |SAT| code associated with them in order to prevent validation

content/applications/general.rst

@@ -1,16 +1,13 @@
-=============
-Miscellaneous
-=============
+================
+General settings
+================
 
 .. toctree::
 
-    general/users
-    general/auth
     general/apps_modules
-    general/export_import_data
+    general/users
+    general/companies
+    general/iot
     general/email_communication
-    general/voip
-    general/geolocation
-    general/digest_emails
-    general/in_app_purchase
+    general/integrations
     general/developer_mode

content/applications/general/apps_modules.rst

@@ -45,8 +45,7 @@ Upgrade apps and modules
 ========================
 
 On some occasions, new improvements or app features are added to :doc:`supported versions of Odoo
-</administration/maintain/supported_versions>`. To be able to use them, you must **upgrade** your
-app.
+</administration/supported_versions>`. 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*.

content/applications/general/auth.rst

@@ -1,13 +0,0 @@
-:nosearch:
-
-==============
-Authentication
-==============
-
-.. toctree::
-   :titlesonly:
-
-   auth/google
-   auth/azure
-   auth/ldap
-   auth/2fa

content/applications/general/companies.rst

@@ -1,3 +1,5 @@
+:show-content:
+
 =========
 Companies
 =========
@@ -50,7 +52,7 @@ company only. To do so, on their forms, choose between:
 Employees' access
 =================
 
-Once companies are created, manage your employees' :doc:`Access Rights <access_rights>`
+Once companies are created, manage your employees' :doc:`Access Rights <users/access_rights>`
 for *Multi Companies*.
 
 .. image:: companies/access_rights_multi_companies.png
@@ -84,12 +86,12 @@ Inter-Company Transactions
 
 First, make sure each one of your companies is properly set in relation to:
 
-- :doc:`Chart of Accounts <../../finance/accounting/get_started/chart_of_accounts>`
-- :doc:`Taxes <../../finance/accounting/taxes>`
-- :doc:`Fiscal Positions <../../finance/accounting/taxes/fiscal_positions>`
-- :doc:`Journals <../../finance/accounting/bank>`
-- :doc:`Fiscal Localizations <../../finance/fiscal_localizations>`
-- :doc:`Pricelists <../../sales/sales/products_prices/prices/pricing>`
+- :doc:`Chart of Accounts <../finance/accounting/get_started/chart_of_accounts>`
+- :doc:`Taxes <../finance/accounting/taxes>`
+- :doc:`Fiscal Positions <../finance/accounting/taxes/fiscal_positions>`
+- :doc:`Journals <../finance/accounting/bank>`
+- :doc:`Fiscal Localizations <../finance/fiscal_localizations>`
+- :doc:`Pricelists <../sales/sales/products_prices/prices/pricing>`
 
 Now, activate the *Inter-Company Transactions* option under *Settings*. With the respective company
 *activated* and *selected*, choose if you would like operations between companies to be synchronized
@@ -129,4 +131,10 @@ at an invoice/bills level or at a sales/purchase orders level.
 
 .. seealso::
    - :doc:`Multi-company Guidelines </developer/howtos/company>`
-   - :doc:`../../finance/accounting/get_started/multi_currency`
+   - :doc:`../finance/accounting/get_started/multi_currency`
+
+.. toctree::
+   :titlesonly:
+
+   companies/digest_emails
+   companies/email_template

content/applications/general/companies/email_template.rst

@@ -146,7 +146,7 @@ template, as listed in the bulleted list above.
    model that the email template is created for.
 
    .. seealso::
-      :doc:`../../productivity/studio/models_modules_apps`.
+      :doc:`/applications/studio/models_modules_apps`.
 
 .. tip::
    These fields can also be accessed in :ref:`developer mode <developer-mode>`. On a contact form
@@ -240,7 +240,7 @@ parameter used to generate all the links.
    This is a known limitation.
 
 For more information about how to configure domains, check out the :doc:`domain name documentation
-</administration/maintain/domain_names>`.
+</applications/websites/website/configuration/domain_names>`.
 
 Updating translations within email templates
 --------------------------------------------