[IMP] misc: email comms alias admonition block odoo 17

closes odoo/documentation#8088

X-original-commit: 256c96b56f
Signed-off-by: Timothy Kukulka (tiku) <tiku@odoo.com>

.tx/config

@@ -1,63 +1,122 @@
 [main]
 host = https://www.transifex.com
-type = PO
 
-[odoo-14-doc.applications]
-file_filter = locale/<lang>/LC_MESSAGES/applications.po
-source_file = locale/sources/applications.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:administration]
+file_filter            = locale/<lang>/LC_MESSAGES/administration.po
+source_file            = locale/sources/administration.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = administration
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.finance]
-file_filter = locale/<lang>/LC_MESSAGES/finance.po
-source_file = locale/sources/finance.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:applications]
+file_filter            = locale/<lang>/LC_MESSAGES/applications.po
+source_file            = locale/sources/applications.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = applications
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.general]
-file_filter = locale/<lang>/LC_MESSAGES/general.po
-source_file = locale/sources/general.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:finance]
+file_filter            = locale/<lang>/LC_MESSAGES/finance.po
+source_file            = locale/sources/finance.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = finance
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.index]
-file_filter = locale/<lang>/LC_MESSAGES/index.po
-source_file = locale/sources/index.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:general]
+file_filter            = locale/<lang>/LC_MESSAGES/general.po
+source_file            = locale/sources/general.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = general
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.inventory_and_mrp]
-file_filter = locale/<lang>/LC_MESSAGES/inventory_and_mrp.po
-source_file = locale/sources/inventory_and_mrp.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:index]
+file_filter            = locale/<lang>/LC_MESSAGES/index.po
+source_file            = locale/sources/index.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = index
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.marketing]
-file_filter = locale/<lang>/LC_MESSAGES/marketing.po
-source_file = locale/sources/marketing.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:inventory_and_mrp]
+file_filter            = locale/<lang>/LC_MESSAGES/inventory_and_mrp.po
+source_file            = locale/sources/inventory_and_mrp.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = inventory_and_mrp
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.productivity]
-file_filter = locale/<lang>/LC_MESSAGES/productivity.po
-source_file = locale/sources/productivity.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:marketing]
+file_filter            = locale/<lang>/LC_MESSAGES/marketing.po
+source_file            = locale/sources/marketing.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = marketing
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.sales]
-file_filter = locale/<lang>/LC_MESSAGES/sales.po
-source_file = locale/sources/sales.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:productivity]
+file_filter            = locale/<lang>/LC_MESSAGES/productivity.po
+source_file            = locale/sources/productivity.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = productivity
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.services]
-file_filter = locale/<lang>/LC_MESSAGES/services.po
-source_file = locale/sources/services.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:sales]
+file_filter            = locale/<lang>/LC_MESSAGES/sales.po
+source_file            = locale/sources/sales.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = sales
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.theme]
-file_filter = locale/<lang>/LC_MESSAGES/sphinx.po
-source_file = locale/sources/sphinx.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:services]
+file_filter            = locale/<lang>/LC_MESSAGES/services.po
+source_file            = locale/sources/services.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = services
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.user_settings]
-file_filter = locale/<lang>/LC_MESSAGES/settings.po
-source_file = locale/sources/settings.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:user_settings]
+file_filter            = locale/<lang>/LC_MESSAGES/settings.po
+source_file            = locale/sources/settings.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = settings
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
 
-[odoo-14-doc.websites]
-file_filter = locale/<lang>/LC_MESSAGES/websites.po
-source_file = locale/sources/websites.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:websites]
+file_filter            = locale/<lang>/LC_MESSAGES/websites.po
+source_file            = locale/sources/websites.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = websites
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

COPYRIGHT

@@ -0,0 +1,13 @@
+Most of the files are
+
+  Copyright (c) 2004-2023 Odoo S.A.
+
+Some files may also contain contributions from third
+parties. In this case the original copyright of
+the contributions can be traced through the
+history of the source version control system.
+
+When that is not the case, the files contain a prominent
+notice stating the original copyright and applicable
+license, or come with their own dedicated COPYRIGHT
+and/or LICENSE file.

LICENSE

@@ -0,0 +1,428 @@
+Attribution-ShareAlike 4.0 International
+
+=======================================================================
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+     Considerations for licensors: Our public licenses are
+     intended for use by those authorized to give the public
+     permission to use material in ways otherwise restricted by
+     copyright and certain other rights. Our licenses are
+     irrevocable. Licensors should read and understand the terms
+     and conditions of the license they choose before applying it.
+     Licensors should also secure all rights necessary before
+     applying our licenses so that the public can reuse the
+     material as expected. Licensors should clearly mark any
+     material not subject to the license. This includes other CC-
+     licensed material, or material used under an exception or
+     limitation to copyright. More considerations for licensors:
+    wiki.creativecommons.org/Considerations_for_licensors
+
+     Considerations for the public: By using one of our public
+     licenses, a licensor grants the public permission to use the
+     licensed material under specified terms and conditions. If
+     the licensor's permission is not necessary for any reason--for
+     example, because of any applicable exception or limitation to
+     copyright--then that use is not regulated by the license. Our
+     licenses grant only permissions under copyright and certain
+     other rights that a licensor has authority to grant. Use of
+     the licensed material may still be restricted for other
+     reasons, including because others have copyright or other
+     rights in the material. A licensor may make special requests,
+     such as asking that all changes be marked or described.
+     Although not required by our licenses, you are encouraged to
+     respect those requests where reasonable. More considerations
+     for the public:
+    wiki.creativecommons.org/Considerations_for_licensees
+
+=======================================================================
+
+Creative Commons Attribution-ShareAlike 4.0 International Public
+License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution-ShareAlike 4.0 International Public License ("Public
+License"). To the extent this Public License may be interpreted as a
+contract, You are granted the Licensed Rights in consideration of Your
+acceptance of these terms and conditions, and the Licensor grants You
+such rights in consideration of benefits the Licensor receives from
+making the Licensed Material available under these terms and
+conditions.
+
+
+Section 1 -- Definitions.
+
+  a. Adapted Material means material subject to Copyright and Similar
+     Rights that is derived from or based upon the Licensed Material
+     and in which the Licensed Material is translated, altered,
+     arranged, transformed, or otherwise modified in a manner requiring
+     permission under the Copyright and Similar Rights held by the
+     Licensor. For purposes of this Public License, where the Licensed
+     Material is a musical work, performance, or sound recording,
+     Adapted Material is always produced where the Licensed Material is
+     synched in timed relation with a moving image.
+
+  b. Adapter's License means the license You apply to Your Copyright
+     and Similar Rights in Your contributions to Adapted Material in
+     accordance with the terms and conditions of this Public License.
+
+  c. BY-SA Compatible License means a license listed at
+     creativecommons.org/compatiblelicenses, approved by Creative
+     Commons as essentially the equivalent of this Public License.
+
+  d. Copyright and Similar Rights means copyright and/or similar rights
+     closely related to copyright including, without limitation,
+     performance, broadcast, sound recording, and Sui Generis Database
+     Rights, without regard to how the rights are labeled or
+     categorized. For purposes of this Public License, the rights
+     specified in Section 2(b)(1)-(2) are not Copyright and Similar
+     Rights.
+
+  e. Effective Technological Measures means those measures that, in the
+     absence of proper authority, may not be circumvented under laws
+     fulfilling obligations under Article 11 of the WIPO Copyright
+     Treaty adopted on December 20, 1996, and/or similar international
+     agreements.
+
+  f. Exceptions and Limitations means fair use, fair dealing, and/or
+     any other exception or limitation to Copyright and Similar Rights
+     that applies to Your use of the Licensed Material.
+
+  g. License Elements means the license attributes listed in the name
+     of a Creative Commons Public License. The License Elements of this
+     Public License are Attribution and ShareAlike.
+
+  h. Licensed Material means the artistic or literary work, database,
+     or other material to which the Licensor applied this Public
+     License.
+
+  i. Licensed Rights means the rights granted to You subject to the
+     terms and conditions of this Public License, which are limited to
+     all Copyright and Similar Rights that apply to Your use of the
+     Licensed Material and that the Licensor has authority to license.
+
+  j. Licensor means the individual(s) or entity(ies) granting rights
+     under this Public License.
+
+  k. Share means to provide material to the public by any means or
+     process that requires permission under the Licensed Rights, such
+     as reproduction, public display, public performance, distribution,
+     dissemination, communication, or importation, and to make material
+     available to the public including in ways that members of the
+     public may access the material from a place and at a time
+     individually chosen by them.
+
+  l. Sui Generis Database Rights means rights other than copyright
+     resulting from Directive 96/9/EC of the European Parliament and of
+     the Council of 11 March 1996 on the legal protection of databases,
+     as amended and/or succeeded, as well as other essentially
+     equivalent rights anywhere in the world.
+
+  m. You means the individual or entity exercising the Licensed Rights
+     under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+  a. License grant.
+
+       1. Subject to the terms and conditions of this Public License,
+          the Licensor hereby grants You a worldwide, royalty-free,
+          non-sublicensable, non-exclusive, irrevocable license to
+          exercise the Licensed Rights in the Licensed Material to:
+
+            a. reproduce and Share the Licensed Material, in whole or
+               in part; and
+
+            b. produce, reproduce, and Share Adapted Material.
+
+       2. Exceptions and Limitations. For the avoidance of doubt, where
+          Exceptions and Limitations apply to Your use, this Public
+          License does not apply, and You do not need to comply with
+          its terms and conditions.
+
+       3. Term. The term of this Public License is specified in Section
+          6(a).
+
+       4. Media and formats; technical modifications allowed. The
+          Licensor authorizes You to exercise the Licensed Rights in
+          all media and formats whether now known or hereafter created,
+          and to make technical modifications necessary to do so. The
+          Licensor waives and/or agrees not to assert any right or
+          authority to forbid You from making technical modifications
+          necessary to exercise the Licensed Rights, including
+          technical modifications necessary to circumvent Effective
+          Technological Measures. For purposes of this Public License,
+          simply making modifications authorized by this Section 2(a)
+          (4) never produces Adapted Material.
+
+       5. Downstream recipients.
+
+            a. Offer from the Licensor -- Licensed Material. Every
+               recipient of the Licensed Material automatically
+               receives an offer from the Licensor to exercise the
+               Licensed Rights under the terms and conditions of this
+               Public License.
+
+            b. Additional offer from the Licensor -- Adapted Material.
+               Every recipient of Adapted Material from You
+               automatically receives an offer from the Licensor to
+               exercise the Licensed Rights in the Adapted Material
+               under the conditions of the Adapter's License You apply.
+
+            c. No downstream restrictions. You may not offer or impose
+               any additional or different terms or conditions on, or
+               apply any Effective Technological Measures to, the
+               Licensed Material if doing so restricts exercise of the
+               Licensed Rights by any recipient of the Licensed
+               Material.
+
+       6. No endorsement. Nothing in this Public License constitutes or
+          may be construed as permission to assert or imply that You
+          are, or that Your use of the Licensed Material is, connected
+          with, or sponsored, endorsed, or granted official status by,
+          the Licensor or others designated to receive attribution as
+          provided in Section 3(a)(1)(A)(i).
+
+  b. Other rights.
+
+       1. Moral rights, such as the right of integrity, are not
+          licensed under this Public License, nor are publicity,
+          privacy, and/or other similar personality rights; however, to
+          the extent possible, the Licensor waives and/or agrees not to
+          assert any such rights held by the Licensor to the limited
+          extent necessary to allow You to exercise the Licensed
+          Rights, but not otherwise.
+
+       2. Patent and trademark rights are not licensed under this
+          Public License.
+
+       3. To the extent possible, the Licensor waives any right to
+          collect royalties from You for the exercise of the Licensed
+          Rights, whether directly or through a collecting society
+          under any voluntary or waivable statutory or compulsory
+          licensing scheme. In all other cases the Licensor expressly
+          reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+  a. Attribution.
+
+       1. If You Share the Licensed Material (including in modified
+          form), You must:
+
+            a. retain the following if it is supplied by the Licensor
+               with the Licensed Material:
+
+                 i. identification of the creator(s) of the Licensed
+                    Material and any others designated to receive
+                    attribution, in any reasonable manner requested by
+                    the Licensor (including by pseudonym if
+                    designated);
+
+                ii. a copyright notice;
+
+               iii. a notice that refers to this Public License;
+
+                iv. a notice that refers to the disclaimer of
+                    warranties;
+
+                 v. a URI or hyperlink to the Licensed Material to the
+                    extent reasonably practicable;
+
+            b. indicate if You modified the Licensed Material and
+               retain an indication of any previous modifications; and
+
+            c. indicate the Licensed Material is licensed under this
+               Public License, and include the text of, or the URI or
+               hyperlink to, this Public License.
+
+       2. You may satisfy the conditions in Section 3(a)(1) in any
+          reasonable manner based on the medium, means, and context in
+          which You Share the Licensed Material. For example, it may be
+          reasonable to satisfy the conditions by providing a URI or
+          hyperlink to a resource that includes the required
+          information.
+
+       3. If requested by the Licensor, You must remove any of the
+          information required by Section 3(a)(1)(A) to the extent
+          reasonably practicable.
+
+  b. ShareAlike.
+
+     In addition to the conditions in Section 3(a), if You Share
+     Adapted Material You produce, the following conditions also apply.
+
+       1. The Adapter's License You apply must be a Creative Commons
+          license with the same License Elements, this version or
+          later, or a BY-SA Compatible License.
+
+       2. You must include the text of, or the URI or hyperlink to, the
+          Adapter's License You apply. You may satisfy this condition
+          in any reasonable manner based on the medium, means, and
+          context in which You Share Adapted Material.
+
+       3. You may not offer or impose any additional or different terms
+          or conditions on, or apply any Effective Technological
+          Measures to, Adapted Material that restrict exercise of the
+          rights granted under the Adapter's License You apply.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+     to extract, reuse, reproduce, and Share all or a substantial
+     portion of the contents of the database;
+
+  b. if You include all or a substantial portion of the database
+     contents in a database in which You have Sui Generis Database
+     Rights, then the database in which You have Sui Generis Database
+     Rights (but not its individual contents) is Adapted Material,
+     including for purposes of Section 3(b); and
+
+  c. You must comply with the conditions in Section 3(a) if You Share
+     all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+  c. The disclaimer of warranties and limitation of liability provided
+     above shall be interpreted in a manner that, to the extent
+     possible, most closely approximates an absolute disclaimer and
+     waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+  a. This Public License applies for the term of the Copyright and
+     Similar Rights licensed here. However, if You fail to comply with
+     this Public License, then Your rights under this Public License
+     terminate automatically.
+
+  b. Where Your right to use the Licensed Material has terminated under
+     Section 6(a), it reinstates:
+
+       1. automatically as of the date the violation is cured, provided
+          it is cured within 30 days of Your discovery of the
+          violation; or
+
+       2. upon express reinstatement by the Licensor.
+
+     For the avoidance of doubt, this Section 6(b) does not affect any
+     right the Licensor may have to seek remedies for Your violations
+     of this Public License.
+
+  c. For the avoidance of doubt, the Licensor may also offer the
+     Licensed Material under separate terms or conditions or stop
+     distributing the Licensed Material at any time; however, doing so
+     will not terminate this Public License.
+
+  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+     License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+  a. The Licensor shall not be bound by any additional or different
+     terms or conditions communicated by You unless expressly agreed.
+
+  b. Any arrangements, understandings, or agreements regarding the
+     Licensed Material not stated herein are separate from and
+     independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+  a. For the avoidance of doubt, this Public License does not, and
+     shall not be interpreted to, reduce, limit, restrict, or impose
+     conditions on any use of the Licensed Material that could lawfully
+     be made without permission under this Public License.
+
+  b. To the extent possible, if any provision of this Public License is
+     deemed unenforceable, it shall be automatically reformed to the
+     minimum extent necessary to make it enforceable. If the provision
+     cannot be reformed, it shall be severed from this Public License
+     without affecting the enforceability of the remaining terms and
+     conditions.
+
+  c. No term or condition of this Public License will be waived and no
+     failure to comply consented to unless expressly agreed to by the
+     Licensor.
+
+  d. Nothing in this Public License constitutes or may be interpreted
+     as a limitation upon, or waiver of, any privileges and immunities
+     that apply to the Licensor or You, including from the legal
+     processes of any jurisdiction or authority.
+
+
+=======================================================================
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the “Licensor.” The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
+

Makefile

@@ -26,7 +26,7 @@ SOURCE_DIR     = content
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/17.0
 endif
 ifneq ($(CURRENT_LANG),en)
   HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)
@@ -42,6 +42,7 @@ help:
 	@echo "  html         to build the documentation to HTML"
 	@echo "  fast         to build the documentation to HTML with shallow menu (faster)"
 	@echo "  clean        to delete the build files"
+	@echo "  test         to run the guidelines tests"
 
 clean:
 	@echo "Cleaning build files..."
@@ -55,7 +56,7 @@ html: $(HTML_BUILD_DIR)/_static/style.css
 
 # To call *after* `make html`
 # Binary dependencies (Debian): texlive-fonts-recommended texlive-latex-extra
-# texlive-generic-recommended texlive-fonts-extra
+# texlive-fonts-extra
 latexpdf:
 	@echo "Starting build..."
 	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b latex $(SPHINXOPTS) $(SOURCE_DIR) $(BUILD_DIR)/latex
@@ -82,3 +83,16 @@ fast: html
 static: $(HTML_BUILD_DIR)/_static/style.css
 	cp -r extensions/odoo_theme/static/* $(HTML_BUILD_DIR)/_static/
 	cp -r static/* $(HTML_BUILD_DIR)/_static/
+
+# Called by runbot for the ci/documentation_guideline check.
+test:
+	@python tests/main.py $(SOURCE_DIR)/administration $(SOURCE_DIR)/applications $(SOURCE_DIR)/contributing $(SOURCE_DIR)/developer redirects
+
+# Similar as `test`, but called only manually by content reviewers to trigger extra checks.
+review:
+	@read -p "Enter relative content path: " path; read -p "Enter max line length (default: 100): " line_length; \
+	if [ -z "$$path" ]; then echo "Error: Path cannot be empty"; exit 1; fi; \
+	if echo $$path | grep -q 'content/'; then path=`echo $$path | sed 's|content/||'`; fi; \
+	if [ -z "$$line_length" ]; then line_length=100; fi; \
+	export REVIEW=1; \
+	python tests/main.py --max-line-length=$$line_length $(SOURCE_DIR)/$$path

README.md

@@ -4,43 +4,33 @@
 
 ### Requirements
 
-- [Git](https://www.odoo.com/documentation/master/contributing/documentation.html#install-git)
-- [Python 3.7 or 3.8](https://www.odoo.com/documentation/master/contributing/documentation.html#python)
-- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/master/requirements.txt).
-- [Make](https://www.odoo.com/documentation/master/contributing/documentation.html#make)
-- A local copy of the [odoo/odoo repository in master](https://github.com/odoo/odoo/tree/master) (Optional)
+- Git
+- Python 3.6, 3.7, or 3.8
+- Python dependencies listed in the file `requirements.txt`.
+- Make
+- A local copy of the [odoo/odoo repository](https://github.com/odoo/odoo) (optional)
 
 ### Instructions
 
-1. In a terminal, navigate to the root directory and compile the documentation to HTML with the
-   following command:
-
-   ```sh
-   make
-   ```
-
+1. In a terminal, navigate to the root directory of the documentation and build it `make`.
    Additional commands are available with `make help`.
-
-2. Open the file `documentation/_build/html/index.html` in your web browser to display the render.
-
-3. See [this guide](https://www.odoo.com/documentation/master/contributing/documentation.html#preview-your-changes)
+2. Open the file `documentation/_build/html/index.html` in your web browser.
+3. See [this guide](https://www.odoo.com/documentation/latest/contributing/documentation.html)
    for more detailed instructions.
 
-Optional: to fully build the developer documentation with inline docstrings for documented Python
-functions, place your local copy of the `odoo/odoo` repository in the root directory. Alternatively,
-create a symbolic link with `odoo` as link name. If the Odoo sources are not found, a warning will
-be shown.
+Optional: place your local copy of the `odoo/odoo` repository in the parent directory or in the root
+directory of the documentation to build the latter with the documented Python docstrings.
 
 ## Contribute to the documentation
 
 For contributions to the content of the documentation, please refer to the
-[Introduction Guide](https://www.odoo.com/documentation/master/contributing/documentation.html).
+[Introduction Guide](https://www.odoo.com/documentation/latest/contributing/documentation.html).
 
 To **report a content issue**, **request new content** or **ask a question**, use the
-[repository's issue tracker](https://github.com/odoo/documentation-user/issues) as usual.
+[repository's issue tracker](https://github.com/odoo/documentation/issues).
 
 ## Learn More
 
 To learn more about Odoo, in addition to the documentation, have a look at
 [the official eLearning](https://odoo.com/slides) and
-[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game).
+[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game).

commit_template.txt

@@ -16,4 +16,4 @@
 # [REM] = Removal
 # [REF] = Refactoring (restructuring)
 # [MOV] = Move/rename
-#
+#

conf.py

@@ -1,14 +1,14 @@
-import re
 import os
+import re
 import shutil
 import sys
 from pathlib import Path
 
 import docutils
+import sphinx
 from pygments.lexers import JsonLexer, XmlLexer
 from sphinx.ext import graphviz
 from sphinx.util import logging
-import sphinx
 
 _logger = logging.getLogger(__name__)
 
@@ -19,10 +19,24 @@ _logger = logging.getLogger(__name__)
 project = 'Odoo'
 copyright = 'Odoo S.A.'
 
-# `version` if the version info for the project being documented, acts as replacement for |version|,
+# `version` is the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = 'master'
+version = release = '17.0'
+
+# `current_branch` is the technical name of the current branch.
+# E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).
+current_branch = version
+# `current_version` is the Odoo version linked to the current branch.
+# E.g., saas-15.4 -> 15.4; 12.0 -> 12; master -> master (*).
+current_version = current_branch.replace('saas-', '').replace('.0', '')
+# `current_major_branch` is the technical name of the major branch before the current branch.
+# E.g., saas-15.4 -> 15.0; 12.0 -> 12.0; master -> master (*).
+current_major_branch = re.sub(r'\.\d', '.0', current_branch.replace('saas-', ''))
+# `current_major_version` is the Odoo version linked to the current major branch.
+# E.g., saas-15.4 -> 15; 12.0 -> 12; master -> master (*).
+current_major_version = current_major_branch.replace('.0', '')
+# (*): We don't care for master.
 
 # The minimal Sphinx version required to build the documentation.
 needs_sphinx = '3.0.0'
@@ -61,8 +75,14 @@ add_function_parentheses = True
 #=== Extensions configuration ===#
 
 source_read_replace_vals = {
+    'BRANCH': current_branch,
+    'CURRENT_BRANCH': current_branch,
+    'CURRENT_VERSION': current_version,
+    'CURRENT_MAJOR_BRANCH': current_major_branch,
+    'CURRENT_MAJOR_VERSION': current_major_version,
     'GITHUB_PATH': f'https://github.com/odoo/odoo/blob/{version}',
     'GITHUB_ENT_PATH': f'https://github.com/odoo/enterprise/blob/{version}',
+    'OWL_PATH': f'https://github.com/odoo/owl/blob/master',
 }
 
 # Add extensions directory to PYTHONPATH
@@ -95,7 +115,7 @@ else:
     import odoo.addons
     odoo.addons.__path__.append(str(odoo_dir) + '/addons')
     from odoo import release as odoo_release  # Don't collide with Sphinx's 'release' config option
-    odoo_version = odoo_release.version.replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
+    odoo_version = '.'.join(str(s) for s in odoo_release.version_info[:2]).replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
     odoo_version = 'master' if 'alpha' in odoo_release.version else odoo_version
     if release != odoo_version:
         _logger.warning(
@@ -145,6 +165,12 @@ extensions = [
     # Content tabs
     'sphinx_tabs.tabs',
 
+    # Cards
+    'cards',
+
+    # Spoilers
+    'spoilers',
+
     # Strange html domain logic used in memento pages
     'html_domain',
 ]
@@ -169,7 +195,7 @@ todo_include_todos = False
 intersphinx_mapping = {
     'pillow': ('https://pillow.readthedocs.io/en/stable/', None),
     'python': ('https://docs.python.org/3/', None),
-    'werkzeug': ('https://werkzeug.palletsprojects.com/en/1.0.x/', None),
+    'werkzeug': ('https://werkzeug.palletsprojects.com/en/2.3.x/', None),
 }
 
 github_user = 'odoo'
@@ -187,10 +213,16 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
     'master': "Master",
+    'saas-17.1': "Odoo Online",
+    '17.0': "Odoo 17",
+    'saas-16.4': "Odoo Online",
+    'saas-16.3': "Odoo Online",
+    'saas-16.2': "Odoo Online",
+    'saas-16.1': "Odoo Online",
+    '16.0': "Odoo 16",
     'saas-15.2': "Odoo Online",
     '15.0': "Odoo 15",
     '14.0': "Odoo 14",
-    '13.0': "Odoo 13",
 }
 
 # The language names that should be shown in the language switcher, if the config option `languages`
@@ -200,10 +232,12 @@ languages_names = {
     'en': 'EN',
     'es': 'ES',
     'fr': 'FR',
+    'it': 'IT',
     'nl': 'NL',
     'pt_BR': 'PT',
     'uk': 'UA',
-    'zh_CN': 'ZH',
+    'zh_CN': 'ZH (CN)',
+    'zh_TW': 'ZH (TW)'
 }
 
 # The directory in which files holding redirect rules used by the 'redirects' extension are listed.
@@ -274,20 +308,33 @@ latex_documents = [
     ('legal/terms/i18n/partnership_tex_fr',
      'odoo_partnership_agreement_fr.tex', 'Odoo Partnership Agreement (FR)', '', 'howto'),
     ('legal/terms/i18n/terms_of_sale_fr', 'terms_of_sale_fr.tex',
-     u'Conditions Générales de Vente Odoo', '', 'howto'),
+     'Conditions Générales de Vente Odoo', '', 'howto'),
 
     ('legal/terms/i18n/enterprise_tex_nl', 'odoo_enterprise_agreement_nl.tex',
      'Odoo Enterprise Subscription Agreement (NL)', '', 'howto'),
 
     ('legal/terms/i18n/enterprise_tex_de', 'odoo_enterprise_agreement_de.tex',
      'Odoo Enterprise Subscription Agreement (DE)', '', 'howto'),
+    ('legal/terms/i18n/terms_of_sale_de', 'terms_of_sale_de.tex',
+     'Allgemeine Verkaufsbedingungen Odoo', '', 'howto'),
 
     ('legal/terms/i18n/enterprise_tex_es', 'odoo_enterprise_agreement_es.tex',
      'Odoo Enterprise Subscription Agreement (ES)', '', 'howto'),
     ('legal/terms/i18n/partnership_tex_es',
      'odoo_partnership_agreement_es.tex', 'Odoo Partnership Agreement (ES)', '', 'howto'),
+    ('legal/terms/i18n/terms_of_sale_es', 'terms_of_sale_es.tex',
+     'Términos Generales de Venta Odoo', '', 'howto'),
+
+    ('legal/terms/i18n/enterprise_tex_pt_BR', 'odoo_enterprise_agreement_pt_BR.tex',
+     'Odoo Enterprise Subscription Agreement (PT)', '', 'howto'),
 ]
 
+# List of languages that have legal translations (excluding EN). The keys must be in
+# `languages_names`. These translations will have a link to their versions of the legal
+# contracts, instead of the default EN one. The main legal documents are not part of the
+# translations since they have legal meaning.
+legal_translations = ['de', 'es', 'fr', 'nl', 'pt_BR']
+
 # The name of an image file (relative to this directory) to place at the top of the title page.
 latex_logo = 'static/img/odoo_logo.png'
 
@@ -310,7 +357,6 @@ def source_read_replace(app, docname, source):
         result = result.replace(f"{{{key}}}", app.config.source_read_replace_vals[key])
     source[0] = result
 
-
 def setup(app):
     # Generate all alternate URLs for each document
     app.add_config_value('project_root', None, 'env')
@@ -398,8 +444,9 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
         The entry 'language' is added by Sphinx in the rendering context.
         """
         _current_lang = app.config.language or 'en'
-        # Replace the context value by its translated description ("Français" instead of "french")
+        # Replace the context value by its upper-cased value ("FR" instead of "fr")
         context['language'] = languages_names.get(_current_lang)
+        context['language_code'] = _current_lang
 
         # If the list of languages is not set, assume that the project has no alternate language
         _provided_languages = app.config.languages and app.config.languages.split(',') or []
@@ -416,6 +463,10 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
                     )
                 )
 
+        # Dynamic generation of localized legal doc links
+        context['legal_translations'] = legal_translations
+
+
     def _build_url(_version=None, _lang=None):
         if app.config.is_remote_build:
             # Project root like https://www.odoo.com/documentation
@@ -428,8 +479,24 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
         _version = _version or app.config.version
         _lang = _lang or app.config.language or 'en'
         _canonical_page = f'{pagename}.html'
+
+        # legal translations have different URLs schemes as they are not managed on transifex
+        # e.g. FR translation of /terms/enterprise => /fr/terms/enterprise_fr
+        if pagename.startswith('legal/terms/'):
+            if _lang in legal_translations and not pagename.endswith(f"_{_lang}"):
+                # remove language code for current translation, set target one
+                _page = re.sub("_[a-z]{2}$", "", pagename)
+                if 'terms/i18n' not in _page:
+                    _page = _page.replace("/terms/", "/terms/i18n/")
+                _canonical_page = f'{_page}_{_lang}.html'
+            elif _lang == 'en' and pagename.endswith(tuple(f"_{l}" for l in legal_translations)):
+                # remove language code for current translation, link to original EN one
+                _page = re.sub("_[a-z]{2}$", "", pagename)
+                _canonical_page = f'{_page.replace("/i18n/", "/")}.html'
+
         if app.config.is_remote_build:
             _canonical_page = _canonical_page.replace('index.html', '')
+
         return f'{_root}' \
                f'{f"/{_version}" if app.config.versions else ""}' \
                f'{f"/{_lang}" if _lang != "en" else ""}' \

content/administration/install.rst

@@ -1,14 +1,50 @@
-:nosearch:
+:show-content:
 
 =======
 Install
 =======
 
-.. If you add content on this page, remove the redirect rule 'install -> install/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/install
-    install/deploy
-    install/cdn
-    install/email_gateway
+   install/online
+   install/packages
+   install/source
+   install/deploy
+   install/cdn
+   install/email_gateway
+   install/geo_ip

content/administration/install/cdn.rst

@@ -1,80 +1,109 @@
-===========================================
-Setting up a Content Delivery Network (CDN)
-===========================================
+=======================================
+Set up a content delivery network (CDN)
+=======================================
 
 .. _reference/cdn/keycdn:
 
-Deploying with KeyCDN_
-======================
+Deploying with KeyCDN
+=====================
 
-.. sectionauthor:: Fabien Meghazi
+A :abbr:`CDN (Content Delivery Network)` or *content distribution network*, is a geographically
+distributed network of servers that provides high speed internet content. The :abbr:`CDN (Content
+Delivery Network)` provides quick, high-quality content delivery for content-heavy websites.
 
-This document will guide you through the setup of a KeyCDN_ account with your
-Odoo powered website.
+This document will guide you through the setup of a KeyCDN_ account with an Odoo powered website.
 
-Step 1: Create a pull zone in the KeyCDN dashboard
---------------------------------------------------
+Create a pull zone in the KeyCDN dashboard
+------------------------------------------
 
-.. image:: cdn/keycdn_create_a_pull_zone.png
-   :class: img-fluid
+On the KeyCDN dashboard, start by navigating to the :menuselection:`Zones` menu item on the left. On
+the form, give a value to the :guilabel:`Zone Name`, which will appear as part of the :abbr:`CDN
+(Content Delivery Network)`'s :abbr:`URL (Uniform Resource Locator)`. Then, set the :guilabel:`Zone
+Status` to :guilabel:`active` to engage the zone. For the :guilabel:`Zone Type` set the value to
+:guilabel:`Pull`, and then, finally, under the :guilabel:`Pull Settings`, enter the
+:guilabel:`Origin URL`— this address should be the full Odoo database :abbr:`URL (Uniform Resource
+Locator)`.
 
-When creating the zone, enable the CORS option in the
-:guilabel:`advanced features` submenu. (more on that later)
+.. example::
+   Use ``https://yourdatabase.odoo.com`` and replace the *yourdatabase* subdomain prefix with the
+   actual name of the database. A custom :abbr:`URL (Uniform Resource Locator)` can be used, as
+   well, in place of the Odoo subdomain that was provided to the database.
 
-.. image:: cdn/keycdn_enable_CORS.png
-   :class: img-fluid
+.. image:: cdn/keycdn-zone.png
+   :align: center
+   :alt: KeyCDN's Zone configuration page.
 
-Once done, you'll have to wait a bit while KeyCDN_ is crawling your website.
+Under the :guilabel:`General Settings` heading below the zone form, click the :guilabel:`Show all
+settings` button to expand the zone options. This should be the last option on the page. After
+expanding the :guilabel:`General Settings` ensure that the :guilabel:`CORS` option is
+:guilabel:`enabled`.
 
-.. image:: cdn/keycdn_progressbar.png
-   :class: img-fluid
+Next, scroll to the bottom of the zone configuration page and :guilabel:`Save` the changes. KeyCDN
+will indicate that the new zone will be deployed. This can take about 10 minutes.
 
-.. note:: a new URL has been generated for your Zone, in this case it is
-          ``http://pulltest-b49.kxcdn.com``
+.. image:: cdn/zone-url.png
+   :align: center
+   :alt: KeyCDN deploying the new Zone.
 
-Step 2: Configure the odoo instance with your zone
---------------------------------------------------
+.. note::
+   A new :guilabel:`Zone URL` has been generated for your Zone, in this example it is
+   ``pulltest-xxxxx.kxcdn.com``. This value will differ for each database.
 
-In the Odoo back end, go to the :guilabel:`Website Settings`: menu, then
-activate the CDN support and copy/paste your zone URL in the
-:guilabel:`CDN Base URL` field. This field is only visible and configurable if
-you have developer mode activated.
+Copy this :guilabel:`Zone URL` to a text editor for later, as it will be used in the next steps.
 
-.. image:: cdn/odoo_cdn_base_url.png
-   :class: img-fluid
+Configure the Odoo instance with the new zone
+---------------------------------------------
 
-Now your website is using the CDN for the resources matching the
-:guilabel:`CDN filters` regular expressions.
+In the Odoo :guilabel:`Website` app, go to the :menuselection:`Settings` and then activate the
+:guilabel:`Content Delivery Network (CDN)` setting and copy/paste the :guilabel:`Zone URL` value
+from the earlier step into the :guilabel:`CDN Base URL` field. This field is only visible and
+configurable when :doc:`Developer Mode <../../applications/general/developer_mode>` is activated.
 
-You can have a look to the HTML of your website in order to check if the CDN
-integration is properly working.
+.. note::
+   Ensure that there are two *forward slashes* (`//`) before the :guilabel:`CDN Base URL` and one
+   forward slash (`/`) after the :guilabel:`CDN Base URL`.
 
-.. image:: cdn/odoo_check_your_html.png
-   :class: img-fluid
+:guilabel:`Save` the settings when complete.
 
+.. image:: cdn/cdn-base-url.png
+   :align: center
+   :alt: Activate the CDN setting in Odoo.
 
-Why should I activate CORS?
----------------------------
+Now the website is using the CDN for the resources matching the :guilabel:`CDN filters` regular
+expressions.
 
-A security restriction in some browsers (Firefox and Chrome at time of writing)
-prevents a remotely linked CSS file to fetch relative resources on this same
-external server.
+In the HTML of the Odoo website, the :abbr:`CDN (content delivery network)` integration is evidenced
+as working properly by checking the :abbr:`URL (Uniform Resource Locators)` of images. The *CDN Base
+URL* value can be seen by using your web browser's :guilabel:`Inspect` feature on the Odoo website.
+Look for it's record by searching within the :guilabel:`Network` tab inside of devtools.
 
-If you don't activate the CORS option in the CDN zone, the more obvious
-resulting problem on a default Odoo website will be the lack of font-awesome
-icons because the font file declared in the font-awesome CSS won't be loaded on
-the remote server.
+.. image:: cdn/test-pull.png
+   :align: center
+   :alt: The CDN Base URL can be seen using the inspect function on the Odoo website.
 
-Here's what you would see on your homepage in such a case:
+Prevent security issues by activating cross-origin resource sharing (CORS)
+--------------------------------------------------------------------------
 
-.. image:: cdn/odoo_font_file_not_loaded.png
-   :class: img-fluid
+A security restriction in some browsers (such as Mozilla Firefox and Google Chrome) prevents a
+remotely linked CSS file to fetch relative resources on this same external server.
 
-A security error message will also appear in the browser's console:
+If the :abbr:`CORS (Cross-Origin Resource Sharing)` option isn't enabled in the :guilabel:`CDN
+Zone`, the more obvious resulting problem on a standard Odoo website will be the lack of *Font
+Awesome* icons because the font file declared in the *Font Awesome* CSS won't be loaded from the
+remote server.
 
-.. image:: cdn/odoo_security_message.png
-   :class: img-fluid
+When these cross-origin resource issues occur, a security error message similar to the output
+below will appear in the web browser's developer console:
 
-Enabling the CORS option in the CDN fixes this issue.
+``Font from origin 'http://pulltest-xxxxx.kxcdn.com' has been blocked from loading /shop:1 by
+Cross-Origin Resource Sharing policy: No 'Access-Control-Allow-Origin' header is present on the
+requested resource. Origin 'http://yourdatabase.odoo.com' is therefore not allowed access.``
+
+.. image:: cdn/odoo-security-message.png
+   :align: center
+   :alt: Error message populated in the browser console.
+
+Enabling the :abbr:`CORS (Cross-Origin Resource Sharing)` option in the :abbr:`CDN (Content Delivery
+Network)` settings fixes this issue.
 
 .. _KeyCDN: https://www.keycdn.com

content/administration/install/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 :ref:`installation <setup/install>`, and is
+internet-facing server. It follows :doc:`installation <../install>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.
 
@@ -43,7 +43,7 @@ Configuration samples
 
 * Show only databases with names beginning with 'mycompany'
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -55,7 +55,7 @@ in ``/etc/odoo.conf`` set:
   was sent to ``www.mycompany.com`` or ``mycompany.co.uk``, but not
   for ``www2.mycompany.com`` or ``helpdesk.mycompany.com``.
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -97,7 +97,7 @@ Configuration sample
 * Allow tcp connection on localhost
 * Allow tcp connection from 192.168.1.x network
 
-in ``/etc/postgresql/9.5/main/pg_hba.conf`` set:
+in ``/etc/postgresql/<YOUR POSTGRESQL VERSION>/main/pg_hba.conf`` set:
 
 .. code-block:: text
 
@@ -105,7 +105,7 @@ in ``/etc/postgresql/9.5/main/pg_hba.conf`` set:
   host    all             all             127.0.0.1/32            md5
   host    all             all             192.168.1.0/24          md5
 
-in ``/etc/postgresql/9.5/main/postgresql.conf`` set:
+in ``/etc/postgresql/<YOUR POSTGRESQL VERSION>/main/postgresql.conf`` set:
 
 .. code-block:: text
 
@@ -123,7 +123,7 @@ Out of the box, Odoo connects to a local postgres over UNIX socket via port
 <reference/cmdline/server/database>` when your Postgres deployment is not
 local and/or does not use the installation defaults.
 
-The :ref:`packaged installers <setup/install/packaged>` will automatically
+The :doc:`packaged installers <packages>` will automatically
 create a new user (``odoo``) and set it as the database user.
 
 * The database management screens are protected by the ``admin_passwd``
@@ -150,7 +150,7 @@ Configuration sample
 * with 'pwd' as a password
 * filtering only db with a name beginning with 'mycompany'
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -172,28 +172,38 @@ in Odoo the db_sslmode control the ssl security of the connection
 with value chosen out of 'disable', 'allow', 'prefer', 'require', 'verify-ca'
 or 'verify-full'
 
-`PostgreSQL Doc <https://www.postgresql.org/docs/current/static/libpq-ssl.html>`_
+`PostgreSQL Doc <https://www.postgresql.org/docs/12/static/libpq-ssl.html>`_
 
 .. _builtin_server:
 
 Builtin server
 ==============
 
-Odoo includes built-in HTTP servers, using either multithreading or
-multiprocessing.
+Odoo includes built-in HTTP, cron, and live-chat servers, using either multi-threading or
+multi-processing.
 
-For production use, it is recommended to use the multiprocessing server as it
-increases stability, makes somewhat better use of computing resources and can
-be better monitored and resource-restricted.
+The **multi-threaded** server is a simpler server primarily used for development, demonstrations,
+and its compatibility with various operating systems (including Windows). A new thread is spawned
+for every new HTTP request, even for long-lived connections such as websocket. Extra daemonic cron
+threads are spawned too. Due to a Python limitation (GIL), it doesn't make the best use of the
+hardware.
 
-* Multiprocessing is enabled by configuring :option:`a non-zero number of
-  worker processes <odoo-bin --workers>`, the number of workers should be based
-  on the number of cores in the machine (possibly with some room for cron
-  workers depending on how much cron work is predicted)
-* Worker limits can be configured based on the hardware configuration to avoid
-  resources exhaustion
+The multi-threaded server is the default server, also for docker containers. It is selected by
+leaving the :option:`--workers <odoo-bin --workers>` option out or setting it to ``0``.
 
-.. warning:: multiprocessing mode currently isn't available on Windows
+The **multi-processing** server is a full-blown server primarily used for production. It is not
+liable to the same Python limitation (GIL) on resource usage and hence makes the best use of the
+hardware. A pool of workers is created upon server startup. New HTTP requests are queued by the OS
+until there are workers ready to process them. An extra event-driven HTTP worker for the live chat
+is spawned on an alternative port. Extra cron workers are spawned too. A configurable process
+reaper monitors resource usage and can kill/restart failed workers.
+
+The multi-processing server is opt-in. It is selected by setting the :option:`--workers
+<odoo-bin --workers>` option to a non-null integer.
+
+.. note::
+   Because it is highly customized for Linux servers, the multi-processing server is not available
+   on Windows.
 
 Worker number calculation
 -------------------------
@@ -214,18 +224,12 @@ Needed RAM = #worker * ( (light_worker_ratio * light_worker_ram_estimation) + (h
 LiveChat
 --------
 
-In multiprocessing, a dedicated LiveChat worker is automatically started and
-listening on :option:`the gevent port <odoo-bin --gevent-port>` but
-the client will not connect to it.
-
-Instead you must have a proxy redirecting requests whose URL starts with
-``/websocket/`` to the gevent port. Other request should be proxied to
-the :option:`normal HTTP port <odoo-bin --http-port>`
-
-To achieve such a thing, you'll need to deploy a reverse proxy in front of Odoo,
-like nginx or apache. When doing so, you'll need to forward some more http Headers
-to Odoo, and activate the proxy_mode in Odoo configuration to have Odoo read those
-headers.
+In multi-processing, a dedicated LiveChat worker is automatically started and listens on
+the :option:`--gevent-port <odoo-bin --gevent-port>`. By default, the HTTP requests will keep
+accessing the normal HTTP workers instead of the LiveChat one. You must deploy a proxy in front of
+Odoo and redirect incoming requests whose path starts with ``/websocket/`` to the LiveChat worker.
+You must also start Odoo in :option:`--proxy-mode <odoo-bin --proxy-mode>` so it uses the real
+client headers (such as hostname, scheme, and IP) instead of the proxy ones.
 
 Configuration sample
 --------------------
@@ -238,7 +242,7 @@ Configuration sample
 * We'll use 8 workers + 1 for cron. We'll also use a monitoring system to measure cpu load, and check if it's between 7 and 7.5 .
 * RAM = 9 * ((0.8*150) + (0.2*1024)) ~= 3Go RAM for Odoo
 
-in ``/etc/odoo.conf``:
+in :ref:`the configuration file <reference/cmdline/config_file>`:
 
 .. code-block:: ini
 
@@ -273,7 +277,7 @@ Configuration sample
 * Redirect http requests to https
 * Proxy requests to odoo
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -290,6 +294,10 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
   upstream odoochat {
     server 127.0.0.1:8072;
   }
+  map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+  }
 
   # http -> https
   server {
@@ -305,12 +313,6 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
     proxy_connect_timeout 720s;
     proxy_send_timeout 720s;
 
-    # Add Headers for odoo proxy mode
-    proxy_set_header X-Forwarded-Host $host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Real-IP $remote_addr;
-
     # SSL parameters
     ssl_certificate /etc/ssl/nginx/server.crt;
     ssl_certificate_key /etc/ssl/nginx/server.key;
@@ -328,16 +330,27 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
       proxy_pass http://odoochat;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection $connection_upgrade;
-      proxy_set_header X-Forwarded-Host $host;
+      proxy_set_header X-Forwarded-Host $http_host;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_set_header X-Real-IP $remote_addr;
+
+      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
     }
 
     # Redirect requests to odoo backend server
     location / {
+      # Add Headers for odoo proxy mode
+      proxy_set_header X-Forwarded-Host $http_host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Real-IP $remote_addr;
       proxy_redirect off;
       proxy_pass http://odoo;
+
+      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
     }
 
     # common gzip
@@ -345,6 +358,31 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
     gzip on;
   }
 
+HTTPS Hardening
+---------------
+
+Add the `Strict-Transport-Security` header to all requests, in order to prevent
+browsers from ever sending a plain HTTP request to this domain. You will need
+to maintain a working HTTPS service with a valid certificate on this domain at
+all times, otherwise your users will see security alerts or be entirely unable
+to access it.
+
+Force HTTPS connections during a year for every visitor in NGINX with the line:
+
+.. code-block:: nginx
+
+  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+
+Additional configuration can be defined for the `session_id` cookie. The `Secure`
+flag can be added to ensure it is never transmitted over HTTP and `SameSite=Lax`
+to prevent authenticated `CSRF`_.
+
+.. code-block:: nginx
+
+  # requires nginx 1.19.8
+  proxy_cookie_flags session_id samesite=lax secure;
+
+
 Odoo as a WSGI Application
 ==========================
 
@@ -361,38 +399,30 @@ of workers anymore it can not setup cron or livechat workers
 Cron Workers
 ------------
 
-To run cron jobs for an Odoo deployment as a WSGI application requires
+Starting one of the built-in Odoo servers next to the WSGI server is required to process cron jobs.
+That server must be configured to only process crons and not HTTP requests using the
+:option:`--no-http <odoo-bin --no-http>` cli option or the ``http_enable = False`` configuration
+file setting.
 
-* A classical Odoo (run via ``odoo-bin``)
-* Connected to the database in which cron jobs have to be run (via
-  :option:`odoo-bin -d`)
-* Which should not be exposed to the network. To ensure cron runners are not
-  network-accessible, it is possible to disable the built-in HTTP server
-  entirely with :option:`odoo-bin --no-http` or setting ``http_enable = False``
-  in the configuration file
+On Linux-like systems, using the multi-processing server over the multi-threading one is recommended
+to benefit from better hardware usage and increased stability, i.e., using
+the :option:`--workers=-1 <odoo-bin --workers>` and :option:`--max-cron-threads=n
+<odoo-bin --max-cron-threads>` cli options.
 
 LiveChat
 --------
 
-The second problematic subsystem for WSGI deployments is the LiveChat: where
-most HTTP connections are relatively short and quickly free up their worker
-process for the next request, LiveChat require a long-lived connection for
-each client in order to implement near-real-time notifications.
+Using a gevent-compatible WSGI server is required for the correct operation of the live chat
+feature. That server should be able to handle many simultaneous long-lived connections but doesn't
+need a lot of processing power. All requests whose path starts with ``/websocket/`` should be
+directed to that server. A regular (thread/process-based) WSGI server should be used for all other
+requests.
 
-This is in conflict with the process-based worker model, as it will tie
-up worker processes and prevent new users from accessing the system. However,
-those long-lived connections do very little and mostly stay parked waiting for
-notifications.
-
-The solutions to support livechat/motifications in a WSGI application are:
-
-* Deploy a threaded version of Odoo (instead of a process-based preforking
-  one) and redirect only requests to URLs starting with ``/websocket/`` to
-  that Odoo, this is the simplest and the websocket URL can double up as the cron 
-  instance.
-* Deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting
-  with ``/websocket/`` to
-  :option:`the gevent port <odoo-bin --gevent-port>`.
+The Odoo cron server can also be used to serve the live chat requests. Just drop
+the :option:`--no-http <odoo-bin --no-http>` cli option from the cron server and make sure requests
+whose path starts with ``/websocket/`` are directed to this server, either on
+the :option:`--http-port <odoo-bin --http-port>` (multi-threading server) or on
+the :option:`--gevent-port <odoo-bin --gevent-port>` (multi-processing server).
 
 .. _deploy/streaming:
 
@@ -406,65 +436,75 @@ a static HTTP server.
 Serving static files
 --------------------
 
-Odoo static files are located in each module's :file:`static/` folder, so static files can be served 
+Odoo static files are located in each module's :file:`static/` folder, so static files can be served
 by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up the right module
 (and file) in the various addons paths.
 
-.. example::
-   Say Odoo has been installed via the **debian packages** for Community and Enterprise, the addons
-   paths is :file:`/usr/lib/python3/dist-packages/odoo/addons`. Using the above NGINX (https)
-   configuration, the following location block should be added to serve static files via NGINX.
-   
-   .. code-block:: nginx
-   
-       location @odoo {
-           # copy-paste the content of the / location block
-       }
-   
-       # Serve static files right away
-       location ~ ^/[^/]+/static/.+$ {
-           root /usr/lib/python3/dist-packages/odoo/addons;
-           try_files $uri @odoo;
-           expires 24h;
-       }
+It is recommended to set the ``Content-Security-Policy: default-src 'none'`` header on all images
+delivered by the web server. It is not strictly necessary as users cannot modify/inject content
+inside of modules' :file:`static/` folder and existing images are final (they do not fetch new
+resources by themselves). However, it is good practice.
+
+Using the above NGINX (https) configuration, the following ``map`` and ``location`` blocks should be
+added to serve static files via NGINX.
+
+.. code-block:: nginx
+
+    map $sent_http_content_type $content_type_csp {
+        default "";
+        ~image/ "default-src 'none'";
+    }
+
+    server {
+        # the rest of the configuration
+
+        location @odoo {
+            # copy-paste the content of the / location block
+        }
+
+        # Serve static files right away
+        location ~ ^/[^/]+/static/.+$ {
+            # root and try_files both depend on your addons paths
+            root ...;
+            try_files ... @odoo;
+            expires 24h;
+            add_header Content-Security-Policy $content_type_csp;
+        }
+    }
+
+The actual ``root`` and ``try_files`` directives are dependant on your installation, specifically on
+your :option:`--addons-path <odoo-bin --addons-path>`.
 
 .. example::
-   Say Odoo has been installed via the **source**, and the two git repositories for Community and
-   Enterprise has been cloned in :file:`/opt/odoo` and :file:`/opt/odoo-enterprise` respectively. 
-   The addons paths is ``/opt/odoo/odoo,/opt/odoo/addons,/opt/odoo-enterprise``. Using the above
-   NGINX (https) configuragion, the following location block should be added to serve static files
-   via NGINX.
 
-   .. code-block:: nginx
-   
-       location @odoo {
-           # copy-paste the content of the / location block
-       }
-   
-       # Serve static files right away
-       location ~ ^/[^/]+/static/.+$ {
-           try_files /static-base$uri /static-addons$uri /static-enterprise$uri @odoo$uri;
-           expires 24h;
-       }
-   
-       location /static-base {
-           internal;
-           alias /opt/odoo/odoo/addons;
-       }
-   
-       location /static-addons {
-           internal;
-           alias /opt/odoo/addons;
-       }
-   
-       location /static-enterprise {
-           internal;
-           alias /opt/odoo-enterprise;
-       }
+   .. tabs::
 
-.. warning::
-   The actual NGINX configuration you need is highly dependent on your own installation. The two
-   above snippets only highlight two possible configurations and may not be used as-is.
+      .. group-tab:: Debian package
+
+         Say Odoo has been installed via the **debian packages** for Community and Enterprise, and
+         that the :option:`--addons-path <odoo-bin --addons-path>` is
+         ``'/usr/lib/python3/dist-packages/odoo/addons'``.
+
+         The ``root`` and ``try_files`` should be:
+
+         .. code-block:: nginx
+
+            root /usr/lib/python3/dist-packages/odoo/addons;
+            try_files $uri @odoo;
+
+      .. group-tab:: Git sources
+
+         Say Odoo has been installed via the **sources**, that both the Community and Enterprise git
+         repositories were cloned in :file:`/opt/odoo/community` and :file:`/opt/odoo/enterprise`
+         respectively, and that the :option:`--addons-path <odoo-bin --addons-path>` is
+         ``'/opt/odoo/community/odoo/addons,/opt/odoo/community/addons,/opt/odoo/enterprise'``.
+
+         The ``root`` and ``try_files`` should be:
+
+         .. code-block:: nginx
+
+            root /opt/odoo;
+            try_files /community/odoo/addons$uri /community/addons$uri /enterprise$uri @odoo;
 
 Serving attachments
 -------------------
@@ -489,7 +529,7 @@ X-Sendfile and X-Accel).
    - The X-Accel extension for NGINX **does** require the following additionnal configuration:
 
      .. code-block:: nginx
- 
+
          location /web/filestore {
              internal;
              alias /path/to/odoo/data-dir/filestore;
@@ -609,11 +649,16 @@ security-related topics:
 - Setup daily backups of your databases and filestore data, and copy them to a remote
   archiving server that is not accessible from the server itself.
 
+- Deploying Odoo on Linux is strongly recommended over Windows. Should you choose nevertheless
+  to deploy on a Windows platform, a thorough security hardening review of the server should be
+  conducted and is outside of the scope of this guide.
+
 
 .. _login_brute_force:
 
 Blocking Brute Force Attacks
 ----------------------------
+
 For internet-facing deployments, brute force attacks on user passwords are very common, and this
 threat should not be neglected for Odoo servers. Odoo emits a log entry whenever a login attempt
 is performed, and reports the result: success or failure, along with the target login and source IP.
@@ -733,6 +778,7 @@ Here are the supported browsers:
     environment than over the internet.
 
 .. _regular expression: https://docs.python.org/3/library/re.html
+.. _CSRF: https://en.wikipedia.org/wiki/Cross-site_request_forgery
 .. _ARP spoofing: https://en.wikipedia.org/wiki/ARP_spoofing
 .. _Nginx termination example:
     https://nginx.com/resources/admin-guide/nginx-ssl-termination/
@@ -741,8 +787,8 @@ Here are the supported browsers:
 .. _socat: http://www.dest-unreach.org/socat/
 .. _PostgreSQL connection settings:
 .. _listen to network interfaces:
-    https://www.postgresql.org/docs/9.6/static/runtime-config-connection.html
+    https://www.postgresql.org/docs/12/static/runtime-config-connection.html
 .. _use an SSH tunnel:
-    https://www.postgresql.org/docs/9.6/static/ssh-tunnels.html
+    https://www.postgresql.org/docs/12/static/ssh-tunnels.html
 .. _WSGI: https://wsgi.readthedocs.org/
 .. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2

content/administration/install/email_gateway.rst

@@ -4,19 +4,22 @@ Email gateway
 
 The Odoo mail gateway allows you to inject directly all the received emails in Odoo.
 
-Its principle is straightforward: your SMTP server executes the "mailgate" script for every new incoming email.
+Its principle is straightforward: your SMTP server executes the "mailgate" script for every new
+incoming email.
 
 The script takes care of connecting to your Odoo database through XML-RPC, and send the emails via
 the `MailThread.message_process()` feature.
 
 Prerequisites
 -------------
+
 - Administrator access to the Odoo database.
 - Your own mail server such as Postfix or Exim.
 - Technical knowledge on how to configure an email server.
 
 For Postfix
 -----------
+
 In you alias config (:file:`/etc/aliases`):
 
 .. code-block:: text
@@ -33,6 +36,7 @@ In you alias config (:file:`/etc/aliases`):
 
 For Exim
 --------
+
 .. code-block:: text
 
    *: |/odoo-directory/addons/mail/static/scripts/odoo-mailgate.py -d <database-name> -u <userid> -p <password>

content/administration/install/geo_ip.rst

@@ -0,0 +1,63 @@
+======
+Geo IP
+======
+
+.. note::
+   This documentation only applies to On-premise databases.
+
+Installation
+============
+
+#. Download both the GeoLite2 City and Country
+   `databases <https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with two files
+   called :file:`GeoLite2-City.mmdb` and :file:`GeoLite2-Country.mmdb`.
+
+#. Move the files to the folder :file:`/usr/share/GeoIP/`.
+
+   .. code-block:: bash
+
+       mv ~/Downloads/GeoLite2-City.mmdb /usr/share/GeoIP/
+       mv ~/Downloads/GeoLite2-Country.mmdb /usr/share/GeoIP/
+
+#. Restart the server
+
+.. note::
+   If you don't want to locate the geoip database in :file:`/usr/share/GeoIP/`, use the
+   :option:`--geoip-city-db <odoo-bin --geoip-city-db>` and
+   :option:`--geoip-country-db <odoo-bin --geoip-country-db>` options of the Odoo command line
+   interface. These options take the absolute path to the GeoIP database file and use it as the
+   GeoIP database. For example:
+
+   .. code-block:: bash
+
+      ./odoo-bin --geoip-city-db= ~/Downloads/GeoLite2-City.mmdb
+
+   .. seealso::
+      - :doc:`CLI documentation </developer/reference/cli>`.
+
+Test GeoIP geolocation in your Odoo website
+===========================================
+
+Edit a web page to include some geo-ip information such as the country name of the current
+request IP address. To do so:
+
+#. Go to your website. Open the web page that you want to test ``GeoIP``.
+#. Choose :menuselection:`Customize --> HTML/CSS/JS Editor`.
+#. Add the following piece of XML in the page :
+
+   .. code-block:: xml
+
+       <h1 class="text-center" t-esc="request.geoip.country.name or 'geoip failure'"/>
+
+#. Save and refresh the page.
+
+Geo-ip is working if you read your country name displayed in bold in the middle of the page.
+
+In case you read "**geoip failure**" instead then the geolocalization failed. The common causes are:
+
+#. The browsing IP address is the localhost (``127.0.0.1``) or a local area network one. If you
+   don't know, you can access your website using mobile data.
+#. You are using a reverse-proxy (apache, nginx) in front of Odoo but didn't start Odoo with the
+   proxy-mode enabled. See :option:`proxy mode <odoo-bin --proxy-mode>`.
+#. The GeoIP database is corrupt, missing or unaccessible. In such case a warning was logged in the
+   server logs.

content/administration/install/install.rst

@@ -1,751 +0,0 @@
-
-.. _setup/install:
-
-===============
-Installing Odoo
-===============
-
-There are multiple ways to install Odoo, or not install it at all, depending
-on the intended use case.
-
-This documents attempts to describe most of the installation options.
-
-:ref:`setup/install/online`
-    The easiest way to use Odoo in production or to try it.
-
-:ref:`setup/install/packaged`
-    Suitable for testing Odoo, developing modules and can be used for
-    long-term production use with additional deployment and maintenance work.
-
-:ref:`setup/install/source`
-    Provides greater flexibility:  e.g. allow multiple running Odoo versions on
-    the same system. Good for developing modules, can be used as base for
-    production deployment.
-
-:ref:`setup/install/docker`
-    If you usually use docker_ for development or deployment, an official
-    docker_ base image is available.
-
-
-.. _setup/install/editions:
-
-Editions
-========
-
-There are two different Editions_ of Odoo: the Community and Enterprise versions.
-Using the Enterprise version is possible on our SaaS_ and accessing the code is
-restricted to Enterprise customers and partners. The Community version is freely
-available to anyone.
-
-If you already use the Community version and wish to upgrade to Enterprise, please
-refer to :ref:`setup/enterprise` (except for :ref:`setup/install/source`).
-
-
-.. _setup/install/online:
-
-Online
-======
-
-Demo
-----
-
-To simply get a quick idea of Odoo, demo_ instances are available. They are
-shared instances which only live for a few hours, and can be used to browse
-around and try things out with no commitment.
-
-Demo_ instances require no local installation, just a web browser.
-
-SaaS
-----
-
-Trivial to start with, fully managed and migrated by Odoo S.A., Odoo's SaaS_
-provides private instances and starts out free. It can be used to discover and
-test Odoo and do non-code customizations (i.e. incompatible with custom modules
-or the Odoo Apps Store) without having to install it locally.
-
-Can be used for both testing Odoo and long-term production use.
-
-Like demo_ instances, SaaS_ instances require no local installation, a web
-browser is sufficient.
-
-
-.. _setup/install/packaged:
-
-Packaged installers
-===================
-
-Odoo provides packaged installers for Windows, deb-based distributions
-(Debian, Ubuntu, …) and RPM-based distributions (Fedora, CentOS, RHEL, …) for
-both the Community and Enterprise versions.
-
-These packages automatically set up all dependencies (for the Community version),
-but may be difficult to keep up-to-date.
-
-Official Community packages with all relevant dependency requirements are
-available on our nightly_ server. Both Community and Enterprise packages can
-be downloaded from our download_ page (you must to be logged in as a paying
-customer or partner to download the Enterprise packages).
-
-Windows
--------
-
-#. Download the installer from our nightly_ server (Community only) or the Windows installer from
-   the download_ page (any edition).
-#. Execute the downloaded file.
-
-   .. warning::
-      | On Windows 8 and later you may see a warning titled "Windows protected your PC".
-      | Click on **More Info** and then on **Run anyway**.
-
-#. Accept the UAC_ prompt.
-#. Go through the various installation steps.
-
-Odoo will automatically be started at the end of the installation.
-
-Linux
------
-
-Prepare
-~~~~~~~
-
-.. tabs::
-
-   .. group-tab:: Debian/Ubuntu
-
-      Odoo needs a `PostgreSQL`_ server to run properly. The default configuration for
-      the Odoo 'deb' package is to use the PostgreSQL server on the same host as your
-      Odoo instance. Execute the following command in order to install the PostgreSQL server:
-
-      .. code-block:: console
-
-         $ sudo apt install postgresql -y
-
-   .. group-tab:: Fedora
-
-      Odoo needs a `PostgreSQL`_ server to run properly. Make sure that the `sudo` command is
-      available and well configured and, only then, execute the following command in order to
-      install the PostgreSQL server:
-
-      .. code-block:: console
-
-         $ sudo dnf install -y postgresql-server
-         $ sudo postgresql-setup --initdb --unit postgresql
-         $ sudo systemctl enable postgresql
-         $ sudo systemctl start postgresql
-
-.. warning::
-   `wkhtmltopdf` is not installed through **pip** and must be installed manually in version `0.12.5
-   <the wkhtmltopdf download page_>`_ for it to support headers and footers. See our `wiki
-   <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for more details on the various versions.
-
-Repository
-~~~~~~~~~~
-
-.. tabs::
-
-   .. group-tab:: Debian/Ubuntu
-
-      Odoo S.A. provides a repository that can be used with Debian and Ubuntu distributions. It can
-      be used to install *Odoo Community Edition* by executing the following commands **as root**:
-
-      .. code-block:: console
-
-          # wget -O - https://nightly.odoo.com/odoo.key | apt-key add -
-          # echo "deb http://nightly.odoo.com/15.0/nightly/deb/ ./" >> /etc/apt/sources.list.d/odoo.list
-          # apt-get update && apt-get install odoo
-
-      You can then use the usual `apt-get upgrade` command to keep your installation up-to-date.
-
-   .. group-tab:: Fedora
-
-      Odoo S.A. provides a repository that can be used with the Fedora distributions. It can be used
-      to install *Odoo Community Edition* by executing the following commands:
-
-      .. code-block:: console
-
-         $ sudo dnf config-manager --add-repo=https://nightly.odoo.com/15.0/nightly/rpm/odoo.repo
-         $ sudo dnf install -y odoo
-         $ sudo systemctl enable odoo
-         $ sudo systemctl start odoo
-
-.. note::
-   At this moment, there is no nightly repository for the Enterprise Edition.
-
-Distribution package
-~~~~~~~~~~~~~~~~~~~~
-
-.. tabs::
-
-   .. group-tab:: Debian/Ubuntu
-
-      Instead of using the repository as described above, the 'deb' packages for both the
-      *Community* and *Enterprise* editions can be downloaded from the `official download page
-      <download_>`_.
-
-      .. note::
-         Odoo 15.0 'deb' package currently supports `Debian 11 (Bullseye)`_, `Ubuntu 20.04 (Focal)`_
-         or above.
-
-      Next, execute the following commands **as root**:
-
-      .. code-block:: console
-
-         # dpkg -i <path_to_installation_package> # this probably fails with missing dependencies
-         # apt-get install -f # should install the missing dependencies
-         # dpkg -i <path_to_installation_package>
-
-      This will install Odoo as a service, create the necessary PostgreSQL_ user
-      and automatically start the server.
-
-      .. warning::
-         - The `python3-xlwt` Debian package does not exists in Debian Buster nor Ubuntu 18.04. This
-           python module is needed to export into xls format.
-
-           If you need the feature, you can install it manually with:
-
-           .. code-block:: console
-
-              $ sudo pip3 install xlwt
-
-         - The `num2words` python package does not exists in Debian Buster nor Ubuntu 18.04. Textual
-           amounts will not be rendered by Odoo and this could cause problems with the `l10n_mx_edi`
-           module.
-
-           If you need this feature, you can install manually with:
-
-           .. code-block:: console
-
-              $ sudo pip3 install num2words
-
-   .. group-tab:: Fedora
-
-      Instead of using the repository as described above, the 'rpm' packages for both the
-      *Community* and *Enterprise* editions can be downloaded from the `official download page
-      <download_>`_.
-
-      .. note::
-         Odoo 15.0 'rpm' package supports Fedora 34.
-
-      Once downloaded, the package can be installed using the 'dnf' package manager:
-
-      .. code-block:: console
-
-         $ sudo dnf localinstall odoo_15.0.latest.noarch.rpm
-         $ sudo systemctl enable odoo
-         $ sudo systemctl start odoo
-
-.. _setup/install/source:
-
-Source install
-==============
-
-The source "installation" is really about not installing Odoo, and running it directly from source
-instead.
-
-This can be more convenient for module developers as the Odoo source is more easily accessible
-than using packaged installation (for information or to build this documentation and have it
-available offline).
-
-It also makes starting and stopping Odoo more flexible and explicit than the services set up by the
-packaged installations, and allows overriding settings using
-:ref:`command-line parameters <reference/cmdline>` without needing to edit a configuration file.
-
-Finally it provides greater control over the system's set up, and allows to more easily keep
-(and run) multiple versions of Odoo side-by-side.
-
-Fetch the sources
------------------
-
-There are two ways to obtain the source code of Odoo: as a zip **archive** or through **git**.
-
-Archive
-~~~~~~~
-
-Community Edition:
-
-* `Official download page <download_>`_
-* `GitHub repository <community-repository_>`_
-* `Nightly server <nightly_>`_
-
-Enterprise Edition:
-
-* `Official download page <download_>`_
-* `GitHub repository <enterprise-repository_>`_
-
-.. _setup/install/source/git:
-
-Git
-~~~
-
-The following requires `Git <git_>`_ to be installed on your machine and that you have basic
-knowledge of Git commands. To clone a Git repository, you must choose between cloning with HTTPS or
-SSH. If you do not know the difference between the two, the best option is most likely HTTPS. If you
-are following the :doc:`Getting started </developer/howtos/rdtraining>` developer tutorial, or plan
-on contributing to Odoo source code, choose SSH.
-
-.. note::
-   **The Enterprise Git repository does not contain the full Odoo source code**. It is only a
-   collection of extra add-ons. The main server code is in the Community version. Running the
-   Enterprise version actually means running the server from the Community version with the
-   addons-path option set to the folder with the Enterprise version. You need to clone both the
-   Community and Enterprise repository to have a working Odoo Enterprise installation. See
-   :ref:`setup/install/editions` to get access to the Enterprise repository.
-
-.. tabs::
-
-   .. group-tab:: Windows
-
-      .. tabs::
-
-         .. tab:: Clone with HTTPS
-
-            .. code-block:: doscon
-
-               C:\> git clone https://github.com/odoo/odoo.git
-               C:\> git clone https://github.com/odoo/enterprise.git
-
-         .. tab:: Clone with SSH
-
-            .. code-block:: doscon
-
-               C:\> git clone git@github.com:odoo/odoo.git
-               C:\> git clone git@github.com:odoo/enterprise.git
-
-   .. group-tab:: Linux
-
-      .. tabs::
-
-         .. tab:: Clone with HTTPS
-
-            .. code-block:: console
-
-               $ git clone https://github.com/odoo/odoo.git
-               $ git clone https://github.com/odoo/enterprise.git
-
-         .. tab:: Clone with SSH
-
-            .. code-block:: console
-
-               $ git clone git@github.com:odoo/odoo.git
-               $ git clone git@github.com:odoo/enterprise.git
-
-   .. group-tab:: Mac OS
-
-      .. tabs::
-
-         .. tab:: Clone with HTTPS
-
-            .. code-block:: console
-
-               $ git clone https://github.com/odoo/odoo.git
-               $ git clone https://github.com/odoo/enterprise.git
-
-         .. tab:: Clone with SSH
-
-            .. code-block:: console
-
-               $ git clone git@github.com:odoo/odoo.git
-               $ git clone git@github.com:odoo/enterprise.git
-
-.. note::
-   **The Enterprise git repository does not contain the full Odoo source code**. It is only a
-   collection of extra add-ons. The main server code is in the Community version. Running the
-   Enterprise version actually means running the server from the Community version with the
-   addons-path option set to the folder with the Enterprise version. You need to clone both the
-   Community and Enterprise repository to have a working Odoo Enterprise installation.
-
-.. _setup/install/source/prepare:
-
-Prepare
--------
-
-Python
-~~~~~~
-
-.. tabs::
-
-   .. group-tab:: Windows
-
-      Odoo requires Python 3.7 or later to run. Visit `Python's download page <https://www.python.org/downloads/windows/>`_
-      to download and install the latest version of Python 3 on your machine.
-
-      During installation, check **Add Python 3 to PATH**, then click **Customize Installation** and make
-      sure that **pip** is checked.
-
-      .. note::
-         If Python 3 is already installed, make sure that the version is 3.7 or above, as previous
-         versions are not compatible with Odoo.
-
-         .. code-block:: doscon
-
-            C:\> python --version
-
-         Verify also that pip_ is installed for this version.
-
-         .. code-block:: doscon
-
-            C:\> pip --version
-
-   .. group-tab:: Linux
-
-      Odoo requires Python 3.7 or later to run. Use your package manager to download and install Python 3
-      on your machine if it is not already done.
-
-      .. note::
-         If Python 3 is already installed, make sure that the version is 3.7 or above, as previous
-         versions are not compatible with Odoo.
-
-         .. code-block:: console
-
-            $ python3 --version
-
-         Verify also that pip_ is installed for this version.
-
-         .. code-block:: console
-
-            $ pip3 --version
-
-   .. group-tab:: Mac OS
-
-      Odoo requires Python 3.7 or later to run. Use your preferred package manager (homebrew_, macports_)
-      to download and install Python 3 on your machine if it is not already done.
-
-      .. note::
-         If Python 3 is already installed, make sure that the version is 3.7 or above, as previous
-         versions are not compatible with Odoo.
-
-         .. code-block:: console
-
-            $ python3 --version
-
-         Verify also that pip_ is installed for this version.
-
-         .. code-block:: console
-
-            $ pip3 --version
-
-PostgreSQL
-~~~~~~~~~~
-
-.. tabs::
-
-   .. group-tab:: Windows
-
-      Odoo uses PostgreSQL as database management system. `Download and install PostgreSQL
-      <https://www.postgresql.org/download/windows/>`_ (supported version: 10.0 and later).
-
-      By default, the only user is `postgres` but Odoo forbids connecting as `postgres`, so you need
-      to create a new PostgreSQL user:
-
-      #. Add PostgreSQL's `bin` directory (by default:
-         :file:`C:\\Program Files\\PostgreSQL\\<version>\\bin`) to your `PATH`.
-      #. Create a postgres user with a password using the pg admin gui:
-
-         1. Open **pgAdmin**.
-         2. Double-click the server to create a connection.
-         3. Select :menuselection:`Object --> Create --> Login/Group Role`.
-         4. Enter the username in the **Role Name** field (e.g. `odoo`).
-         5. Open the **Definition** tab and enter the password (e.g. `odoo`), then click **Save**.
-         6. Open the **Privileges** tab and switch **Can login?** to `Yes` and **Create database?**
-            to `Yes`.
-
-   .. group-tab:: Linux
-
-      Odoo uses PostgreSQL as database management system. Use your package manager to download and
-      install PostgreSQL (supported version: 10.0 and later).
-
-      It can be achieved by executing the following:
-
-      .. code-block:: console
-
-          $ sudo apt install postgresql postgresql-client
-
-      By default, the only user is `postgres` but Odoo forbids connecting as `postgres`, so you need
-      to create a new PostgreSQL user:
-
-      .. code-block:: console
-
-        $ sudo -u postgres createuser -s $USER
-        $ createdb $USER
-
-      .. note::
-         Because your PostgreSQL user has the same name as your Unix login, you will be able to
-         connect to the database without password.
-
-   .. group-tab:: Mac OS
-
-      Odoo uses PostgreSQL as database management system. Use `postgres.app
-      <https://postgresapp.com>`_ to download and install PostgreSQL (supported version: 10.0 and
-      later).
-
-      .. tip::
-         To make the command line tools bundled with `postgres.app` available, make sure to setup your
-         `$PATH` variable by following the `Postgres.app CLI Tools Instructions
-         <https://postgresapp.com/documentation/cli-tools.html>`_.
-
-      By default, the only user is `postgres` but Odoo forbids connecting as `postgres`, so you need
-      to create a new PostgreSQL user:
-
-      .. code-block:: console
-
-        $ sudo -u postgres createuser -s $USER
-        $ createdb $USER
-
-      .. note::
-         Because your PostgreSQL user has the same name as your Unix login, you will be able to
-         connect to the database without password.
-
-.. _install/dependencies:
-
-Dependencies
-~~~~~~~~~~~~
-
-.. tabs::
-
-   .. group-tab:: Windows
-
-      Before installing the dependencies, you must download and install the `Build Tools for Visual
-      Studio <https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019>`_.
-      When prompted, select **C++ build tools** in the **Workloads** tab and install them.
-
-      Odoo dependencies are listed in the `requirements.txt` file located at the root of the Odoo
-      community directory.
-
-      .. tip::
-         It can be preferable to not mix python modules packages between different instances of Odoo
-         or with your system. You can use virtualenv_ to create isolated Python environments.
-
-      Navigate to the path of your Odoo Community installation (`CommunityPath`) and run **pip** on
-      the requirements file in a terminal **with Administrator privileges**:
-
-      .. code-block:: doscon
-
-          C:\> cd \CommunityPath
-          C:\> pip install setuptools wheel
-          C:\> pip install -r requirements.txt
-
-      For languages with right-to-left interface (such as Arabic or Hebrew), the package `rtlcss`
-      is needed:
-
-      #. Download and install `nodejs <https://nodejs.org/en/download/>`_.
-      #. Install `rtlcss`:
-
-         .. code-block:: doscon
-
-             C:\> npm install -g rtlcss
-
-      #. Edit the System Environment's variable `PATH` to add the folder where `rtlcss.cmd` is
-         located (typically: :file:`C:\\Users\\<user>\\AppData\\Roaming\\npm\\`).
-
-   .. group-tab:: Linux
-
-      Using your **distribution packages** is the preferred way of installing dependencies.
-      Alternatively, you can install the python dependencies with **pip**.
-
-      .. tabs::
-
-         .. tab:: Debian/Ubuntu
-
-            For Debian-based systems, the packages are listed in the `debian/control
-            <https://github.com/odoo/odoo/blob/master/debian/control>`_ file of the Odoo sources.
-
-            On Debian/Ubuntu, the following commands should install the required packages:
-
-            .. code-block:: console
-
-               $ cd /CommunityPath
-               $ sed -n -e '/^Depends:/,/^Pre/ s/ python3-\(.*\),/python3-\1/p' debian/control | sudo xargs apt-get install -y
-
-         .. tab:: Install with pip
-
-            As some of the python packages need a compilation step, they require system libraries to
-            be installed.
-
-            On Debian/Ubuntu-based systems, the following command should install these required
-            libraries:
-
-            .. code-block:: console
-
-               $ sudo apt install python3-pip libldap2-dev libpq-dev libsasl2-dev
-
-            Odoo dependencies are listed in the :file:`requirements.txt` file located at the root of
-            the Odoo community directory.
-
-            .. note::
-               | The python packages in :file:`requirements.txt` are based on their stable/LTS
-                 Debian/Ubuntu corresponding version at the moment of the Odoo release.
-               | E.g., for Odoo 15.0, the `python3-babel` package version is 2.8.0 in Debian
-                 Bullseye and 2.6.0 in Ubuntu Focal. The lowest version is then chosen in the
-                 :file:`requirements.txt`.
-
-            .. tip::
-               It can be preferable to not mix python modules packages between different instances
-               of Odoo or with your system. You can use virtualenv_ to create isolated Python
-               environments.
-
-            Navigate to the path of your Odoo Community installation (:file:`CommunityPath`) and run
-            **pip** on the requirements file to install the requirements for the current user.
-
-            .. code-block:: console
-
-               $ cd /CommunityPath
-               $ pip install -r requirements.txt
-
-      For languages with right-to-left interface (such as Arabic or Hebrew), the package `rtlcss` is
-      needed:
-
-      #. Download and install **nodejs** and **npm** with your package manager.
-      #. Install `rtlcss`:
-
-         .. code-block:: console
-
-            $ sudo npm install -g rtlcss
-
-   .. group-tab:: Mac OS
-
-      Odoo dependencies are listed in the `requirements.txt` file located at the root of the Odoo
-      community directory.
-
-      .. tip::
-         It can be preferable to not mix python modules packages between different instances of Odoo
-         or with your system. You can use virtualenv_ to create isolated Python environments.
-
-      Navigate to the path of your Odoo Community installation (`CommunityPath`) and run **pip** on
-      the requirements file:
-
-      .. code-block:: console
-
-         $ cd /CommunityPath
-         $ pip3 install setuptools wheel
-         $ pip3 install -r requirements.txt
-
-      .. warning::
-         Non-Python dependencies need to be installed with a package manager:
-
-         #. Download and install the **Command Line Tools**:
-
-            .. code-block:: console
-
-               $ xcode-select --install
-
-         #. Download and install the package manager of your choice (homebrew_, macports_).
-         #. Install non-python dependencies.
-
-      For languages with right-to-left interface (such as Arabic or Hebrew), the package `rtlcss` is
-      needed:
-
-      #. Download and install **nodejs** with your preferred package manager (homebrew_, macports_).
-      #. Install `rtlcss`:
-
-         .. code-block:: console
-
-             $ sudo npm install -g rtlcss
-
-.. important::
-   `wkhtmltopdf` is not installed through **pip** and must be installed manually in version `0.12.5
-   <the wkhtmltopdf download page_>`_ for it to support headers and footers. See our `wiki
-   <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for more details on the various versions.
-
-Running Odoo
-------------
-
-Once all dependencies are set up, Odoo can be launched by running `odoo-bin`, the
-command-line interface of the server. It is located at the root of the Odoo Community directory.
-
-To configure the server, you can either specify :ref:`command-line arguments
-<reference/cmdline/server>` or a :ref:`configuration file <reference/cmdline/config>`.
-
-.. tip::
-   For the Enterprise edition, you must add the path to the `enterprise` addons to the `addons-path`
-   argument. Note that it must come before the other paths in `addons-path` for addons to be loaded
-   correctly.
-
-Common necessary configurations are:
-
-- PostgreSQL user and password.
-- Custom addon paths beyond the defaults, to load your own modules.
-
-A typical way to run the server would be:
-
-.. tabs::
-
-   .. group-tab:: Windows
-
-      .. code-block:: doscon
-
-          C:\> cd CommunityPath/
-          C:\> python odoo-bin -r dbuser -w dbpassword --addons-path=addons -d mydb
-
-      Where `CommunityPath` is the path of the Odoo Community installation, `dbuser` is the
-      PostgreSQL login, `dbpassword` is the PostgreSQL password, and `mydb` is the name of the
-      PostgreSQL database.
-
-   .. group-tab:: Linux
-
-      .. code-block:: console
-
-          $ cd /CommunityPath
-          $ python3 odoo-bin --addons-path=addons -d mydb
-
-      Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
-      of the PostgreSQL database.
-
-   .. group-tab:: Mac OS
-
-      .. code-block:: console
-
-          $ cd /CommunityPath
-          $ python3 odoo-bin --addons-path=addons -d mydb
-
-      Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
-      of the PostgreSQL database.
-
-After the server has started (the INFO log `odoo.modules.loading: Modules loaded.` is printed), open
-http://localhost:8069 in your web browser and log in with the base administrator account: Use
-`admin` for the :guilabel:`Email` and, again, `admin` for the :guilabel:`Password`. That's it, you
-just logged into your own Odoo database!
-
-.. tip::
-   - From there, you can create and manage new :doc:`users
-     </applications/general/users/manage_users>`.
-   - The user account you use to log into Odoo's web interface differs from the :option:`--db_user
-     <odoo-bin -r>` CLI argument.
-
-.. seealso::
-   :doc:`The exhaustive list of CLI arguments for odoo-bin </developer/cli>`.
-
-.. _setup/install/docker:
-
-Docker
-======
-
-The full documentation on how to use Odoo with Docker can be found on the
-official Odoo `docker image <https://hub.docker.com/_/odoo/>`_ page.
-
-.. _Debian 11 (Bullseye): https://www.debian.org/releases/bullseye/
-.. _demo: https://demo.odoo.com
-.. _docker: https://www.docker.com
-.. _download: https://www.odoo.com/page/download
-.. _Ubuntu 20.04 (Focal): http://releases.ubuntu.com/20.04/
-.. _EPEL: https://fedoraproject.org/wiki/EPEL
-.. _PostgreSQL: http://www.postgresql.org
-.. _the official installer:
-.. _install pip:
-    https://pip.pypa.io/en/latest/installing.html#install-pip
-.. _Quilt: http://en.wikipedia.org/wiki/Quilt_(software)
-.. _saas: https://www.odoo.com/page/start
-.. _the wkhtmltopdf download page: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5
-.. _UAC: http://en.wikipedia.org/wiki/User_Account_Control
-.. _wkhtmltopdf: http://wkhtmltopdf.org
-.. _pip: https://pip.pypa.io
-.. _macports: https://www.macports.org
-.. _homebrew: http://brew.sh
-.. _wheels: https://wheel.readthedocs.org/en/latest/
-.. _virtualenv: https://pypi.python.org/pypi/virtualenv
-.. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
-.. _pywin32: http://sourceforge.net/projects/pywin32/files/pywin32/
-.. _community-repository: https://github.com/odoo/odoo
-.. _enterprise-repository: https://github.com/odoo/enterprise
-.. _Editions: https://www.odoo.com/pricing#pricing_table_features
-.. _nightly: https://nightly.odoo.com/
-.. _extra: https://nightly.odoo.com/extra/

content/administration/install/online.rst

@@ -0,0 +1,21 @@
+======
+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/install/packages.rst

@@ -0,0 +1,167 @@
+===================
+Packaged installers
+===================
+
+Odoo provides packaged installers for Debian-based Linux distributions (Debian, Ubuntu, etc.),
+RPM-based Linux distributions (Fedora, CentOS, RHEL, etc.), and Windows for the Community and
+Enterprise editions.
+
+Official **Community** nightly packages with all relevant dependency requirements are available on
+the `nightly server <https://nightly.odoo.com>`_.
+
+.. note::
+   Nightly packages may be difficult to keep up to date.
+
+Official **Community** and **Enterprise** packages can be downloaded from the `Odoo download page
+<https://www.odoo.com/page/download>`_.
+
+.. note::
+   It is required to be logged in as a paying on-premise customer or partner to download the
+   Enterprise packages.
+
+.. _install/packages/linux:
+
+Linux
+=====
+
+Prepare
+-------
+
+Odoo needs a `PostgreSQL <https://www.postgresql.org/>`_ server to run properly.
+
+.. tabs::
+
+   .. group-tab:: Debian/Ubuntu
+
+      The default configuration for the Odoo 'deb' package is to use the PostgreSQL server on the
+      same host as the Odoo instance. Execute the following command to install the PostgreSQL
+      server:
+
+      .. code-block:: console
+
+         $ sudo apt install postgresql -y
+
+   .. group-tab:: Fedora
+
+      Make sure that the `sudo` command is available and well configured and, only then, execute the
+      following command to install the PostgreSQL server:
+
+      .. code-block:: console
+
+         $ sudo dnf install -y postgresql-server
+         $ sudo postgresql-setup --initdb --unit postgresql
+         $ sudo systemctl enable postgresql
+         $ sudo systemctl start postgresql
+
+.. warning::
+   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.6
+   <https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3>`_ for it to support headers
+   and footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_
+   for more details on the various versions.
+
+Repository
+----------
+
+Odoo S.A. provides a repository that can be used to install the **Community** edition by executing
+the following commands:
+
+.. tabs::
+
+   .. group-tab:: Debian/Ubuntu
+
+      .. code-block:: console
+
+         $ wget -q -O - https://nightly.odoo.com/odoo.key | sudo gpg --dearmor -o /usr/share/keyrings/odoo-archive-keyring.gpg
+         $ echo 'deb [signed-by=/usr/share/keyrings/odoo-archive-keyring.gpg] https://nightly.odoo.com/{CURRENT_MAJOR_BRANCH}/nightly/deb/ ./' | sudo tee /etc/apt/sources.list.d/odoo.list
+         $ sudo apt-get update && sudo apt-get install odoo
+
+      Use the usual `apt-get upgrade` command to keep the installation up-to-date.
+
+   .. group-tab:: Fedora
+
+      .. code-block:: console
+
+         $ sudo dnf config-manager --add-repo=https://nightly.odoo.com/{CURRENT_MAJOR_BRANCH}/nightly/rpm/odoo.repo
+         $ sudo dnf install -y odoo
+         $ sudo systemctl enable odoo
+         $ sudo systemctl start odoo
+
+.. note::
+   Currently, there is no nightly repository for the Enterprise edition.
+
+Distribution package
+--------------------
+
+Instead of using the repository, packages for both the **Community** and **Enterprise** editions can
+be downloaded from the `Odoo download page <https://www.odoo.com/page/download>`_.
+
+.. tabs::
+
+   .. group-tab:: Debian/Ubuntu
+
+      .. note::
+         Odoo {CURRENT_MAJOR_VERSION} 'deb' package currently supports `Debian Buster
+         <https://www.debian.org/releases/buster/>`_ and `Ubuntu 18.04
+         <https://releases.ubuntu.com/18.04>`_ or above.
+
+      Once downloaded, execute the following commands **as root** to install Odoo as a service,
+      create the necessary PostgreSQL user, and automatically start the server:
+
+      .. code-block:: console
+
+         # dpkg -i <path_to_installation_package> # this probably fails with missing dependencies
+         # apt-get install -f # should install the missing dependencies
+         # dpkg -i <path_to_installation_package>
+
+      .. warning::
+         - The `python3-xlwt` Debian package, needed to export into the XLS format, does not exist
+           in Debian Buster nor Ubuntu 18.04. If needed, install it manually with the following:
+
+           .. code-block:: console
+
+              $ sudo pip3 install xlwt
+
+         - The `num2words` Python package - needed to render textual amounts - does not exist in
+           Debian Buster nor Ubuntu 18.04, which could cause problems with the `l10n_mx_edi` module.
+           If needed, install it manually with the following:
+
+           .. code-block:: console
+
+              $ sudo pip3 install num2words
+
+   .. group-tab:: Fedora
+
+      .. note::
+         Odoo {CURRENT_MAJOR_VERSION} 'rpm' package supports Fedora 36.
+
+      Once downloaded, the package can be installed using the 'dnf' package manager:
+
+      .. code-block:: console
+
+         $ sudo dnf localinstall odoo_{CURRENT_MAJOR_BRANCH}.latest.noarch.rpm
+         $ sudo systemctl enable odoo
+         $ sudo systemctl start odoo
+
+.. _install/packages/windows:
+
+Windows
+=======
+
+   .. warning::
+      Windows packaging is offered for the convenience of testing or running single-user local
+      instances but production deployment is discouraged due to a number of limitations and risks
+      associated with deploying Odoo on a Windows platform.
+
+#. Download the installer from the `nightly server <https://nightly.odoo.com>`_ (Community only) or
+   the Windows installer from the `Odoo download page <https://www.odoo.com/page/download>`_ (any
+   edition.
+#. Execute the downloaded file.
+
+   .. warning::
+      On Windows 8 and later, a warning titled *Windows protected your PC* may be displayed. Click
+      **More Info** and then **Run anyway** to proceed.
+
+#. Accept the `UAC <https://en.wikipedia.org/wiki/User_Account_Control>`_ prompt.
+#. Go through the installation steps.
+
+Odoo launches automatically at the end of the installation.

content/administration/install/source.rst

@@ -0,0 +1,487 @@
+======
+Source
+======
+
+The source 'installation' is not about installing Odoo but running it directly from the source
+instead.
+
+Using the Odoo source can be more convenient for module developers as it is more easily accessible
+than using packaged installers.
+
+It makes starting and stopping Odoo more flexible and explicit than the services set up by the
+packaged installers. Also, it allows overriding settings using :ref:`command-line parameters
+<reference/cmdline>` without needing to edit a configuration file.
+
+Finally, it provides greater control over the system's setup and allows to more easily keep (and
+run) multiple versions of Odoo side-by-side.
+
+Fetch the sources
+-----------------
+
+There are two ways to obtain the source code of Odoo: as a ZIP **archive** or through **Git**.
+
+Archive
+~~~~~~~
+
+Community edition:
+
+- `Odoo download page <https://www.odoo.com/page/download>`_
+- `GitHub Community repository <https://github.com/odoo/odoo>`_
+- `Nightly server <https://nightly.odoo.com>`_
+
+Enterprise edition:
+
+- `Odoo download page <https://www.odoo.com/page/download>`_
+- `GitHub Enterprise repository <https://github.com/odoo/enterprise>`_
+
+.. _install/source/git:
+
+Git
+~~~
+
+.. note::
+   It is required to have `Git <https://git-scm.com/>`_ installed, and it is recommended to have a
+   basic knowledge of Git commands to proceed.
+
+To clone a Git repository, choose between cloning with HTTPS or SSH. In most cases, the best option
+is HTTPS. However, choose SSH to contribute to Odoo source code or when following the :doc:`Getting
+Started developer tutorial </developer/tutorials/getting_started>`.
+
+.. tabs::
+
+   .. group-tab:: Linux
+
+      .. tabs::
+
+         .. tab:: Clone with HTTPS
+
+            .. code-block:: console
+
+               $ git clone https://github.com/odoo/odoo.git
+               $ git clone https://github.com/odoo/enterprise.git
+
+         .. tab:: Clone with SSH
+
+            .. code-block:: console
+
+               $ git clone git@github.com:odoo/odoo.git
+               $ git clone git@github.com:odoo/enterprise.git
+
+   .. group-tab:: Windows
+
+      .. tabs::
+
+         .. tab:: Clone with HTTPS
+
+            .. code-block:: doscon
+
+               C:\> git clone https://github.com/odoo/odoo.git
+               C:\> git clone https://github.com/odoo/enterprise.git
+
+         .. tab:: Clone with SSH
+
+            .. code-block:: doscon
+
+               C:\> git clone git@github.com:odoo/odoo.git
+               C:\> git clone git@github.com:odoo/enterprise.git
+
+   .. group-tab:: Mac OS
+
+      .. tabs::
+
+         .. tab:: Clone with HTTPS
+
+            .. code-block:: console
+
+               $ git clone https://github.com/odoo/odoo.git
+               $ git clone https://github.com/odoo/enterprise.git
+
+         .. tab:: Clone with SSH
+
+            .. code-block:: console
+
+               $ git clone git@github.com:odoo/odoo.git
+               $ git clone git@github.com:odoo/enterprise.git
+
+.. note::
+   **The Enterprise git repository does not contain the full Odoo source code**. It is only a
+   collection of extra add-ons. The main server code is in the Community edition. Running the
+   Enterprise version means running the server from the Community version with the `addons-path`
+   option set to the folder with the Enterprise edition. It is required to clone both the Community
+   and Enterprise repositories to have a working Odoo Enterprise installation.
+
+.. _install/source/prepare:
+
+Prepare
+-------
+
+Python
+~~~~~~
+
+Odoo requires **Python 3.10** or later to run.
+
+.. versionchanged:: 17
+    Minimum requirement updated from Python 3.7 to Python 3.10.
+
+
+.. tabs::
+
+   .. group-tab:: Linux
+
+      Use a package manager to download and install Python 3 if needed.
+
+   .. group-tab:: Windows
+
+      `Download the latest version of Python 3 <https://www.python.org/downloads/windows/>`_ and
+      install it.
+
+      During installation, check **Add Python 3 to PATH**, then click **Customize Installation** and
+      make sure that **pip** is checked.
+
+   .. group-tab:: Mac OS
+
+      Use a package manager (`Homebrew <https://brew.sh/>`_, `MacPorts <https://www.macports.org>`_)
+      to download and install Python 3 if needed.
+
+.. note::
+   If Python 3 is already installed, make sure that the version is 3.7 or above, as previous
+   versions are not compatible with Odoo.
+
+   .. tabs::
+
+      .. group-tab:: Linux
+
+         .. code-block:: console
+
+            $ python3 --version
+
+      .. group-tab:: Windows
+
+         .. code-block:: doscon
+
+            C:\> python --version
+
+      .. group-tab:: Mac OS
+
+         .. code-block:: console
+
+            $ python3 --version
+
+   Verify that `pip <https://pip.pypa.io>`_ is also installed for this version.
+
+   .. tabs::
+
+      .. group-tab:: Linux
+
+         .. code-block:: console
+
+            $ pip3 --version
+
+      .. group-tab:: Windows
+
+         .. code-block:: doscon
+
+            C:\> pip --version
+
+      .. group-tab:: Mac OS
+
+         .. code-block:: console
+
+            $ pip3 --version
+
+PostgreSQL
+~~~~~~~~~~
+
+Odoo uses PostgreSQL as its database management system.
+
+.. tabs::
+
+   .. group-tab:: Linux
+
+      Use a package manager to download and install PostgreSQL (supported versions: 12.0 or above).
+      It can be achieved by executing the following:
+
+      .. code-block:: console
+
+         $ sudo apt install postgresql postgresql-client
+
+   .. group-tab:: Windows
+
+      `Download PostgreSQL <https://www.postgresql.org/download/windows>`_ (supported versions: 12.0
+      or above) and install it.
+
+   .. group-tab:: Mac OS
+
+      Use `Postgres.app <https://postgresapp.com>`_ to download and install PostgreSQL (supported
+      version: 12.0 or above).
+
+      .. tip::
+         To make the command line tools bundled with Postgres.app available, make sure to set up the
+         `$PATH` variable by following the `Postgres.app CLI tools instructions
+         <https://postgresapp.com/documentation/cli-tools.html>`_.
+
+By default, the only user is `postgres`. As Odoo forbids connecting as `postgres`, create a new
+PostgreSQL user.
+
+.. tabs::
+
+   .. group-tab:: Linux
+
+      .. code-block:: console
+
+         $ sudo -u postgres createuser -d -R -S $USER
+         $ createdb $USER
+
+      .. note::
+         Because the PostgreSQL user has the same name as the Unix login, it is possible to connect
+         to the database without a password.
+
+   .. group-tab:: Windows
+
+      #. Add PostgreSQL's `bin` directory (by default:
+         :file:`C:\\Program Files\\PostgreSQL\\<version>\\bin`) to the `PATH`.
+      #. Create a postgres user with a password using the pg admin gui:
+
+         #. Open **pgAdmin**.
+         #. Double-click the server to create a connection.
+         #. Select :menuselection:`Object --> Create --> Login/Group Role`.
+         #. Enter the username in the **Role Name** field (e.g., `odoo`).
+         #. Open the **Definition** tab, enter a password (e.g., `odoo`), and click **Save**.
+         #. Open the **Privileges** tab and switch **Can login?** to `Yes` and **Create database?**
+            to `Yes`.
+
+   .. group-tab:: Mac OS
+
+      .. code-block:: console
+
+         $ sudo -u postgres createuser -d -R -S $USER
+         $ createdb $USER
+
+      .. note::
+         Because the PostgreSQL user has the same name as the Unix login, it is possible to connect
+         to the database without a password.
+
+.. _install/dependencies:
+
+Dependencies
+~~~~~~~~~~~~
+
+.. tabs::
+
+   .. group-tab:: Linux
+
+      Using **distribution packages** is the preferred way of installing dependencies.
+      Alternatively, install the Python dependencies with **pip**.
+
+      .. tabs::
+
+         .. tab:: Debian/Ubuntu
+
+            For Debian-based systems, the packages are listed in the `debian/control
+            <{GITHUB_PATH}/debian/control>`_ file of the Odoo sources.
+
+            On Debian/Ubuntu, the following commands should install the required packages:
+
+            .. code-block:: console
+
+               $ cd /CommunityPath
+               $ sed -n -e '/^Depends:/,/^Pre/ s/ python3-\(.*\),/python3-\1/p' debian/control | sudo xargs apt-get install -y
+
+         .. tab:: Install with pip
+
+            As some of the Python packages need a compilation step, they require system libraries to
+            be installed.
+
+            On Debian/Ubuntu, the following command should install these required libraries:
+
+            .. code-block:: console
+
+               $ sudo apt install python3-pip libldap2-dev libpq-dev libsasl2-dev
+
+            Odoo dependencies are listed in the :file:`requirements.txt` file located at the root of
+            the Odoo Community directory.
+
+            .. note::
+               The Python packages in :file:`requirements.txt` are based on their stable/LTS
+               Debian/Ubuntu corresponding version at the moment of the Odoo release. For example,
+               for Odoo 15.0, the `python3-babel` package version is 2.8.0 in Debian Bullseye and
+               2.6.0 in Ubuntu Focal. The lowest version is then chosen in the
+               :file:`requirements.txt`.
+
+            .. tip::
+               It can be preferable not to mix Python module packages between different instances of
+               Odoo or with the system. However, it is possible to use `virtualenv
+               <https://pypi.org/project/virtualenv/>`_ to create isolated Python environments.
+
+            Navigate to the path of the Odoo Community installation (:file:`CommunityPath`) and run
+            **pip** on the requirements file to install the requirements for the current user.
+
+            .. code-block:: console
+
+               $ cd /CommunityPath
+               $ pip install -r requirements.txt
+
+   .. group-tab:: Windows
+
+      Before installing the dependencies, download and install the `Build Tools for Visual
+      Studio <https://visualstudio.microsoft.com/downloads/>`_. Select **C++ build tools** in the
+      **Workloads** tab and install them when prompted.
+
+      Odoo dependencies are listed in the `requirements.txt` file located at the root of the Odoo
+      Community directory.
+
+         .. tip::
+            It can be preferable not to mix Python module packages between different instances of
+            Odoo or with the system. However, it is possible to use `virtualenv
+            <https://pypi.org/project/virtualenv/>`_ to create isolated Python environments.
+
+      Navigate to the path of the Odoo Community installation (`CommunityPath`) and run **pip** on
+      the requirements file in a terminal **with Administrator privileges**:
+
+      .. code-block:: doscon
+
+         C:\> cd \CommunityPath
+         C:\> pip install setuptools wheel
+         C:\> pip install -r requirements.txt
+
+   .. group-tab:: Mac OS
+
+      Odoo dependencies are listed in the `requirements.txt` file located at the root of the Odoo
+      Community directory.
+
+         .. tip::
+            It can be preferable not to mix Python module packages between different instances of
+            Odoo or with the system. However, it is possible to use `virtualenv
+            <https://pypi.org/project/virtualenv/>`_ to create isolated Python environments.
+
+      Navigate to the path of the Odoo Community installation (`CommunityPath`) and run **pip** on
+      the requirements file:
+
+      .. code-block:: console
+
+         $ cd /CommunityPath
+         $ pip3 install setuptools wheel
+         $ pip3 install -r requirements.txt
+
+      .. warning::
+         Non-Python dependencies must be installed with a package manager (`Homebrew
+         <https://brew.sh/>`_, `MacPorts <https://www.macports.org>`_).
+
+         #. Download and install the **Command Line Tools**:
+
+            .. code-block:: console
+
+               $ xcode-select --install
+
+         #. Use the package manager to install non-Python dependencies.
+
+.. note::
+   For languages using a **right-to-left interface** (such as Arabic or Hebrew), the `rtlcss`
+   package is required.
+
+   .. tabs::
+
+      .. group-tab:: Linux
+
+         #. Download and install **nodejs** and **npm** with a package manager.
+         #. Install `rtlcss`:
+
+            .. code-block:: console
+
+               $ sudo npm install -g rtlcss
+
+      .. group-tab:: Windows
+
+         #. Download and install `nodejs <https://nodejs.org/en/download>`_.
+         #. Install `rtlcss`:
+
+            .. code-block:: doscon
+
+               C:\> npm install -g rtlcss
+
+         #. Edit the system environment's variable `PATH` to add the folder where `rtlcss.cmd` is
+            located (typically: :file:`C:\\Users\\<user>\\AppData\\Roaming\\npm\\`).
+
+      .. group-tab:: Mac OS
+
+         #. Download and install **nodejs** with a package manager (`Homebrew <https://brew.sh/>`_,
+            `MacPorts <https://www.macports.org>`_).
+         #. Install `rtlcss`:
+
+            .. code-block:: console
+
+               $ sudo npm install -g rtlcss
+
+.. warning::
+   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.6
+   <https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3>`_ for it to support headers
+   and footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_
+   for more details on the various versions.
+
+.. _install/source/running_odoo:
+
+Running Odoo
+------------
+
+Once all dependencies are set up, Odoo can be launched by running `odoo-bin`, the command-line
+interface of the server. It is located at the root of the Odoo Community directory.
+
+To configure the server, either specify :ref:`command-line arguments <reference/cmdline/server>` or
+a :ref:`configuration file <reference/cmdline/config>`.
+
+.. tip::
+   For the Enterprise edition, add the path to the `enterprise` add-ons to the `addons-path`
+   argument. Note that it must come before the other paths in `addons-path` for add-ons to be loaded
+   correctly.
+
+Common necessary configurations are:
+
+- PostgreSQL user and password.
+- Custom addon paths beyond the defaults to load custom modules.
+
+A typical way to run the server would be:
+
+.. tabs::
+
+   .. group-tab:: Linux
+
+      .. code-block:: console
+
+         $ cd /CommunityPath
+         $ python3 odoo-bin --addons-path=addons -d mydb
+
+      Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
+      of the PostgreSQL database.
+
+   .. group-tab:: Windows
+
+      .. code-block:: doscon
+
+         C:\> cd CommunityPath/
+         C:\> python odoo-bin -r dbuser -w dbpassword --addons-path=addons -d mydb
+
+      Where `CommunityPath` is the path of the Odoo Community installation, `dbuser` is the
+      PostgreSQL login, `dbpassword` is the PostgreSQL password, and `mydb` is the name of the
+      PostgreSQL database.
+
+   .. group-tab:: Mac OS
+
+      .. code-block:: console
+
+         $ cd /CommunityPath
+         $ python3 odoo-bin --addons-path=addons -d mydb
+
+      Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
+      of the PostgreSQL database.
+
+After the server has started (the INFO log `odoo.modules.loading: Modules loaded.` is printed), open
+http://localhost:8069 in a web browser and log into the Odoo database with the base administrator
+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>`.
+   - The user account used to log into Odoo's web interface differs from the :option:`--db_user
+     <odoo-bin -r>` CLI argument.
+
+.. seealso::
+   :doc:`The list of CLI arguments for odoo-bin </developer/reference/cli>`

content/administration/maintain.rst

@@ -7,10 +7,13 @@ Maintain
 .. toctree::
 
     maintain/domain_names
+    maintain/azure_oauth
     maintain/google_oauth
+    maintain/mailjet_api
     maintain/update
     maintain/enterprise
     maintain/hosting_changes
-    maintain/online
+    maintain/odoo_online
     maintain/on_premise
+    maintain/neutralized_database
     maintain/supported_versions

content/administration/maintain/azure_oauth.rst

@@ -0,0 +1,293 @@
+=======================================================
+Connect Microsoft Outlook 365 to Odoo using Azure OAuth
+=======================================================
+
+Odoo is compatible with Microsoft's Azure OAuth for Microsoft 365. In order to send and receive
+secure emails from a custom domain, all that is required is to configure a few settings on the
+Azure platform and on the back end of the Odoo database. This configuration works with either a
+personal email address or an address created by a custom domain.
+
+.. seealso::
+   `Microsoft Learn: Register an application with the Microsoft identity platform
+   <https://learn.microsoft.com/azure/active-directory/develop/quickstart-register-app>`_
+
+.. seealso::
+   - :doc:`/applications/general/auth/azure`
+   - :doc:`/applications/productivity/calendar/outlook`
+
+Setup in Microsoft Azure Portal
+===============================
+
+Create a new application
+------------------------
+
+To get started, go to `Microsoft's Azure Portal <https://portal.azure.com/>`_. Log in with the
+:guilabel:`Microsoft Outlook Office 365` account if there is one, otherwise log in with the
+personal :guilabel:`Microsoft account`. A user with administrative access to the Azure Settings
+will need to connect and perform the following configuration. Next, navigate to the section
+labeled :guilabel:`Manage Microsoft Entra ID` (formally *Azure Active Directory*).
+
+Now, click on :guilabel:`Add (+)`, located in the top menu, and then select :guilabel:`App
+registration`. On the :guilabel:`Register an application` screen, rename the :guilabel:`Name` to
+`Odoo` or something recognizable. Under the :guilabel:`Supported account types` section select
+:guilabel:`Accounts in any organizational directory (Any Microsoft Entra ID directory - Multitenant)
+and personal Microsoft accounts (e.g. Skype, Xbox)`.
+
+Under the :guilabel:`Redirect URL` section, select :guilabel:`Web` as the platform, and then input
+`https://<odoo base url>/microsoft_outlook/confirm` in the :guilabel:`URL` field. The Odoo base URL
+is the canonical domain at which your Odoo instance can be reached in the URL field.
+
+.. example::
+   *mydatabase.odoo.com*, where *mydatabase* is the actual prefix of the database's subdomain,
+   assuming it's hosted on Odoo.com
+
+After the URL has been added to the field, :guilabel:`Register` the application so it is created.
+
+API permissions
+---------------
+
+The :guilabel:`API permissions` should be set next. Odoo will need specific API permissions to be
+able to read (IMAP) and send (SMTP) emails in the Microsoft 365 setup. First, click the
+:guilabel:`API permissions` link, located in the left menu bar. Next, click on the :guilabel:`(+)
+Add a Permission` button and select :guilabel:`Microsoft Graph` under :guilabel:`Commonly Used
+Microsoft APIs`. After, select the :guilabel:`Delegated Permissions` option.
+
+In the search bar, search for the following :guilabel:`Delegated permissions` and click
+:guilabel:`Add permissions` for each one:
+
+- :guilabel:`SMTP.Send`
+- :guilabel:`IMAP.AccessAsUser.All`
+
+.. note::
+   The :guilabel:`User.Read` permission will be added by default.
+
+.. image:: azure_oauth/permissions.png
+   :align: center
+   :alt: API permissions needed for Odoo integration are listed under the Microsoft Graph.
+
+Assign users and groups
+=======================
+
+After adding the API permissions, navigate back to the :guilabel:`Overview` of the
+:guilabel:`Application` in the top of the left sidebar menu.
+
+Now, add users to this application. Under the :guilabel:`Essentials` overview table, click on the
+link labeled :guilabel:`Managed Application in Local Directory`, or the last option on the bottom
+right-hand side of the table.
+
+.. image:: azure_oauth/managed-application.png
+   :align: center
+   :alt: Add users/groups by clicking the Managed application in local directory link for the
+         created application.
+
+In the left sidebar menu, select :guilabel:`Users and Groups`. Next, click on :guilabel:`(+) Add
+User/Group`. Depending on the account, either a :guilabel:`Group` and a :guilabel:`User` can be
+added, or only :guilabel:`Users`. Personal accounts will only allow for :guilabel:`Users` to be
+added.
+
+Under :guilabel:`Users` or :guilabel:`Groups`, click on :guilabel:`None Selected` and add the users
+or group of users that will be sending emails from the :guilabel:`Microsoft account` in Odoo.
+:guilabel:`Add` the users/groups, click :guilabel:`Select`, and then :guilabel:`Assign` them to the
+application.
+
+Create credentials
+------------------
+
+Now that the Microsoft Azure app is set up, credentials need to be created for the Odoo setup.
+These include the :guilabel:`Client ID` and :guilabel:`Client Secret`. To start, the
+:guilabel:`Client ID` can be copied from the :guilabel:`Overview` page of the app. The
+:guilabel:`Client ID` or :guilabel:`Application ID` is located under the :guilabel:`Display Name`
+in the :guilabel:`Essentials` overview of the app.
+
+.. image:: azure_oauth/application-id.png
+   :align: center
+   :alt: Application/Client ID located in the Overview of the app.
+
+Next, the :guilabel:`Client Secret Value` needs to be retrieved. To get this value, click on
+:guilabel:`Certificates & Secrets` in the left sidebar menu. Then, a :guilabel:`Client Secret`
+needs to be produced. In order to do this, click on the :guilabel:`(+) New Client Secret` button.
+
+A window on the right will populate with a button labeled :guilabel:`Add a client secret`. Under
+:guilabel:`Description`, type in `Odoo Fetchmail` or something recognizable, and then set the
+:guilabel:`expiration date`.
+
+.. important::
+   A new :guilabel:`Client Secret` will need to be produced and configured if the first one
+   expires. In this event, there could be an interruption of service, so the expiration date should
+   be noted and set to the furthest possible date.
+
+Next, click on :guilabel:`Add` when these two values are entered. A :guilabel:`Client Secret Value`
+and :guilabel:`Secret ID` will be created. It is important to copy the :guilabel:`Value` or
+:guilabel:`Client Secret Value` into a notepad as it will become encrypted after leaving this page.
+The :guilabel:`Secret ID` is not needed.
+
+.. image:: azure_oauth/secretvalue.png
+   :align: center
+   :alt: Client Secret Value or Value in the app's credentials.
+
+After these steps, the following items should be ready to be set up in Odoo:
+
+- A client ID (:guilabel:`Client ID` or :guilabel:`Application ID`)
+- A client secret (:guilabel:`Value` or :guilabel:`Client Secret Value`)
+
+This completes the setup on the :guilabel:`Microsoft Azure Portal` side.
+
+Setup in Odoo
+=============
+
+Enter Microsoft Outlook credentials
+-----------------------------------
+
+First, open the Odoo database and navigate to the :guilabel:`Apps` module. Then, remove the
+:guilabel:`Apps` filter from the search bar and type in `Outlook`. After that, install the module
+called :guilabel:`Microsoft Outlook`.
+
+Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss`
+section, ensure that the checkbox for :guilabel:`Custom Email Servers` is checked. This populates
+a new option for :guilabel:`Outlook Credentials`.
+
+:guilabel:`Save` the progress.
+
+Then, copy and paste the :guilabel:`Client ID` (Application ID) and :guilabel:`Client Secret
+(Client Secret Value)` into the respective fields and :guilabel:`Save` the settings.
+
+.. image:: azure_oauth/outlookcreds.png
+   :align: center
+   :alt: Outlook Credentials in Odoo General Settings.
+
+Configure outgoing email server
+-------------------------------
+
+On the :guilabel:`General Settings` page, under the :guilabel:`Custom Email Servers` setting,
+click the :guilabel:`Outgoing Email Servers` link to configure the Microsoft account.
+
+Then, create a new email server and check the box for :guilabel:`Outlook`. Next, fill in the
+:guilabel:`Name` (it can be anything) and the Microsoft Outlook email :guilabel:`Username`.
+
+If the :guilabel:`From Filter` field is empty, enter either a :ref:`domain or email address
+<email_communication/default>`.
+
+Then, click on :guilabel:`Connect your Outlook account`.
+
+A new window from Microsoft opens to complete the :guilabel:`authorization process`. Select the
+appropriate email address that is being configured in Odoo.
+
+.. image:: azure_oauth/verify-outlook.png
+   :align: center
+   :alt: Permission page to grant access between newly created app and Odoo.
+
+Then, allow Odoo to access the Microsoft account by clicking on :guilabel:`Yes`. After this, the
+page will navigate back to the newly configured :guilabel:`Outgoing Mail Server` in Odoo. The
+configuration automatically loads the :guilabel:`token` in Odoo, and a tag stating
+:guilabel:`Outlook Token Valid` appears in green.
+
+.. image:: azure_oauth/outlook-token.png
+   :align: center
+   :alt: Valid Outlook Token indicator.
+
+Finally, click :guilabel:`Test Connection`. A confirmation message should appear. The Odoo database
+can now send safe, secure emails through Microsoft Outlook using OAuth authentication.
+
+.. _azure_oauth/notifications:
+
+Configuration with a single outgoing mail server
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Configuring a single outgoing server is the simplest configuration available for Microsoft Azure
+and it doesn't require extensive access rights for the users in the database.
+
+A generic email address would be used to send emails for all users within the database. For example
+it could be structured with a `notifications` alias (`notifications@example.com`) or `contact` alias
+(`contact@example.com`). This address must be set as the :guilabel:`FROM Filtering` on the server.
+This address must also match the `{mail.default.from}@{mail.catchall.domain}` key combination in the
+system parameters.
+
+.. seealso::
+   For more information on the from filter visit: :ref:`email_communication/default`.
+
+.. note::
+   The :guilabel:`System Parameters` can be accessed by activating :ref:`developer-mode` in the
+   :menuselection:`Settings --> Technical --> Parameters --> System Parameters` menu.
+
+When using this configuration, every email that is sent from the database will use the address of
+the configured `notification` mailbox. However it should be noted that the name of the sender will
+appear but their email address will change:
+
+.. image:: azure_oauth/from-name-remain.png
+   :align: center
+   :alt: Name from real sender with static email.
+
+.. example::
+   Single outgoing mail server configuration:
+
+   - Outgoing mail server **username** (login) = `notifications@example.com`
+   - Outgoing mail server :guilabel:`FROM Filtering` = `notifications@example.com`
+   - `mail.catchall.domain` in system parameters = `example.com`
+   - `mail.default.from` in system parameters = `notifications`
+
+User-specific (multiple user) configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In addition to a generic email server, individual email servers can be set up for users in a
+database. These email addresses must be set as the :guilabel:`FROM Filtering` on each individual
+server for this configuration to work.
+
+This configuration is the more difficult of the two Microsoft Azure configurations, in that it
+requires all users configured with email servers to have access rights to settings in order to
+establish a connection to the email server.
+
+Setup
+*****
+
+Each user should have a separate email server set up. The :guilabel:`FROM Filtering` should be set
+so that only the user's email is sent from that server. In other words, only a user with an email
+address that matches the set :guilabel:`FROM Filtering` is able to use this server.
+
+.. seealso::
+   For more information on the from filter visit: :ref:`email_communication/default`.
+
+A :ref:`fallback server <azure_oauth/notifications>` must be setup to allow for the sending of
+:guilabel:`notifications`. The :guilabel:`FROM Filtering` for this server should have the value of
+the `{mail.default.from}@{mail.catchall.domain}`.
+
+.. note::
+   The :guilabel:`System Parameters` can be accessed by activating :ref:`developer-mode` in the
+   :menuselection:`Settings --> Technical --> Parameters --> System Parameters` menu.
+
+.. important::
+   The configuration for this transactional email server can work alongside an outgoing mass-mailing
+   email server. The :guilabel:`FROM Filtering` for the mass-mailing email server can remain empty,
+   but it's require to be added in the settings of the *Email Marketing* application.
+
+   .. seealso::
+      For more information on setting the mass-mailing email server visit
+      :ref:`email_communication/mass_mails`.
+
+.. example::
+   Multiple user outgoing mail server configuration:
+
+   - User #1 mailbox
+      - Outgoing mail server #1 **username** (login) = `john@example.com`
+      - Outgoing mail server #1 :guilabel:`FROM Filtering` = `john@example.com`
+   - User #2 mailbox
+      - Outgoing mail server #2 **username** (login) = `jane@example.com`
+      - Outgoing mail server #2 :guilabel:`FROM Filtering` = `jane@example.com`
+   - Notifications mailbox
+      - Outgoing mail server #3 **username** (login) = `notifications@example.com`
+      - Outgoing mail server #3 :guilabel:`FROM Filtering` = `notifications@example.com`
+   - System Parameters
+      - `mail.catchall.domain` in system parameters = `example.com`
+      - `mail.default.from` in system parameters = `notifications`
+
+Configure incoming email server
+-------------------------------
+
+The incoming account should be configured in a similar way to the outgoing email account. Navigate
+to the :guilabel:`Incoming Mail Servers` in the :guilabel:`Technical Menu` and :guilabel:`Create` a
+new configuration. Check or Select the button next to :guilabel:`Outlook Oauth Authentication` and
+enter the :guilabel:`Microsoft Outlook username`.  Click on :guilabel:`Connect your Outlook
+account`. Odoo will state: :guilabel:`Outlook Token Valid` Now :guilabel:`Test and Confirm` the
+account. The account should be ready to receive email to the Odoo database.
+
+.. seealso::
+   :doc:`../../applications/general/email_communication/email_servers`

content/administration/maintain/domain_names.rst

@@ -2,263 +2,255 @@
 Domain names
 ============
 
-A **domain name** works as an address for your website. It makes the Internet much more accessible
-as it allows users to type a meaningful web address, such as ``www.odoo.com``, rather than its
-server's IP address with a series of numbers.
+Domain names are text-based addresses identifying online locations, such as websites. They provide a
+more memorable and recognizable way for people to navigate the internet than numerical IP addresses.
 
-You can use a custom domain name to access your Odoo database and websites:
+**Odoo Online** and **Odoo.sh** databases use a **subdomain** of the `odoo.com` **domain** by
+default (e.g., `mycompany.odoo.com`).
 
-- By :ref:`registering a free domain name with Odoo <domain-name/odoo-register>` (for Odoo Online
-  databases)
-- By :ref:`configuring a custom domain that you already own <domain-name/existing>`.
-
-.. note::
-   Odoo Online and Odoo.sh databases, including their websites, use by default a subdomain of
-   ``odoo.com`` for both the URL and the emails (e.g., ``https://example.odoo.com``).
-
-.. important::
-   Odoo offers a :ref:`free custom domain name <domain-name/odoo-register>` to all Odoo Online 
-   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``.
+However, you can use a custom domain name instead by :ref:`registering a free domain name
+<domain-name/register>` (only available for Odoo Online databases) or by :ref:`configuring a
+domain name you already own <domain-name/existing>`.
 
 .. 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>`_
+   `Odoo Tutorials: Register a free domain name [video]
+   <https://www.odoo.com/slides/slide/register-a-free-domain-name-1663>`_
 
-.. _domain-name/about:
-
-About domain names
-==================
-
-Having a **good domain name** is as important to your branding as the name of your business or
-organization as it is the first thing your visitors will notice. We recommend you keep them *simple,
-short, easy to remember and spell*.
-
-A **subdomain** is a domain that is a part of another domain. It often refers to the additional part
-that comes before the main domain name. Traditionally, most websites use the ``www.`` subdomain,
-but any string of letters can be used as well. You can use subdomains to direct your visitors to
-other websites than your main website or to specific pages (e.g., ``experience.odoo.com`` points to
-a specific page.)
-
-All domain names are referenced in the **Domain Name System**, or **DNS**, which works as a giant
-directory for the Internet. There are many DNS servers, so any modification to the DNS can take up
-to 72 hours to propagate worldwide on all servers.
-
-.. _domain-name/odoo-register:
+.. _domain-name/register:
 
 Register a free domain name with Odoo
 =====================================
 
-You can register a domain name for your Odoo Online database directly from Odoo Website or your
-database manager.
+To register a one-year free domain name for your Odoo Online database, sign in to your account and
+go to the `database manager <https://www.odoo.com/my/databases>`_. Click the gear icon
+(:guilabel:`⚙️`) next to the database name and select :guilabel:`Domain Names`.
+
+.. image:: domain_names/domain-names.png
+   :alt: Accessing a database's domain names configuration
+
+Search for the desired domain name and check its availability.
+
+.. image:: domain_names/domain-search.png
+   :alt: Searching for an available domain name
+
+.. tip::
+   Ensure the Website app is installed if the domain name registration option does not appear.
+
+Select the desired domain name, fill in the :guilabel:`Domain Owner` form, and click
+:guilabel:`Register`. The chosen domain name is directly linked to the database, but you still need
+to :ref:`map your domain name to your Odoo website <domain-name/db-map>`.
+
+.. image:: domain_names/domain-owner.png
+   :alt: Filling in the domain owner information
 
 .. important::
-   - Your domain name is **free for one year** if you register it with Odoo!
-   - The domain name is registered with `Gandi <https://www.gandi.net/>`_, the domain name
-     registrar.
-   - You are the owner of the domain name and can use it for other purposes.
-   - Odoo manages payment and technical support for you.
-   - This offer doesn't include any mailbox. However, you can :ref:`configure your MX records
-     <domain-name/odoo-manage>` to use your own email server or solution such as Google Workspace.
+   A verification email from `noreply@domainnameverification.net` will be sent to the email address
+   provided in the :guilabel:`Domain Owner` form. It is essential to verify your email address to
+   keep the domain active and receive the renewal quote before expiration.
 
-To do so, go to :menuselection:`Website --> Go to website --> Promote --> Domain Name`.
-Alternatively, open your `database manager <https://www.odoo.com/my/databases>`_, click on the
-:guilabel:`settings` button next to your database, then on :guilabel:`Domain names`.
-
-.. image:: domain_names/register-promote.png
-   :align: center
-   :alt: Clicking on Domain Names from an Odoo website
-
-Search for the domain name of your choice to check its availability, then select the one you want to
-register for your website.
-
-.. image:: domain_names/register-search.png
-   :align: center
-   :alt: The search of the domain name example.com shows which associated domains are available.
-
-Next, fill in the form with your information to become the domain name owner.
-
-Your domain name is directly linked to your database, but you still have to :ref:`map your domain
-name with your website <domain-name/website-map>`.
+The domain name registration is free for the first year. After this period, Odoo will continue to
+manage the domain in partnership with **Gandi.net**, the domain name registrar, and you will be
+charged `Gandi.net's renewal rate <https://www.gandi.net/en/domain>`_. Odoo sends a renewal
+quotation every year to the email address mentioned in the :guilabel:`Domain Owner` form several
+weeks before the expiration date of the domain. The domain is renewed automatically when the
+quotation is confirmed.
 
 .. note::
-   - Free domain names are also available for free Odoo Online databases (if you installed one app
-     only, for example). In this case, Odoo reviews your request and your website to avoid abuse.
-     This process may take up to three days.
-   - This is not available for Odoo.sh databases yet.
+   - The offer is only available for **Odoo Online** databases.
+   - The offer is limited to **one** domain name per client.
+   - The offer is limited to the registration of a **new** domain name.
+   - The offer is available to *One App Free* plans. Ensure that your website contains enough
+     original content for Odoo to verify that your request is legitimate and respects `Odoo's
+     Acceptable Use Policy <https://www.odoo.com/acceptable-use>`_. Given the high number of
+     requests, it can take Odoo several days to review them.
 
-.. _domain-name/odoo-manage:
+.. _domain-name/register-dns:
 
-Manage your domain name registered with Odoo
---------------------------------------------
+DNS records
+-----------
 
-To manage the DNS records of your domain name registered with Odoo or to visualize the contacts
-associated with it, open your `database manager <https://www.odoo.com/my/databases>`_, click on the
-:guilabel:`settings` button next to your database, on :guilabel:`Domain names`, and then on
-:guilabel:`Contacts` or :guilabel:`DNS`.
+To manage your free domain name :abbr:`DNS (domain name system)` records, open the `database manager
+<https://www.odoo.com/my/databases>`_, click the gear icon (:guilabel:`⚙️`) next to the database
+name, select :guilabel:`Domain Names`, and click :guilabel:`DNS`.
 
-.. image:: domain_names/manage.png
-   :align: center
-   :alt: Management of the domain names linked to an Odoo database
+- :guilabel:`A`: the A record holds the IP address of the domain. It is automatically created and
+  **cannot** be edited or deleted.
+- :guilabel:`CNAME`: CNAME records forward one domain or subdomain to another domain. One is
+  automatically created to map the `www.` subdomain to the database. If the database is renamed, the
+  CNAME record **must** also be renamed.
+- :guilabel:`MX`: MX records instruct servers on where to deliver emails.
+- :guilabel:`TXT`: TXT records can be used for different purposes (e.g., to verify domain name
+  ownership).
+
+Any modification to the DNS records can take up to **72 hours** to propagate worldwide on all
+servers.
 
 .. note::
-   Please `submit a support ticket <https://www.odoo.com/help>`_ if you need further assistance to
-   manage your domain name.
+   `Submit a support ticket <https://www.odoo.com/help>`_ if you need assistance to manage your
+   domain name.
+
+Mailbox
+-------
+
+The one-year free domain name offer does **not** include a mailbox. There are two options to link
+your domain name with a mailbox.
+
+Use a subdomain
+~~~~~~~~~~~~~~~
+
+You can create a subdomain (e.g., `subdomain.yourdomain.com`) to use as an alias domain for the
+database. It allows users to create records in the database from emails received on their
+`email@subdomain.yourdomain.com` alias.
+
+To do so, open the `database manager <https://www.odoo.com/my/databases>`_, click the gear icon
+(:guilabel:`⚙️`) next to the database name, and go to :menuselection:`Domain Names --> DNS --> Add
+DNS record --> CNAME`. Next, enter the desired subdomain in the :guilabel:`Name` field (e.g.,
+`subdomain`), the original database domain with a period at the end (e.g., `mycompany.odoo.com.`) in
+the :guilabel:`Content` field, and click :guilabel:`Add record`.
+
+Then, add the alias domain as your *own domain* by clicking :guilabel:`Use my own domain`, entering
+the alias domain (e.g., `subdomain.yourdomain.com`), clicking :guilabel:`Verify`, and then
+:guilabel:`I confirm, it's done`.
+
+Finally, go to your database and open the :guilabel:`Settings`. Under the :guilabel:`Alias Domain`
+field, enter the alias domain (e.g., `subdomain.yourdomain.com`), click :guilabel:`Create`, and then
+:guilabel:`Save`.
+
+Use an external email provider
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To use an external email provider, you should configure an MX record. To do so, open the `database
+manager <https://www.odoo.com/my/databases>`_, click the gear icon (:guilabel:`⚙️`) next to the
+database name, click :menuselection:`Domain Names --> DNS --> Add DNS record --> MX`. The values you
+should enter for the :guilabel:`Name`, :guilabel:`Content`, and :guilabel:`Priority` fields depend
+on the external email provider.
+
+.. seealso::
+   - `Google Workspace: MX record values <https://support.google.com/a/answer/174125?hl=en>`_
+   - `Outlook and Exchange Online: Add an MX record for email <https://learn.microsoft.com/en-us/microsoft-365/admin/get-help-with-domains/create-dns-records-at-any-dns-hosting-provider?view=o365-worldwide#add-an-mx-record-for-email-outlook-exchange-online>`_
 
 .. _domain-name/existing:
 
-Configure your existing domain name
-===================================
+Configure an existing domain name
+=================================
 
-If you already own a domain name, you can use it to point to your website.
+If you already have a domain name, you can use it for your Odoo website.
 
-To avoid any issue with the :ref:`SSL certificate validation <domain-name/ssl>`, we highly recommend
-that you proceed with the following actions in this order:
+.. warning::
+   It is strongly recommended to follow **in order** these three steps to avoid any :ref:`SSL
+   certificate validation <domain-name/ssl>` issues:
 
-#. :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>`.
+   #. :ref:`Add a CNAME record <domain-name/cname>`
+   #. :ref:`Map your domain name to your Odoo database <domain-name/db-map>`
+   #. :ref:`Map your domain name to your Odoo website <domain-name/website-map>`
 
 .. _domain-name/cname:
 
 Add a CNAME record
 ------------------
 
-A **CNAME record** is a type of DNS record that points to the IP address of another website rather
-than to directly to an IP address.
-
-You need a CNAME record that points to your Odoo database. The requirements are detailed in your
-database manager.
+Creating a CNAME record to forward your domain name to the address of your Odoo database is
+required.
 
 .. tabs::
 
    .. group-tab:: Odoo Online
 
-      The target address is the current address of your database, as defined at its creation (e.g.,
-      ``example.odoo.com``)
+      The CNAME record's target address should be your database's address as defined at its creation
+      (e.g., `mycompany.odoo.com`).
 
    .. group-tab:: Odoo.sh
 
-      Your project's main address is defined in :menuselection:`Settings --> Project Name`.
+      The CNAME record's target address can be the project's main address, which can be found on
+      Odoo.sh by going to :menuselection:`Settings --> Project Name`, or a specific branch
+      (production, staging or development) by going to :menuselection:`Branches --> select the
+      branch --> Settings --> Custom domains`, and clicking :guilabel:`How to set up my domain?`. A
+      message indicates which address your CNAME record should target.
 
-      If you want to target a specific branch (production, staging or development), go to
-      :menuselection:`Branches --> select your branch --> Settings --> Custom domains`, and click on
-      :guilabel:`How to set up my domain?`. A message indicates which address your CNAME record
-      should target.
+The specific instructions depend on your DNS hosting service.
 
-#. Open your domain name's manager dashboard.
-#. Open the **DNS zone** management page for the domain name you want to configure.
-#. Create a **CNAME record** pointing to the address of your database.
+.. seealso::
+   - `GoDaddy: Add a CNAME record <https://www.godaddy.com/help/add-a-cname-record-19236>`_
+   - `Namecheap: How to create a CNAME record for your domain <https://www.namecheap.com/support/knowledgebase/article.aspx/9646/2237/how-to-create-a-cname-record-for-your-domain>`_
+   - `OVHcloud: Add a new DNS record <https://docs.ovh.com/us/en/domains/web_hosting_how_to_edit_my_dns_zone/#add-a-new-dns-record>`_
+   - `Cloudflare: Manage DNS records
+     <https://support.cloudflare.com/hc/en-us/articles/360019093151>`_
 
-While Odoo suggests creating a CNAME record for your ``www.`` subdomain (``www.example.com``, you
-can of course use any domain name of your choice, with any subdomain (e.g.,
-``anything.example.com``).
+Creating a CNAME record to map the `www` subdomain (`www.yourdomain.com`) as some visitors are used
+to typing `www.` before entering a domain name.
 
 .. example::
-   You own the domain name ``example.com``, and you have an Odoo Online database at the address
-   ``example.odoo.com``. You want to access your Odoo database primarily with the domain
-   ``www.example.com`` but also with the :ref:`naked domain <domain-name/naked-domain>`
-   ``example.com``.
+   You own the domain name `yourdomain.com`, and your Odoo Online database's address is
+   `mycompany.odoo.com`. You want to access your Odoo database primarily with the domain
+   `www.yourdomain.com` but also with the naked domain :dfn:`(a domain name without any subdomains
+   or prefixes)` `yourdomain.com`.
 
-   To do so, you create a CNAME record for the ``www`` subdomain, with ``example.odoo.com`` as the
-   target. The DNS zone manager generates the following rule and adds it to your DNS zone: ``www IN
-   CNAME example.odoo.com.``
-
-   You also create a redirection from ``example.com`` to ``wwww.example.com``.
-
-   Your new DNS records are propagated to all DNS servers.
-
-.. note::
-   Here are some specific guidelines to create a CNAME record:
-
-   - `GoDaddy <https://www.godaddy.com/help/add-a-cname-record-19236>`_
-   - `Namecheap <https://www.namecheap.com/support/knowledgebase/article.aspx/9646/2237/how-to-create-a-cname-record-for-your-domain>`_
-   - `OVH <https://docs.ovh.com/us/en/domains/web_hosting_how_to_edit_my_dns_zone/#add-a-new-dns-record>`_
-   - `CloudFlare <https://support.cloudflare.com/hc/en-us/articles/360019093151>`_
-   - `Google Domains <https://support.google.com/domains/answer/3290350?hl=en>`_
-
-.. _domain-name/naked-domain:
-
-Naked domain
-~~~~~~~~~~~~
-
-A **naked domain** is a domain name that doesn't have any subdomain at the beginning of the address
-(e.g., ``odoo.com`` instead of ``www.odoo.com``).
-
-You may want your naked domain to redirect to your website as some visitors may not type the full
-domain name to access your website.
-
-#. Open your domain name's manager dashboard.
-#. Create a **redirection** from the naked domain (``example.com``) to your main domain name
-   (``www.example.com``).
-
-.. note::
-   Depending on your domain name registrar, this redirection may be already pre-configured.
+   To do so, create a CNAME record for the `www` subdomain, with `mycompany.odoo.com` as the
+   target. Next, create a redirect (301 permanent or visible redirect) to redirect visitors from
+   `yourdomain.com` to `wwww.yourdomain.com`.
 
 .. _domain-name/db-map:
 
-Map your domain name with your Odoo database
---------------------------------------------
+Map a domain name to an Odoo database
+-------------------------------------
+
+.. warning::
+   Ensure you have :ref:`added a CNAME record <domain-name/cname>` to your domain name's DNS
+   **before** mapping your domain name to your Odoo database.
+
+   Failing to do so may prevent the validation of the :ref:`SSL certificate <domain-name/ssl>` and
+   could result in a *certificate name mismatch* error. Web browsers often display this as a
+   warning, such as *"Your connection is not private"*.
+
+   If you encounter this error after mapping the domain name to your database, wait up to five
+   days, as the validation may still happen. If not, you can `submit a support ticket
+   <https://www.odoo.com/help>`_, including screenshots of your CNAME records.
 
 .. tabs::
 
    .. group-tab:: Odoo Online
 
-      Open your `database manager <https://www.odoo.com/my/databases>`_, click on the
-      :guilabel:`settings` button next to your database, on :guilabel:`Domain names`, and then on
-      :guilabel:`Use my own domain` at the bottom of the right column.
+      Open the `database manager <https://www.odoo.com/my/databases>`_, click the gear icon
+      (:guilabel:`⚙️`) next to the database name, and go to :menuselection:`Domain Names --> Use my
+      own domain`. Then, enter the domain name (e.g., `yourdomain.com`), click :guilabel:`Verify`
+      and :guilabel:`I confirm, it's done`.
 
-      Type the domain name you want to add to this database, then click on :guilabel:`Verify` to
-      check if the CNAME record is correctly configured. Once done, click on :guilabel:`I confirm,
-      it's done`.
-
-      .. image:: domain_names/online-map.png
-         :align: center
-         :alt: Verification of the CNAME records of a domain name before mapping it with a database
+      .. image:: domain_names/map-database-online.png
+         :alt: Mapping a domain name to an Odoo Online database
 
    .. group-tab:: Odoo.sh
 
-      Go to :menuselection:`Branches --> select your branch --> Settings --> Custom domains`, type
-      the domain name you want to add to this database, then click on :guilabel:`Add domain`.
+      On Odoo.sh, go to :menuselection:`Branches --> select your branch --> Settings --> Custom
+      domains`, type the domain name to add, then click :guilabel:`Add domain`.
 
-      .. image:: domain_names/odoo-sh-map.png
-         :align: center
-         :alt: Mapping a domain name with an Odoo.sh branch
+      .. image:: domain_names/map-database-sh.png
+         :alt: Mapping a domain name to an Odoo.sh branch
 
       .. seealso::
-         - :ref:`Odoo.sh branches: settings tab <odoosh-gettingstarted-branches-tabs-settings>`
-
-.. warning::
-   Make sure to :ref:`add a CNAME record <domain-name/cname>` to your domain name's DNS **before**
-   mapping your domain name with your Odoo database.
-
-   Failing to do so may impede the validation of the :ref:`SSL certificate <domain-name/ssl>` and
-   would result in a *certificate name mismatch* error. This is often displayed by web browsers as a
-   warning such as *"Your connection is not private"*.
-
-   If this is the case and you have added the domain name to your database's settings less than five
-   days ago, wait 24 hours as the validation may still happen. Otherwise, please `submit a support
-   ticket <https://www.odoo.com/help>`_ including screenshots of your CNAME records.
+         :ref:`Odoo.sh branches: settings tab <odoosh-gettingstarted-branches-tabs-settings>`
 
 .. _domain-name/ssl:
 
 SSL encryption (HTTPS protocol)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-**SSL encryption** is an encryption-based Internet security protocol. It allows your visitors to
-navigate your website through a secure connection, which appears as an ``https://`` protocol at the
-beginning of your web address, rather than a non-secure ``http://`` protocol.
+**SSL encryption** allows visitors to navigate a website through a secure connection, which appears
+as the *https://* protocol at the beginning of a web address rather than the non-secure *http://*
+protocol.
 
-Odoo generates a separate SSL certificate for each domain :ref:`mapped in the database manager
-<domain-name/db-map>`, using integration with `Let's Encrypt Certificate Authority and ACME protocol
+Odoo generates a separate SSL certificate for each domain :ref:`mapped to a database
+<domain-name/db-map>` using `Let's Encrypt's certificate authority and ACME protocol
 <https://letsencrypt.org/how-it-works/>`_.
 
 .. note::
-   - The certificate generation may take up to 24h.
-   - Several attempts to validate your certificate are made during the five days following the
-     moment you add your domain name in your database's settings.
-   - If you already use another service, you can keep using it or simply change for Odoo.
+   - Certificate generation may take up to 24 hours.
+   - Several attempts to validate your certificate are made for five days after you map your domain
+     name to your database.
+   - If you use another service, you can keep using it or change to Odoo's.
+
+.. important::
+   No SSL certificate is generated for naked domains :dfn:`(domain names without any subdomains
+   or prefixes)`.
 
 .. _domain-name/web-base-url:
 
@@ -266,71 +258,57 @@ Web base URL of a database
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. note::
-   If you have Odoo Website, you can disregard this part and directly :ref:`map your domain name
-   with your website <domain-name/website-map>`.
+   If the Website app is installed on your database, skip this section and continue from the
+   :ref:`Map a domain name to a website <domain-name/website-map>` section.
 
-The **web base URL** of a database, or **root URL** affects your main website address and all the
+The *web base URL* or root URL of a database affects your main website address and all the
 links sent to your customers (e.g., quotations, portal links, etc.).
 
-To configure it, access your Odoo database with your custom address, then log in as an administrator
-of your database (any user in the *Settings* group) from the login screen.
+To make your custom domain name the *web base URL* of your database, access your database using your
+custom domain name and log in as an administrator :dfn:`(a user part of the Settings access right
+group under Administration)`.
 
 .. warning::
-   Connecting to your database with the original Odoo subdomain address (e.g., ``example.odoo.com``
-   also updates the web base URL of your database. See below to prevent these automatic updates.
-
-Alternatively, you can do it manually. To do so, activate the :ref:`developer mode
-<developer-mode>`, then go to :menuselection:`Settings --> Technical --> System Parameters`.
-
-Find the key called ``web.base.url`` (or create it if it does not exist) and enter the full address
-of your website as value, such as ``https://www.example.com``.
+   If you access your database with the original Odoo address (e.g., `mycompany.odoo.com`), the *web
+   base URL* of your database will be updated accordingly. To prevent the automatic update of the
+   *web base URL* when an administrator logs in to the database, activate the :ref:`developer mode
+   <developer-mode>`, go to :menuselection:`Settings --> Technical --> System Parameters --> New`,
+   and enter `web.base.url.freeze` as the :guilabel:`Key` and `True` as the :guilabel:`Value`.
 
 .. note::
-   The URL must include the protocol ``https://`` (or ``http://``) and must not end with a slash
-   (``/``).
-
-To prevent the automatic update of the web base URL when an administrator logs in the database, you
-can create the following System Parameter:
-
-- key: ``web.base.url.freeze``
-- value: ``True``
+   You can also set the web base URL manually. To do so, activate the :ref:`developer mode
+   <developer-mode>`, go to :menuselection:`Settings --> Technical --> System Parameters`, and
+   search for the `web.base.url` key (create it if necessary) and enter the full address of your
+   website as the value (e.g., `https://www.yourdomain.com`). The URL must include the protocol
+   `https://` (or `http://`) and *not* end with a slash (`/`).
 
 .. _domain-name/website-map:
 
-Map your domain name with your website
-======================================
+Map a domain name to an Odoo website
+------------------------------------
 
-Mapping your domain name to your website isn't the same as mapping it with your database:
+Mapping your domain name to your website is different than mapping it to your database:
 
 - It defines your domain name as the main one for your website, helping search engines to index your
-  website properly.
-- It defines your domain name as the base URL for your database, including the portal links sent by
+  website correctly.
+- It defines your domain name as the base URL for your database, including portal links sent by
   email to your customers.
-- If you have multiple websites, it maps your domain name with the appropriate website.
+- If you have multiple websites, it maps your domain name to the appropriate website.
 
-Go to :menuselection:`Website --> Configuration --> Settings --> Website Info`. If you have multiple
-websites, select the one you want to configure.
-
-In the :guilabel:`Domain` field, fill in the web address of your website (e.g.,
-``https://www.example.com``) and click on :guilabel:`Save`.
-
-.. image:: domain_names/website-settings.png
-   :align: center
-   :alt: Configuring https://www.example.com as the Domain of the website
+Go to :menuselection:`Website --> Configuration --> Settings`. If you have multiple websites, select
+the one you want to configure. In the :guilabel:`Domain` field, enter the address of your website
+(e.g., `https://www.yourdomain.com`) and :guilabel:`Save`.
 
 .. warning::
-   Mapping your domain name with your Odoo website prevents Google from indexing both your custom
-   domain name ``www.example.com`` and your original odoo database address ``example.odoo.com``.
+   Mapping your domain name to your Odoo website prevents Google Search from indexing your original
+   database address (e.g., `mycompany.odoo.com`).
 
-   If both addresses are already indexed, it may take some time before Google removes the indexation
-   of the second address. You may also try using the `Google Search Console
-   <https://search.google.com/search-console/welcome>`_ to fix this.
+   If both addresses are already indexed, it may take some time before the indexation of the second
+   address is removed from Google Search. You can use the `Google Search Console
+   <https://search.google.com/search-console/welcome>`_ to fix the issue.
 
 .. note::
-   If you have multiple websites and companies on your database, make sure that you select the
-   right :guilabel:`Company` in the website settings, next to the :guilabel:`Domain` settings. Doing
-   so indicates Odoo which URL to use as the :ref:`base URL <domain-name/web-base-url>` according to
+   If you have multiple websites and companies on your database, make sure to select the right
+   :guilabel:`Company` under :menuselection:`Website --> Configuration --> Settings`. Doing so
+   indicates Odoo which URL to use as the :ref:`base URL <domain-name/web-base-url>` according to
    the company in use.
-
-.. seealso::
-  - :doc:`/applications/general/email_communication/email_servers`

content/administration/maintain/enterprise.rst

@@ -1,9 +1,9 @@
 
 .. _setup/enterprise:
 
-===============================
-Upgrade Community to Enterprise
-===============================
+===================================
+Switch from Community to Enterprise
+===================================
 
 Depending on your current installation, there are multiple ways to upgrade
 your community version.
@@ -41,7 +41,7 @@ On Linux, using an installer
   .. code-block:: console
 
     $ sudo dpkg -i <path_to_enterprise_deb>
-  
+
 * Update your database to the enterprise packages using
 
   .. code-block:: console
@@ -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 :ref:`setup/install/source`)
+* Update the ``--addons-path`` parameter of your launch command (see :doc:`../install/source`)
 * Install the web_enterprise module by using
 
   .. code-block:: console
@@ -98,7 +98,7 @@ On Windows
 
   .. code-block:: console
 
-    $ odoo.exe -d <database_name> -i web_enterprise --stop-after-init
+    $ ..\python\python.exe odoo-bin -d <database_name> -i web_enterprise --stop-after-init
 
 * No need to manually launch the server, the service is running.
   You should be able to connect to your Odoo Enterprise instance using your usual

content/administration/maintain/google_oauth.rst

@@ -11,70 +11,97 @@ email address or an address created by a custom domain.
    For more information, visit `Google's documentation
    <https://support.google.com/cloud/answer/6158849>`_ on setting up OAuth.
 
+.. seealso::
+   - :doc:`/applications/general/auth/google`
+   - :doc:`/applications/productivity/calendar/google`
+
 Setup in Google
 ===============
 
 Create a new project
 --------------------
 
-To get started, go to the `Google API Platform
-<https://console.cloud.google.com/apis/credentials/consent>`_. Log in with your *Google Workspace*
-account if you have one, otherwise log in with your personal Gmail account (this should match the
-email address you want to configure in Odoo).
+To get started, go to the `Google API Console <https://console.developers.google.com>`_. Log in
+with your *Google Workspace* account if you have one, otherwise log in with your personal Gmail
+account (this should match the email address you want to configure in Odoo).
 
-After that, click on :guilabel:`Create Project`, located on the far right of the OAuth consent
-screen. If a project has already been created in this account, then the :guilabel:`New Project`
-option will be located on the top left under the :guilabel:`Select a project` drop-down menu.
+After that, click on :guilabel:`Create Project`, located on the far right of the :guilabel:`OAuth
+consent screen`. If a project has already been created in this account, then the :guilabel:`New
+Project` option will be located on the top right under the :guilabel:`Select a project` drop-down
+menu.
 
-On the :guilabel:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and browse for
-the :guilabel:`Location`. Set the :guilabel:`Location` as the `Google Workspace` organization. If
-you are using a personal Gmail account, then leave the :guilabel:`Location` as `No Organization`.
+On the :menuselection:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and
+browse for the :guilabel:`Location`. Set the :guilabel:`Location` as the *Google Workspace
+organization*. If you are using a personal Gmail account, then leave the :guilabel:`Location` as
+:guilabel:`No Organization`.
 
 .. image:: google_oauth/new-project.png
    :align: center
-   :alt: Project Name and Location for Google Oauth.
+   :alt: Project Name and Location for Google OAuth.
 
-Click on :guilabel:`Create` to finish this step. On the next screen, :guilabel:`User Type` options,
-select the :guilabel:`External` option, and then click on :guilabel:`Create` again, which will
-finally navigate to the :guilabel:`Edit app registration` page.
+Click on :guilabel:`Create` to finish this step.
+
+OAuth consent screen
+--------------------
+
+If the page doesn't redirect to the :menuselection:`User Type` options, click on :guilabel:`OAuth
+consent screen` in the left menu.
+
+Under :guilabel:`User Type` options, select the appropriate :guilabel:`User Type`, and then click on
+:guilabel:`Create` again, which will finally navigate to the :menuselection:`Edit app registration`
+page.
+
+.. warning::
+   *Personal* Gmail Accounts are only allowed to be **External** User Type, which means Google may
+   require an approval, or for *Scopes* to be added on. However, using a *Google WorkSpace* account
+   allows for **Internal** User Type to be used.
+
+   Note, as well, that while the API connection is in the *External* testing mode, then no approval is
+   necessary from Google. User limits in this testing mode is set to 100 users.
 
 Edit app registration
 ---------------------
 
-- On the :guilabel:`Oauth consent screen` step, under the :guilabel:`App information` section,
-  enter `Odoo` in the :guilabel:`App name` field. Select the organization's email address under the
-  :guilabel:`User support` email field.
-- Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain`
-  and enter `odoo.com`.
-- After that, under the :guilabel:`Developer contact information` section, enter the organization's
-  email address. Google uses this email address to notify the organization about any changes to
-  your project.
-- Next, click on the :guilabel:`Save and Continue` button.
-- Then, skip the :guilabel:`Scopes` page by scrolling to the bottom and clicking on
-  :guilabel:`Save and Continue`.
-- Next, add the email being configured under the :guilabel:`Test users` step by clicking on
-  :guilabel:`Add Users` and then the :guilabel:`Save and Continue` button. A summary of the
-  :guilabel:`App registration` appears.
-- Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard`.
+Next we will configure the app registration of the project.
+
+On the :guilabel:`OAuth consent screen` step, under the :guilabel:`App information` section, enter
+`Odoo` in the :guilabel:`App name` field. Select the organization's email address under the
+:guilabel:`User support` email field.
+
+Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain` and
+enter `odoo.com`.
+
+After that, under the :guilabel:`Developer contact information` section, enter the organization's
+email address. Google uses this email address to notify the organization about any changes to your
+project.
+
+Next, click on the :guilabel:`Save and Continue` button. Then, skip the :menuselection:`Scopes` page
+by scrolling to the bottom and clicking on :guilabel:`Save and Continue`.
+
+If continuing in testing mode (External), add the email addresses being configured under the
+:guilabel:`Test users` step, by clicking on :guilabel:`Add Users`, and then the :guilabel:`Save and
+Continue` button. A summary of the app registration appears.
+
+Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard` to finish setting up the
+project.
 
 Create Credentials
 ------------------
 
-Now that you have set up the project, you need to create credentials, which includes the
-:guilabel:`Client ID` and :guilabel:`Client Secret`. First, click on :guilabel:`Credentials` in the
-left sidebar menu.
+Now that the project is set up, credentials should be created, which includes the *Client ID* and
+*Client Secret*. First, click on :guilabel:`Credentials` in the left sidebar menu.
 
-Then, click on :guilabel:`Create Credentials` in the top menu and select
-:guilabel:`OAuth client ID` from the dropdown menu.
+Then, click on :guilabel:`Create Credentials` in the top menu and select :guilabel:`OAuth client ID`
+from the dropdown menu.
 
 - Under :guilabel:`Application Type`, select :guilabel:`Web Application` from the dropdown menu.
-- In the :guilabel:`Client ID` field, enter `Odoo`.
+- In the :guilabel:`Name` field, enter `Odoo`.
 - Under the :guilabel:`Authorized redirect URIs` label, click the button :guilabel:`ADD URI`, and
-  then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field. Be
-  sure to replace the *yourdbname* part of the URL with your actual Odoo database name.
-- Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and
-  :guilabel:`Client Secret`. Finally, copy each generated value for later use when configuring in
-  Odoo, and then navigate to the Odoo database.
+  then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field.
+  Be sure to replace the *yourdbname* part of the URL with the actual Odoo database name.
+- Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and :guilabel:`Client
+  Secret`. Finally, copy each generated value for later use when configuring in Odoo, and then
+  navigate to the Odoo database.
 
 .. image:: google_oauth/client-credentials.png
    :align: center
@@ -87,32 +114,37 @@ Enter Google Credentials
 ------------------------
 
 First, open Odoo and navigate to the :guilabel:`Apps` module. Then, remove the :guilabel:`Apps`
-filter from the search bar and type in `Google`. Install the module called :guilabel:`Google Gmail`.
+filter from the search bar and type in `Google`. Install the module called :guilabel:`Google
+Gmail`.
 
 Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss`
-section, ensure that the checkbox for :guilabel:`Custom Email Servers` is checked. This populates a
-new option for :guilabel:`Gmail Credentials`. Then, copy and paste the :guilabel:`Client ID` and
-:guilabel:`Client Secret` into the respective fields and :guilabel:`Save` the settings.
+section, ensure that the checkbox for :guilabel:`Custom Email Servers` or :guilabel:`External Email
+Servers` is checked. This populates a new option for :guilabel:`Gmail Credentials` or :guilabel:`Use
+a Gmail Sever`. Then, copy and paste the respective values into the :guilabel:`Client ID` and
+:guilabel:`Client Secret` fields and :guilabel:`Save` the settings.
 
 Configure outgoing email server
 -------------------------------
 
-After that, on the :guilabel:`General Settings` page, under :guilabel:`Custom Email Servers`, click
-:guilabel:`Outgoing Email Servers` to configure the external Gmail account.
+To configure the external Gmail account, return to the top of the :guilabel:`Custom Email Servers`
+setting and then click the :guilabel:`Outgoing Email Servers` link.
 
 .. image:: google_oauth/outgoing-servers.png
    :align: center
    :alt: Configure Outgoing Email Servers in Odoo.
 
-Then, :guilabel:`Create` a new email server and select the option for :guilabel:`Gmail`. Next, fill
-in the :guilabel:`Description` (can be anything) and the email :guilabel:`Username` and click on
-:guilabel:`Connect your Gmail account`.
+Then, click on :guilabel:`New` or :guilabel:`Create` to create a new email server, and fill in the
+:guilabel:`Name`, :guilabel:`Description`, and the email :guilabel:`Username` (if required).
 
-A new window from :guilabel:`Google` opens to complete the authorization process. Select the
+Next, click on :guilabel:`Gmail OAuth Authentication` or :guilabel:`Gmail` (under the
+:guilabel:`Authenticate with` or :guilabel:`Connection` section). Finally, click on
+:guilabel:`Connect your Gmail Account`.
+
+A new window labeled :guilabel:`Google` opens to complete the authorization process. Select the
 appropriate email address that is being configured in Odoo.
 
-If the email address is a personal account, an extra step pops up, click :guilabel:`Continue` to
-allow the verification and connect the Gmail account to Odoo.
+If the email address is a personal account, then an extra step pops up, so click
+:guilabel:`Continue` to allow the verification and connect the Gmail account to Odoo.
 
 Then, allow Odoo to access the Google account by clicking on :guilabel:`Continue` or
 :guilabel:`Allow`. After that, the page navigates back to the newly configured outgoing email
@@ -123,9 +155,8 @@ server in Odoo. The configuration automatically loads the token in Odoo, and a t
    :align: center
    :alt: Configure Outgoing Email Servers in Odoo.
 
-Finally, save the settings and :guilabel:`Test the Connection`. A confirmation message should 
-appear. The Odoo database can now send safe, secure emails through Google using OAuth
-authentication.
+Finally, :guilabel:`Test the Connection`. A confirmation message should appear. The Odoo database
+can now send safe, secure emails through Google using OAuth authentication.
 
 Google OAuth FAQ
 ================
@@ -133,8 +164,8 @@ Google OAuth FAQ
 Production VS Testing Publishing Status
 ---------------------------------------
 
-Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of Testing) will
-display the following warning message:
+Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of
+:guilabel:`Testing`) will display the following warning message:
 
 .. image:: google_oauth/published-status.png
    :align: center
@@ -154,39 +185,35 @@ populate.
    :align: center
    :alt: 403 Access Denied Error.
 
-To correct this error, return to the :guilabel:`OAuth consent screen` under
-:guilabel:`APIs & Services` and add test user(s) to the app. Add the email that you are configuring
-in Odoo.
+To correct this error, return to the :guilabel:`OAuth consent screen` under :guilabel:`APIs &
+Services` and add test user(s) to the app. Add the email that you are configuring in Odoo.
 
 Gmail Module not updated
 ------------------------
 
-If the :guilabel:`Gmail Module` in Odoo has not been updated to the latest version, then a
+If the *Google Gmail* module in Odoo has not been updated to the latest version, then a
 :guilabel:`Forbidden` error message populates.
 
 .. image:: google_oauth/forbidden-error.png
    :align: center
    :alt: Forbidden you don't have the permission to access the requested resource.
 
-To correct this error, go to the :guilabel:`Apps` module and clear out the search terms. Then,
-search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click on
-the three dots on the upper right of the module and select :guilabel:`Upgrade`.
+To correct this error, go to the :menuselection:`Apps` module and clear out the search terms. Then,
+search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click
+on the three dots on the upper right of the module and select :guilabel:`Upgrade`.
 
 Application Type
 ----------------
 
-When creating the :guilabel:`Credentials` (OAuth Client ID and Client Secret), if
-:guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an
-:guilabel:`Authorization Error` appears.
+When creating the credentials (OAuth *Client ID* and *Client Secret*), if :guilabel:`Desktop App` is
+selected for the :guilabel:`Application Type`, an :guilabel:`Authorization Error` appears.
 
 .. image:: google_oauth/error-400.png
    :align: center
    :alt: Error 400 Redirect URI Mismatch.
 
 To correct this error, delete the credentials already created and create new credentials, selecting
-:guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under
-:guilabel:`Authorized redirect URIs`, click :guilabel:`ADD URI` and type:
-`https://yourdbname.odoo.com/google_gmail/confirm` in the field.
-
-.. note::
-   Replace *yourdbname* in the URL with the Odoo database name.
+:guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under :guilabel:`Authorized
+redirect URIs`, click :guilabel:`ADD URI` and type:
+`https://yourdbname.odoo.com/google_gmail/confirm` in the field, being sure to replace *yourdbname*
+in the URL with the Odoo database name.

content/administration/maintain/hosting_changes.rst

@@ -1,88 +1,111 @@
-
-.. _db_management/hosting_changes:
-
 =======================
 Change hosting solution
 =======================
 
-You may want to move your Odoo database from one hosting solution to another.
-Depending on the platforms, you have to do it by yourself or contact our support team first.
+The instructions to change the hosting type of a database depend on the current solution used and to
+which solution the database should be moved.
 
-From on-premises to Odoo Online
-===============================
+Transferring an on-premise database
+===================================
 
-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.**
-4. `Create a support ticket <https://www.odoo.com/help>`_ and attach the dump (if the file is too large, use any file transfer service and attach the link to your ticket). Also include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com).
-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!
+To Odoo Online
+--------------
 
 .. 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>`.
+   - Odoo Online is *not* compatible with **non-standard apps**.
+   - The database's current version must be :doc:`supported <supported_versions>`.
 
-From on-premises to Odoo.sh
-===========================
+#. Create a :ref:`duplicate <duplicate_premise>` of the database.
+#. In this duplicate, uninstall all **non-standard apps**.
+#. Use the database manager to grab a *dump with filestore*.
+#. `Submit a support ticket <https://www.odoo.com/help>`_ including the following:
 
-1. Follow the :ref:`Import your database section of the Odoo.sh documentation <odoo_sh_import_your_database>`.
-2. ...and voilà!
+   - your **subscription number**,
+   - the **URL** you want to use for the database (e.g., `company.odoo.com`), and
+   - the **dump** as an attachment or as a link to the file (required for 60 MB+ files).
 
-From Odoo Online to on-premises
-===============================
-
-1. Log into `your Odoo Online user portal <https://accounts.odoo.com/my/databases/manage>`_ and look for the version number of your database.
-2. If your database does not run a :ref:`major version <supported_versions>` of Odoo, you cannot host it on-premises yet, you have to upgrade it first to a new major version. (*e.g.: If your database runs Odoo 12.3 which is not a major version, you have to upgrade it first to Odoo 13.0 or 14.0.*)
-3. Download a backup of your database by clicking on the "Gear" icon next to your database name then :menuselection:`Download` (if the download fails due to your backup file being too large, contact `our support <https://www.odoo.com/help>`_)
-4. Restore it from the database manager on your local server.
-
-From Odoo Online to Odoo.sh
-===========================
-
-1. Log into `your Odoo Online user portal <https://accounts.odoo.com/my/databases/manage>`_ and look for the version number of your database.
-2. If your database does not run a :ref:`major version <supported_versions>` of Odoo, you cannot host it on Odoo.sh yet, you have to upgrade it first to a new major version. (*e.g.: If your database runs Odoo 12.3 which is not a major version, you have to upgrade it first to Odoo 13.0 or 14.0.*)
-3. Download a backup of your database by clicking on the "Gear" icon next to your database name then :menuselection:`Download` (if the download fails due to your backup file being too large, contact `our support <https://www.odoo.com/help>`_)
-4. Follow the :ref:`Import your database section of the Odoo.sh documentation <odoo_sh_import_your_database>`.
-
-From Odoo.sh to Odoo Online
-===========================
-
-#. Uninstall all the **non-standard apps**.
-#. `Create a support ticket <https://www.odoo.com/help>`_ and include the following:
-
-   - Your subscription number
-   - The URL you want to use for your database (e.g., `example.odoo.com`)
-   - Which branch 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.
+#. Odoo then makes sure the database is compatible before putting it online. In case of technical
+   issues during the process, Odoo might contact you.
 
 .. 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.
+   If you have time constraints, `submit a support ticket <https://www.odoo.com/help>`_ as soon as
+   possible to schedule the transfer.
+
+To Odoo.sh
+----------
+
+Follow the instructions found in :ref:`the Import your database section
+<odoo_sh_import_your_database>` of the Odoo.sh *Create your project* documentation.
+
+Transferring an Odoo Online database
+====================================
+
+.. important::
+   Odoo Online's :ref:`intermediary versions <supported_versions>` cannot be hosted on-premise as
+   that type of hosting does not support those versions. Therefore, if the database to transfer
+   is running an intermediary version, it must be upgraded first to the next :ref:`major version
+   <supported_versions>`, waiting for its release if necessary.
+
+   .. example::
+      Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo
+      17.0.
+
+   .. tip::
+      Click the gear icon (:guilabel:`⚙`) next to the database name on the `Odoo Online database
+      manager <https://www.odoo.com/my/databases/>`_ to display its version number.
+
+To on-premise
+-------------
+
+#. Sign in to `the Odoo Online database manager <https://www.odoo.com/my/databases/>`_ and click the
+   gear icon (:guilabel:`⚙`) next to the database name to :guilabel:`Download` a backup. If the
+   download fails due to the file being too large, `contact Odoo support
+   <https://www.odoo.com/help>`_.
+#. Restore the database from the database manager on your local server using the backup.
+
+To Odoo.sh
+----------
+
+#. Sign in to `the Odoo Online database manager <https://www.odoo.com/my/databases/>`_ and click the
+   gear icon (:guilabel:`⚙`) next to the database name to :guilabel:`Download` a backup. If the
+   download fails due to the file being too large, `contact Odoo support
+   <https://www.odoo.com/help>`_.
+#. Follow the instructions found in :ref:`the Import your database section
+   <odoo_sh_import_your_database>` of the Odoo.sh *Create your project* documentation.
+
+Transferring an Odoo.sh database
+================================
+
+To Odoo Online
+--------------
+
+.. important::
+   Odoo Online is *not* compatible with **non-standard apps**.
+
+#. Uninstall all **non-standard apps** in a staging build before doing it in the production build.
+#. `Create a support ticket <https://www.odoo.com/help>`_ including the following:
+
+   - your **subscription number**,
+   - the **URL** you want to use for the database (e.g., `company.odoo.com`),
+   - which **branch** should be migrated,
+   - in which **region** you want the database to be hosted (Americas, Europe, or Asia),
+   - which user(s) will be the **administrator(s)**, and
+   - **when** (and in which timezone) you want the database to be up and running.
+
+#. Odoo then makes sure the database is compatible before putting it online. In case of technical
+   issues during the process, Odoo might contact you.
+
+.. note::
+   - If you have time constraints, `submit a support ticket <https://www.odoo.com/help>`_ as soon as
+     possible to schedule the transfer.
+   - Select the **region** closest to most of your users to reduce latency.
+   - Future **administrator(s)** must have an Odoo.com account.
+   - The **date and time** you want the database to be up and running are 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
-===========================
-
-1.  Grab a :ref:`backup of your Odoo.sh production database <odoo_sh_branches_backups>`.
-2.  Restore it from the database manager on your local server.
+To on-premise
+-------------
 
+#. Download a :ref:`backup of your Odoo.sh production database <odoo_sh_branches_backups>`.
+#. Restore the database from the database manager on your local server using the backup.

content/administration/maintain/mailjet_api.rst

@@ -0,0 +1,218 @@
+===========
+Mailjet API
+===========
+
+Odoo is compatible with Mailjet's :abbr:`API (Application Programming Interface)` for mass mailing.
+Set up a dedicated mass mailing server through Mailjet by configuring settings in the Mailjet
+account and the Odoo database. In some circumstances, settings need to be configured on the custom
+domain's :abbr:`DNS (Domain Name System)` settings as well.
+
+Set up in Mailjet
+=================
+
+Create API credentials
+----------------------
+
+To get started, sign in to the `Mailjet Account Information <https://app.mailjet.com/account>`_
+page. Next, navigate to the :guilabel:`Senders & Domains` section and click on :guilabel:`SMTP and
+SEND API Settings`.
+
+.. image:: mailjet_api/api-settings.png
+   :align: center
+   :alt: SMTP and Send API Settings link in the Senders & Domains section of Mailjet.
+
+Then, copy the :abbr:`SMTP (Simple Mail Transfer Protocol)` configuration settings onto a notepad.
+They can be found under the :guilabel:`Configuration (SMTP only)` section. The :abbr:`SMTP (Simple
+Mail Transfer Protocol)` configuration settings include the server address, the security option
+needed (Use :abbr:`SSL (Secure Sockets Layer)`/:abbr:`TLS (Transport Layer Security)`), and the
+port number. The settings are needed to configure Mailjet in Odoo, which is covered in the
+:ref:`last section <maintain/mailjet-api/odoo-setup>`.
+
+.. seealso::
+   `Mailjet: How can I configure my SMTP parameters?
+   <https://documentation.mailjet.com/hc/articles/360043229473>`_
+
+.. important::
+   Odoo blocks `port 25` on Odoo Online and Odoo.sh databases. :ref:`See reference here
+   <email_servers/restriction>`.
+
+.. image:: mailjet_api/smtp-config.png
+   :align: center
+   :alt: SMTP configuration from Mailjet.
+
+Next, click on the button labeled :guilabel:`Retrieve your API credentials` to retrieve the Mailjet
+API credentials.
+
+Then, click on the eye icon to reveal the :guilabel:`API key`. Copy this key to a notepad, as this
+serves as the :guilabel:`Username` in the Odoo configuration. Next, click on the
+:guilabel:`Generate Secret Key` button to generate the :guilabel:`Secret Key`. Copy this key to a
+notepad, as this serves as the :guilabel:`Password` in the Odoo configuration.
+
+Add verified sender address(es)
+-------------------------------
+
+The next step is to add a sender address or a domain to the Mailjet account settings so that the
+email address or domain is approved to send emails using Mailjet's servers. First, navigate to the
+`Mailjet Account Information <https://app.mailjet.com/account>`_ page. Next, click on the
+:guilabel:`Add a Sender Domain or Address` link under the :guilabel:`Senders & Domains` section.
+
+.. image:: mailjet_api/add-domain-email.png
+   :align: center
+   :alt: Add a sender domain or address in the Mailjet interface.
+
+Determine if a sender's email address or the entire domain needs to be added to the Mailjet
+settings. It may be easier to configure the domain as a whole if :abbr:`DNS (Domain Name System)`
+access is available. Jump to the :ref:`Add a domain <maintain/mailjet-api/add-domain>` section for
+steps on adding the domain.
+
+.. note::
+   Either all email addresses of the Odoo database users who are sending emails using Mailjet's
+   servers need to be configured or the domain(s) of the users' email addresses can be configured.
+
+By default, the email address originally set up in the Mailjet account is added as a trusted
+sender. To add another email address, click on the button labeled :guilabel:`Add a sender address`.
+Then, add the email address that is configured to send from the custom domain.
+
+At minimum the following email addresses should be set up in the provider and verified in Mailjet:
+
+- notifications\@yourdomain.com
+- bounce\@yourdomain.com
+- catchall\@yourdomain.com
+
+.. note::
+   Replace `yourdomain` with the custom domain for the Odoo database. If there isn't one, then use
+   the :guilabel:`mail.catchall.domain` system parameter.
+
+After that, fill out the :guilabel:`Email Information` form, making sure to select the appropriate
+email type: transactional email or mass emails. After completing the form, an activation email is
+sent to the email address and the trusted sender can be activated.
+
+It is recommended to set up the :abbr:`SPF (Sender Policy Framework)`/:abbr:`DKIM (DomainKeys
+Identified Mail)`/:abbr:`DMARC (Domain-based Message Authentication, Reporting, and
+Conformance)` settings on the domain of the sender.
+
+.. seealso::
+   `Mailjet's SPF/DKIM/DMARC documentation <https://documentation.mailjet.com/hc/articles/
+   360042412734-Authenticating-Domains-with-SPF-DKIM>`_
+
+.. important::
+   If the database is not using a custom domain, then in order to verify the sender's address, a
+   temporary alias (of the three email addresses mentioned above) should be set up in Odoo CRM to
+   create a lead. Then, the database is able to receive the verification email and verify the
+   accounts.
+
+.. _maintain/mailjet-api/add-domain:
+
+Add a domain
+------------
+
+By adding an entire domain to the Mailjet account, all the sender addresses related to that domain
+are automatically validated for sending emails using Mailjet servers. First, navigate to the
+`Mailjet Account Information <https://app.mailjet.com/account>`_ page. Next, click on
+:guilabel:`Add a Sender Domain or Address` link under the :guilabel:`Senders & Domains` section.
+Then, click on :guilabel:`Add domain` to add the custom domain.
+
+.. note::
+   The domain needs to be added to the Mailjet account and then validated through the :abbr:`DNS
+   (Domain Name System)`.
+
+After that, fill out the :guilabel:`Add a new Domain` page on Mailjet and click
+:guilabel:`Continue`.
+
+After adding the domain, a validation page will populate. Unless the Odoo database is on-premise
+(in which case, choose :guilabel:`Option 1`), choose :guilabel:`Option 2: Create a DNS Record`.
+Copy the TXT record information to a notepad and then navigate to the domain's :abbr:`DNS (Domain
+Name System)` provider to complete validation.
+
+.. image:: mailjet_api/host-value-dns.png
+   :align: center
+   :alt: The TXT record information to input on the domain's DNS.
+
+Setup in the domain's DNS
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After getting the TXT record information from the Mailjet account, add a TXT record to the domain's
+:abbr:`DNS (Domain Name System)`. This process varies depending on the :abbr:`DNS (Domain Name
+System)` provider. Consult the provider for specific configuration processes. The TXT record
+information consists of the :guilabel:`Host` and :guilabel:`Value`. Paste these into
+the corresponding fields in the TXT record.
+
+Return to Mailjet account information
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After adding the TXT record to the domain's :abbr:`DNS (Domain Name System)`, navigate back to the
+Mailjet account. Then, navigate to :menuselection:`Account Information --> Add a Sender Domain or
+Address`, click the gear icon next to :guilabel:`Domain`, and select :guilabel:`Validate`.
+
+This action can also be done by going to the `Sender domains & addresses <https://app.mailjet.com/
+account/sender>`_ page on the Mailjet account information and clicking on :guilabel:`Manage`.
+
+Next, click :guilabel:`Check Now` to validate the TXT record that was added on the domain. A
+success screen will appear if the domain is configured correctly.
+
+.. image:: mailjet_api/check-dns.png
+   :align: center
+   :alt: Check DNS record in Mailjet.
+
+After successfully setting up the domain, there is an option to :guilabel:`Authenticate this domain
+(SPF/DKIM)`. This button populates :abbr:`SPF (Sender Policy Framework)` & :abbr:`DKIM (DomainKeys
+Identified Mail) records to input into the :abbr:`DNS (Domain Name System)` provider.
+
+.. seealso::
+   `Mailjet's SPF/DKIM/DMARC documentation <https://documentation.mailjet.com/hc/articles/
+   360042412734-Authenticating-Domains-with-SPF-DKIM>`_
+
+.. image:: mailjet_api/authenticate.png
+   :align: center
+   :alt: Authenticate the domain with SPF/DKIM records in Mailjet.
+
+.. _maintain/mailjet-api/odoo-setup:
+
+Set up in Odoo
+==============
+
+To complete the setup, navigate to the Odoo database and go to the :guilabel:`Settings`. With
+:ref:`developer-mode` turned on, go to the :menuselection:`Technical Menu --> Email --> Outgoing
+Mail Servers`. Then, create a new outgoing server configuration by clicking on the
+:guilabel:`Create` button.
+
+Next, input the `SMTP server` (in-v3.mailjet.com), `port number` (587 or 465), and `Security
+(SSL/TLS)` that was copied earlier from the Mailjet account. They can also be found `here
+<https://app.mailjet.com/account/setup>`_. It is recommended to use :abbr:`SSL (Secure Sockets
+Layer)`/:abbr:`TLS (Transport Layer Security)` even though Mailjet may not require it.
+
+For the :guilabel:`Username`, input the :guilabel:`API KEY`. For the :guilabel:`Password`, input
+the :guilabel:`SECRET KEY` that was copied from the Mailjet account to the notepad earlier. These
+settings can be found on :menuselection:`Mailjet -->  Account Settings --> SMTP and SEND API
+Settings`.
+
+Then, if the Mailjet server is used for mass emailing, set the :guilabel:`Priority` value higher
+than that of any transactional email server(s). Finally, save the settings and :guilabel:`Test the
+Connection`.
+
+.. image:: mailjet_api/server-settings.png
+   :align: center
+   :alt: Odoo outgoing email server settings.
+
+.. important::
+   In order for the notifications feature to work using Mailjet, there are three settings that need
+   to be set in Odoo.
+
+   #. The :guilabel:`From Filter` needs to be set on the server configuration. It is recommended
+      to set it as a domain and not a full email address. It should match the domain in the two
+      proceeding steps. More information can be referenced :ref:`here
+      <email_communication/from_filter>`.
+   #. The :guilabel:`mail.default.from` system parameter must have the value
+      `notifications\@yourdomain.com`.
+   #. The :guilabel:`mail.default.from_filter` system parameter must have the value
+      `yourdomain.com`. Replace `yourdomain` with the custom domain for the Odoo database. If there
+      isn't one, then use the :guilabel:`mail.catchall.domain` system parameter.
+
+   For more information see :ref:`Using a default email address <email_communication/default>`.
+
+   The :guilabel:`System Parameters` can be accessed by activating
+   :doc:`../../applications/general/developer_mode` in the :menuselection:`Settings --> Technical
+   --> Parameters --> System Parameters` menu.
+
+Once the setup is complete, the Odoo database is ready to use the Mailjet email server for mass
+mailing or transactional emails!

content/administration/maintain/neutralized_database.rst

@@ -0,0 +1,35 @@
+====================
+Neutralized database
+====================
+
+A neutralized database is a non-production database on which several parameters are deactivated.
+This enables one to carry out tests without the risk of launching specific automated processes that
+could impact production data (e.g., sending emails to customers). Live access is removed and
+turned into a testing environment.
+
+.. note::
+   **Any testing database created is a neutralized database:**
+
+   - testing backup databases
+   - duplicate databases
+   - for Odoo.sh: staging and development databases
+
+.. important::
+   A database can also be neutralized when upgrading, as it is vital to do some tests before
+   switching to a new version.
+
+Deactivated features
+====================
+
+Here is a non-exhaustive list of the deactivated parameters:
+
+- all planned actions (e.g., automatic invoicing of subscriptions, mass mailing, etc.)
+- outgoing emails
+- bank synchronization
+- payment providers
+- delivery methods
+- :abbr:`IAP (In-App Purchase)` tokens
+
+.. note::
+   **A red banner at the top of the screen is displayed on the neutralized database so that it can
+   be seen immediately.**

content/administration/maintain/odoo_online.rst

@@ -0,0 +1,133 @@
+===============================
+Odoo Online database management
+===============================
+
+To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
+as the database administrator.
+
+All the main database management options are available by clicking the database name, except the
+upgrade option, which can be accessed by clicking the **arrow in a circle** icon next to the
+database name. It is only displayed if an upgrade is available.
+
+.. image:: odoo_online/database-manager.png
+   :alt: Accessing the database management options
+
+- :ref:`odoo_online/upgrade`
+- :ref:`odoo_online/duplicate`
+- :ref:`odoo_online/rename`
+- :ref:`odoo_online/download`
+- :ref:`odoo_online/domains`
+- :ref:`odoo_online/tags`
+- :ref:`odoo_online/delete`
+- :ref:`odoo_online/contact-support`
+- :ref:`odoo_online/users`
+
+.. _odoo_online/upgrade:
+
+Upgrade
+=======
+
+Trigger a database upgrade.
+
+.. seealso::
+   For more information about the upgrade process, check out the :ref:`Odoo Online upgrade
+   documentation <upgrade/request-test-database>`.
+
+.. _odoo_online/duplicate:
+
+Duplicate
+=========
+
+Create an exact copy of the database, which can be used to perform testing without compromising
+daily operations.
+
+.. important::
+   - By checking :guilabel:`For testing purposes`, all external actions (emails, payments, delivery
+     orders, etc.) are disabled by default on the duplicated database.
+   - Duplicated databases expire automatically after 15 days.
+
+.. _odoo_online/rename:
+
+Rename
+======
+
+Rename the database and its URL.
+
+.. _odoo_online/download:
+
+Download
+========
+
+Download a ZIP file containing a backup of the database.
+
+.. note::
+   Databases are backed up daily as per the `Odoo Cloud Hosting SLA
+   <https://www.odoo.com/cloud-sla>`_.
+
+.. _odoo_online/domains:
+
+Domain names
+============
+
+Use a custom :doc:`domain name <domain_names>` to access the database via another URL.
+
+.. tip::
+   You can :ref:`register a domain name for free <domain-name/register>`.
+
+.. _odoo_online/tags:
+
+Tags
+====
+
+Add tags to easily identify and sort your databases.
+
+.. tip::
+   You can search for tags in the search bar.
+
+.. _odoo_online/delete:
+
+Delete
+======
+
+Delete a database instantly.
+
+.. danger::
+   Deleting a database means that all data is permanently lost. The deletion is instant and applies
+   to all users. It is recommended to create a backup of the database before deleting it.
+
+Carefully read the warning message and only proceed if the implications of deleting a database are
+fully understood.
+
+.. image:: odoo_online/delete.png
+   :alt: The warning message displayed before deleting a database
+
+.. note::
+   - Only an administrator can delete a database.
+   - The database name is immediately made available to anyone.
+   - Deleting a database if it has expired or is linked to a subscription is impossible. In that
+     case, contact `Odoo Support <https://www.odoo.com/help>`_.
+
+.. _odoo_online/contact-support:
+
+Contact us
+==========
+
+Access the `Odoo.com support page <https://www.odoo.com/help>`_ with the database's details already
+pre-filled.
+
+.. _odoo_online/users:
+
+Invite / remove users
+=====================
+
+To invite users, fill out the new user's email address and click :guilabel:`Invite`. To add multiple
+users, click :guilabel:`Add more users`.
+
+.. image:: odoo_online/invite-users.png
+   :alt: Inviting a user on a database
+
+To remove users, select them and click :guilabel:`Remove`.
+
+.. seealso::
+   - :doc:`/applications/general/users/manage_users`
+   - :doc:`/applications/general/users/odoo_account`

content/administration/maintain/on_premise.rst

@@ -19,12 +19,12 @@ 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
+   :align: center
+   :alt: Something went wrong while registering your database, you can try again or contact Odoo
+         Help
 
 Solutions
-'''''''''
+~~~~~~~~~
 
 * Do you have a valid Enterprise subscription?
 
@@ -42,15 +42,13 @@ Solutions
     <https://accounts.odoo.com/my/subscription>`__ with the button "Unlink database"
 
     .. image:: on_premise/unlink_single_db.png
-        :align: center
-
+       :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
-
+       :align: center
 
 * Do you have the updated version of Odoo 9?
 
@@ -63,8 +61,7 @@ Solutions
     specifying which database is problematic:
 
     .. image:: on_premise/unlink_db_name_collision.png
-        :align: center
-
+       :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>`.
@@ -85,8 +82,6 @@ Solutions
   * Once you activated your database, you must keep these ports open, as the
     Update notification runs once a week.
 
-
-
 Error message due to too many users
 -----------------------------------
 
@@ -94,16 +89,15 @@ 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
+   :align: center
+   :alt: This database will expire in X days, you have more users than your subscription allows
 
 
 When the message appears you have 30 days before the expiration.
 The countdown is updated everyday.
 
 Solutions
-'''''''''
+~~~~~~~~~
 
 - **Add more users** on your subscription: follow the link and Validate
   the upsell quotation and pay for the extra users.
@@ -123,15 +117,14 @@ 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.
-
+   :align: center
+   :alt: This database has expired.
 
 This **blocking** message appears after a non-blocking message that lasts 30 days.
 If you fail to take action before the end of the countdown, the database is expired.
 
 Solutions
-'''''''''
+~~~~~~~~~
 
 * Renew your subscription: follow the link and renew your subscription - note that
     if you wish to pay by Wire Transfer, your subscription will effectively be renewed
@@ -142,7 +135,6 @@ Solutions
 None of those solutions worked for you? Please contact our
 `Support <https://www.odoo.com/help>`__
 
-
 .. _force_ping:
 
 .. _duplicate_premise:
@@ -155,8 +147,7 @@ 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
-
+   :align: center
 
 When you duplicate a local database, it is **strongly** advised to change
 the duplicated database's uuid (Unniversally Unique Identifier), since this
@@ -164,8 +155,9 @@ uuid is how your database identifies itself with our servers. Having two
 databases with the same uuid could result in invoicing problems or registration
 problems down the line.
 
-.. note:: From July 2016 onward, Odoo 9 now automatically change the uuid of a
-    duplicated database; a manual operation is no longer required.
+.. note::
+   From July 2016 onward, Odoo 9 now automatically change the uuid of a duplicated database; a
+   manual operation is no longer required.
 
 The database uuid is currently accessible from the menu :menuselection:`Settings --> Technical -->
 System Parameters`, we advise you to use a `uuid generator <https://www.uuidtools.com>`_ or to
@@ -173,4 +165,4 @@ 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
+   :align: center

content/administration/maintain/online.rst

@@ -1,155 +0,0 @@
-=================================
-Online (SaaS) database management
-=================================
-
-To manage a database, sign in to https://www.odoo.com and access the `database management page
-<https://www.odoo.com/my/databases>`_ by clicking on the user icon, then on *My Databases*.
-
-.. image:: online/my-databases.png
-   :align: center
-   :alt: Clicking on the user icon opens a drop-down menu. "My databases" button is highlighted.
-
-.. note::
-   Make sure you are connected as the administrator of the database you want to manage.
-
-.. image:: online/dropdown-menu.png
-   :align: right
-   :alt: Clicking on the gear icon opens the drop-down menu.
-
-Open the drop-down menu next to the database you want to manage by clicking on the gear icon.
-
-Several actions are available:
-
-- :ref:`online/upgrade`
-- :ref:`online/duplicate`
-- :ref:`online/rename`
-- :ref:`online/download`
-- :ref:`online/domains`
-- :ref:`online/tags`
-- :ref:`online/delete`
-- :ref:`online/contact-support`
-- :ref:`online/users`
-
-.. _online/upgrade:
-
-Upgrade
-=======
-
-If you are *not* on the latest **Online version**, you should receive an invitation to :doc:`upgrade
-<../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:**
-     | You must upgrade your database within two months. After these two months, an automatic
-       upgrade is initiated.
-   - | **If your Odoo database's version is equal to or higher than the latest major release:**
-     | You can disregard the invitation to upgrade as you probably wouldn't benefit from new
-       features every two months.
-
-.. note::
-   Versions that are not supported anymore become deprecated and need to be updated to avoid
-   security issues. We recommend you initiate the upgrade of the database yourself, as this method
-   allows you to request a test upgrade of your database to check for any discrepancies.
-
-.. seealso::
-   - :doc:`../upgrade`
-   - :doc:`supported_versions`
-
-.. _online/duplicate:
-
-Duplicate
-=========
-
-Make an exact copy of the database to be able to perform testing without compromising the daily
-operations.
-
-.. important::
-   - By checking *For testing purposes*, all external communication (emails, payments, delivery
-     orders, etc.) are disabled by default on the duplicated database.
-   - Duplicate databases expire automatically after 15 days.
-
-.. _online/rename:
-
-Rename
-======
-
-Rename the database and its URL.
-
-.. _online/download:
-
-Download
-========
-
-Download instantly a ZIP file with a backup of the database.
-
-.. note::
-   Databases are backed up daily according to the `Odoo Cloud SLA
-   <https://www.odoo.com/cloud-sla>`_.
-
-.. _online/domains:
-
-Domains
-=======
-
-Configure custom domains to access the database via another URL.
-
-.. seealso::
-   - :doc:`domain_names`
-
-.. _online/tags:
-
-Tags
-====
-
-Add tags to sort your databases out. You can search the tags in the search bar.
-
-.. _online/delete:
-
-Delete
-======
-
-Delete a database instantly.
-
-.. danger::
-   Deleting a database means that all data is permanently lost. The deletion is instant and for all
-   users. It is recommended to create a backup of the database before deleting it.
-
-Read carefully the warning message that pops up and proceed only if you fully understand the
-implications of deleting a database:
-
-.. image:: online/delete.png
-   :align: center
-   :alt: A warning message is prompted before deleting a database.
-
-.. note::
-   - Only an administrator can delete a database.
-   - The database name is immediately available for a new database.
-   - It is not possible to delete a database if it is expired or linked to a subscription. If
-     needed, please get in touch with `Odoo Support <https://www.odoo.com/help>`_.
-   - To delete your account, please get in touch with `Odoo Support <https://www.odoo.com/help>`_.
-
-.. _online/contact-support:
-
-Contact Support
-===============
-
-Access the Odoo `support page <https://www.odoo.com/help>`_ with your database's details already
-pre-filled.
-
-.. _online/users:
-
-Invite / Remove Users
-=====================
-
-To invite users, fill out the email address of the new user and click on *Invite*. To add multiple
-users, click on *Add more users*.
-
-.. image:: online/invite-users.png
-   :align: center
-   :alt: Clicking on "Add more users" adds additional email fields.
-
-To remove users, select the users to remove and click on *Remove*.
-
-.. seealso::
-   - :doc:`/applications/general/users/manage_users`

content/administration/maintain/supported_versions.rst

@@ -1,3 +1,4 @@
+:hide-page-toc:
 
 .. _supported_versions:
 
@@ -8,57 +9,108 @@ Supported versions
 Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
 
 .. note::
-   Odoo releases intermediary versions called **Online versions** on the :doc:`Odoo Online <online>`
-   hosting every two months. Odoo Online users can then benefit from the latest features of Odoo.
+   Odoo releases intermediary versions called **Online versions** on the :doc:`Odoo Online
+   <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.
    - Online versions are *not* released for Odoo.sh and On-Premise installations.
    - Online versions are listed below as *SaaS*.
 
-What's the support status of my Odoo?
-=====================================
-
 This matrix shows the support status of every version.
 
 **Major releases are in bold type.**
 
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-|                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
-+=================+=============+==========+=============+================+========================+
-| 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) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 14.0**   | |green|     | |green|  | |green|     | October 2020   | October 2023 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 13.0**   | |green|     | |green|  | |green|     | October 2019   | October 2022 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo saas~12.3  | |red|       | N/A      | N/A         | August 2019    |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 12.0**   | |red|       | |red|    | |red|       | October 2018   | October 2021           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo saas~11.3  | |red|       | N/A      | N/A         | April 2018     |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 11.0**   | |red|       | |red|    | |red|       | October 2017   | October 2020           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 10.saas~15 | |red|       | N/A      | N/A         | March 2017     |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 10.saas~14 | |red|       | N/A      | N/A         | January 2017   |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 10.0**   | |red|       | |red|    | |red|       | October 2016   | October 2019           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 9.saas~11  | |red|       | N/A      | N/A         | May 2016       |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 9.0**    | |red|       | N/A      | |red|       | October 2015   | October 2018           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 8.saas~6   | |red|       | N/A      | N/A         | February 2015  |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 8.0**    | |red|       | N/A      | |red|       | September 2014 | October 2017           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
+.. list-table::
+   :header-rows: 1
+   :widths: auto
 
-.. note::
+   * -
+     - Odoo Online
+     - Odoo.sh
+     - On-Premise
+     - Release date
+     - End of support
+   * - Odoo saas~17.1
+     - |green|
+     - N/A
+     - N/A
+     - January 2024
+     -
+   * - **Odoo 17.0**
+     - |green|
+     - |green|
+     - |green|
+     - November 2023
+     - October 2026 (planned)
+   * - Odoo saas~16.4
+     - |green|
+     - N/A
+     - N/A
+     - August 2023
+     -
+   * - Odoo saas~16.3
+     - |red|
+     - N/A
+     - N/A
+     - June 2023
+     -
+   * - Odoo saas~16.2
+     - |red|
+     - N/A
+     - N/A
+     - March 2023
+     -
+   * - Odoo saas~16.1
+     - |red|
+     - N/A
+     - N/A
+     - February 2023
+     -
+   * - **Odoo 16.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2022
+     - November 2025 (planned)
+   * - Odoo saas~15.2
+     - |red|
+     - N/A
+     - N/A
+     - March 2022
+     - January 2023
+   * - Odoo saas~15.1
+     - |red|
+     - N/A
+     - N/A
+     - February 2022
+     - July 2022
+   * - **Odoo 15.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2021
+     - November 2024 (planned)
+   * - **Odoo 14.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2020
+     - November 2023
+   * - **Odoo 13.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2019
+     - October 2022
+   * - Older versions
+     - |red|
+     - |red|
+     - |red|
+     - Before 2019
+     - Before 2022
+
+.. admonition:: Legend
 
     |green| Supported version
 
@@ -66,7 +118,9 @@ This matrix shows the support status of every version.
 
     N/A Never released for this platform
 
-    🏁 Future version, not released yet
+.. important::
+   Even though we don't support older versions, you can always `upgrade from any version
+   <https://upgrade.odoo.com/>`_.
 
 .. |green| raw:: html
 
@@ -75,12 +129,3 @@ This matrix shows the support status of every version.
 .. |red| raw:: html
 
    <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>
-
-I run an older version of Odoo/OpenERP/TinyERP
-==============================================
-
-OpenERP 7.0, 6.1, 6.0 and 5.0 is not supported anymore, on any platform.
-
-TinyERP 4.0, 3.0, 2.0 and 1.0 is not supported anymore, on any platform.
-
-Even though we don't support older versions, you can always `upgrade from any version <https://upgrade.odoo.com/>`_.

content/administration/maintain/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 :ref:`installation guide <setup/install>`,
+The main reference for updating is logically our :doc:`installation guide <../install>`,
 which explains the common installation methods.
 
 Updating is also most appropriately accomplished by the person who deployed Odoo initially,
@@ -104,12 +104,13 @@ and you're all set.
 
 Source Install (Tarball)
 ------------------------
+
 If you have originally installed Odoo with the "tarball" version (source code archive), you have
 to replace the installation directory with a newer version. First download the latest tarball
 from Odoo.com. They are updated daily and include the latest security fixes (see step #1)
 After downloading the package, extract it to a temporary location on your server.
 
-You will get a folder labelled with the version of the source code, for example "odoo-13.0+e.20190719",
+You will get a folder labeled with the version of the source code, for example "odoo-13.0+e.20190719",
 that contains a folder "odoo.egg-info" and the actual source code folder named "odoo" (for Odoo 10
 and later) or "openerp" for older versions.
 You can ignore the odoo.egg-info folder. Locate the folder where your current installation is deployed,
@@ -123,6 +124,7 @@ Finally, restart the Odoo service or reboot the machine, and you are all set.
 
 Source Install (Github)
 -----------------------
+
 If you have originally installed Odoo with a full Github clone of the official repositories, the
 update procedure requires you to pull the latest source code via git.
 Change into the directory for each repository (the main Odoo repository, and the Enterprise

content/administration/odoo_sh/advanced.rst

@@ -1,8 +1,8 @@
 :nosearch:
 
-=================
+========
 Advanced
-=================
+========
 
 .. toctree::
    :titlesonly:

content/administration/odoo_sh/advanced/containers.rst

@@ -1,7 +1,7 @@
 
-==================================
+==========
 Containers
-==================================
+==========
 
 Overview
 ========
@@ -17,7 +17,7 @@ The platform will take care to install these dependencies in your containers.
 `The pip requirements specifiers <https://pip.pypa.io/en/stable/reference/pip_install/#requirement-specifiers>`_
 documentation can help you write a :file:`requirements.txt` file.
 To have a concrete example,
-check out the `requirements.txt file of Odoo <https://github.com/odoo/odoo/blob/14.0/requirements.txt>`_.
+check out the `requirements.txt file of Odoo <{GITHUB_PATH}/requirements.txt>`_.
 
 The :file:`requirements.txt` files of submodules are taken into account as well. The platform
 looks for :file:`requirements.txt` files in each folder containing Odoo modules: Not in the module folder itself,
@@ -167,16 +167,16 @@ In the above commands, the argument:
 * ``--stop-after-init`` will immediately shutdown the server instance after it completed the operations you asked.
 
 More options are available and detailed in the
-:doc:`CLI documentation </developer/cli>`.
+:doc:`CLI documentation </developer/reference/cli>`.
 
 You can find in the logs (*~/logs/odoo.log*) the addons path used by Odoo.sh to run your server.
 Look for "*odoo: addons paths*":
 
 ::
 
-  2018-02-19 10:51:39,267 4 INFO ? odoo: Odoo version 13.0
+  2018-02-19 10:51:39,267 4 INFO ? odoo: Odoo version {BRANCH}
   2018-02-19 10:51:39,268 4 INFO ? odoo: Using configuration file at /home/odoo/.config/odoo/odoo.conf
-  2018-02-19 10:51:39,268 4 INFO ? odoo: addons paths: ['/home/odoo/data/addons/13.0', '/home/odoo/src/user', '/home/odoo/src/enterprise', '/home/odoo/src/themes', '/home/odoo/src/odoo/addons', '/home/odoo/src/odoo/odoo/addons']
+  2018-02-19 10:51:39,268 4 INFO ? odoo: addons paths: ['/home/odoo/data/addons/{BRANCH}', '/home/odoo/src/user', '/home/odoo/src/enterprise', '/home/odoo/src/themes', '/home/odoo/src/odoo/addons', '/home/odoo/src/odoo/odoo/addons']
 
 **Be careful**, especially with your production database.
 Operations that you perform running this Odoo server instance are not isolated:

content/administration/odoo_sh/advanced/frequent_technical_questions.rst

@@ -1,9 +1,9 @@
 
 .. _odoosh-advanced-frequent_technical_questions:
 
-==================================
+============================
 Frequent Technical Questions
-==================================
+============================
 
 "Scheduled actions do not run at the exact time they were expected"
 -------------------------------------------------------------------
@@ -29,4 +29,3 @@ We advise that:
 - Your scheduled actions should be
   `idempotent <https://stackoverflow.com/a/1077421/3332416>`_: they must not
   cause side-effects if they are started more often than expected.
-

content/administration/odoo_sh/advanced/submodules.rst

@@ -1,9 +1,9 @@
 
 .. _odoosh-advanced-submodules:
 
-==================================
+==========
 Submodules
-==================================
+==========
 
 Overview
 ========
@@ -64,7 +64,7 @@ On Github, you can get the repository URL with the *Clone or download* button of
 .. _odoosh-advanced-submodules-withgit:
 
 With Git (advanced)
----------------------
+-------------------
 
 In a terminal, in the folder where your Git repository is cloned,
 checkout the branch in which you want to add a submodule:

content/administration/odoo_sh/getting_started.rst

@@ -1,8 +1,8 @@
 :nosearch:
 
-=================
+===========
 Get started
-=================
+===========
 
 .. toctree::
    :titlesonly:

content/administration/odoo_sh/getting_started/branches.rst

@@ -1,7 +1,6 @@
-
-==================================
+========
 Branches
-==================================
+========
 
 Overview
 ========
@@ -14,7 +13,7 @@ The branches view gives you an overview of the different branches your repositor
 .. _odoosh-gettingstarted-branches-stages:
 
 Stages
-===============
+======
 
 Odoo.sh offers three different stages for your branches: production, staging and development.
 
@@ -27,6 +26,7 @@ You can change the stage of a branch by drag and dropping it into the stage sect
 
 Production
 ----------
+
 This is the branch holding the code on which your production database runs.
 There can be only one production branch.
 
@@ -42,7 +42,7 @@ instance will be held temporarily unavailable for maintenance reason.
 
 This method is equivalent to perform an upgrade of the module through the Apps menu,
 or through the :code:`-u` switch of
-:doc:`the command line </developer/cli>`.
+:doc:`the command line </developer/reference/cli>`.
 
 In the case the changes in the commit prevent the server to restart,
 or if the modules update fails,
@@ -59,6 +59,7 @@ will automatically be set back to the development stage after 30 days.
 
 Staging
 -------
+
 Staging branches are meant to test your new features using the production data without compromising
 the actual production database with test records. They will create databases that are neutralized
 duplicates of the production database.
@@ -83,9 +84,9 @@ The unit tests are not performed as, in Odoo, they currently rely on the demo da
 production database. In the future, if Odoo supports to run the unit tests without the demo data,
 Odoo.sh will then consider running the tests on staging databases.
 
-
 Development
 -----------
+
 Development branches create new databases using the demo data to run the unit tests.
 The installed modules are the ones included in your branches. You can change this list of modules
 to install in your :ref:`project Settings <odoosh-gettingstarted-settings-modules-installation>`.
@@ -98,7 +99,7 @@ disable the tests or allow specific tests to be run with custom tags in the :ref
 <odoosh-gettingstarted-branches-tabs-settings>`.
 
 Similar to staging branches, the emails are not sent but are intercepted by a mailcatcher and
-scheduled actions are not triggered as often is the database is not in use.
+scheduled actions are not triggered as long as the database is not in use.
 
 The databases created for development branches are meant to live around three days.
 After that, they can be automatically garbage collected to make room for new databases without prior notice.
@@ -107,6 +108,7 @@ After that, they can be automatically garbage collected to make room for new dat
 
 Merging your branches
 ---------------------
+
 You can merge your branches easily by drag and dropping them into each other.
 
 .. image:: branches/interface-branches-merge.png
@@ -147,10 +149,11 @@ If you test configuration changes in staging branches, and want them to be appli
 .. _odoosh-gettingstarted-branches-tabs:
 
 Tabs
-=============
+====
 
 History
 -------
+
 An overview of your branch history:
 
 * The messages of the commits and their authors,
@@ -168,6 +171,7 @@ When an operation is successful, you can access the database thanks to the *conn
 
 Mails
 -----
+
 This tab contains the mail catcher. It displays an overview of the emails sent by your database.
 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.
@@ -178,6 +182,7 @@ staging branches as the emails of your production database are really sent inste
 
 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`.
 
@@ -187,13 +192,13 @@ and open a shell on your database by typing :code:`psql`.
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
 for instance side by side.
 
-
 .. Note::
   Long running shell instances are not guaranteed. Idle shells can be
   disconnected at anytime in order to free up resources.
 
 Editor
 ------
+
 An online integrated development environment (IDE) to edit the source code.
 You can also open terminals, Python consoles and even Odoo Shell consoles.
 
@@ -205,6 +210,7 @@ for instance side by side.
 
 Monitoring
 ----------
+
 This link contains various monitoring metrics of the current build.
 
 .. image:: branches/interface-branches-monitoring.png
@@ -217,6 +223,7 @@ On the graphs, annotations help you relate to changes on the build (database imp
 
 Logs
 ----
+
 A viewer to have a look to your server logs.
 
 .. image:: branches/interface-branches-logs.png
@@ -240,6 +247,7 @@ The fetching is automatically stopped after 5 minutes. You can restart it using
 
 Backups
 -------
+
 A list of the backups available for download and restore, the ability to perform a manual backup and to import a
 database.
 
@@ -259,16 +267,16 @@ This server only keeps one month of backups: 7 daily and 4 weekly backups.
 Dedicated backup servers keep the same backups, as well as 3 additional monthly backups.
 To restore or download one of these monthly backups, please `contact us <https://www.odoo.com/help>`_.
 
-If you merge a commit updating the version of one or several modules (in :file:`__manifest__.py`), or their linked python 
-dependencies (in :file:`requirements.txt`), then Odoo.sh performs a backup automatically (flagged with type Update in the list), 
-as either the container will be changed by the installation of new pip packages, either the database itself will be 
-changed with the module update triggered afterwards. In these two cases, we are doing a backup as it may potentially 
+If you merge a commit updating the version of one or several modules (in :file:`__manifest__.py`), or their linked python
+dependencies (in :file:`requirements.txt`), then Odoo.sh performs a backup automatically (flagged with type Update in the list),
+as either the container will be changed by the installation of new pip packages, either the database itself will be
+changed with the module update triggered afterwards. In these two cases, we are doing a backup as it may potentially
 break things.
 
-If you merge a commit that only changes some code without the above-mentioned modifications, then no backup is done 
-by Odoo.sh, as neither the container nor the database is modified so the platform considers this safe enough. Of course, 
-as an extra precaution, you can make a backup manually before making big changes in your production sources in case 
-something goes wrong (those manual backups are available for about one week). To avoid abuse, we limit manual backups 
+If you merge a commit that only changes some code without the above-mentioned modifications, then no backup is done
+by Odoo.sh, as neither the container nor the database is modified so the platform considers this safe enough. Of course,
+as an extra precaution, you can make a backup manually before making big changes in your production sources in case
+something goes wrong (those manual backups are available for about one week). To avoid abuse, we limit manual backups
 to 5 per day.
 
 The *import database* feature accepts database archives in the format provided by:
@@ -287,7 +295,7 @@ Upgrade
 Available for production and staging branches for valid projects.
 
 .. seealso::
-    :doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`
+    :doc:`Upgrade documentation <../../upgrade>`
 
 .. _odoosh-gettingstarted-branches-tabs-settings:
 
@@ -398,14 +406,13 @@ settings to increase the deliverability of your outgoing emails.
 The configuration steps are explained in the documentation about :ref:`SPF
 <email_communication/spf_compliant>` and :ref:`DKIM <email_communication/dkim_compliant>`.
 
-
 .. Warning::
   Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host can lead to the
   delivery of your emails as spam in your contacts inbox.
 
-
 Shell commands
 ==============
+
 In the top right-hand corner of the view, different shell commands are available.
 
 .. image:: branches/interface-branches-shellcommands.png
@@ -418,6 +425,7 @@ such as ``<URL>``, ``<PATH>``, ...
 
 Clone
 -----
+
 Download the Git repository.
 
 .. code-block:: bash
@@ -433,6 +441,7 @@ The *run* button is not available for this command, as it is meant to be used on
 
 Fork
 ----
+
 Create a new branch based on the current branch.
 
 .. code-block:: bash
@@ -449,6 +458,7 @@ Uploads the new branch *feature-1* on your remote repository.
 
 Merge
 -----
+
 Merge the current branch in another branch.
 
 .. code-block:: bash
@@ -465,8 +475,10 @@ Uploads the changes you just added in the *master* branch on your remote reposit
 
 SSH
 ---
+
 Setup
 ~~~~~
+
 In order to use SSH, you have to set up your profile SSH public key (if it is not already done).
 To do so, follow these steps:
 
@@ -506,7 +518,6 @@ you'll be granted ssh access to the build.
   Long running ssh connections are not guaranteed. Idle connections will be
   disconnected in order to free up resources.
 
-
 Submodule
 ---------
 

content/administration/odoo_sh/getting_started/builds.rst

@@ -1,17 +1,18 @@
 
 .. _odoosh-gettingstarted-builds:
 
-==================================
+======
 Builds
-==================================
+======
 
 Overview
 ========
 
 In Odoo.sh, a build is considered as a database loaded by an Odoo server
-(`odoo/odoo <https://github.com/odoo/odoo>`_ & `odoo/enterprise <https://github.com/odoo/enterprise>`_)
-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.
+(`odoo/odoo <https://github.com/odoo/odoo>`_ & `odoo/enterprise
+<https://github.com/odoo/enterprise>`_) 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:: builds/interface-builds.png
    :align: center
@@ -28,13 +29,13 @@ A successful build is highlighted in green.
 A build is considered failed if errors come up during its creation.
 A failed build is highlighted in red.
 
-If warnings come up during the creation, but there are no errors, the build is considered almost successful.
-It is highlighted in yellow to notify the developer warnings were raised.
+If warnings come up during the creation, but there are no errors, the build is considered almost
+successful. It is highlighted in yellow to notify the developer warnings were raised.
 
-Builds do not always create a database from scratch.
-For instance, when pushing a change on the production branch, the build created just starts the server
-with your new revision and tries to load the current production database on it.
-If no errors come up, the build is considered successful, and otherwise failed.
+Builds do not always create a database from scratch. For instance, when pushing a change on the
+production branch, the build created just starts the server with your new revision and tries to load
+the current production database on it. If no errors come up, the build is considered successful, and
+otherwise failed.
 
 Stages
 ======
@@ -48,14 +49,15 @@ If this build is successful, this database is considered as the production datab
 From then, pushes on the production branch will create new builds that attempt to load the database
 using a server running with the new revision.
 
-If the build is successful, or has warnings but no errors, the production database will now run with this build, along
-with the revision associated to this build.
+If the build is successful, or has warnings but no errors, the production database will now run with
+this build, along with the revision associated to this build.
 
-If the build fails to load or update the database, then the previous successful build is re-used to load the database,
-and therefore the database will run using a server running with the previous successful revision.
+If the build fails to load or update the database, then the previous successful build is re-used to
+load the database, and therefore the database will run using a server running with the previous
+successful revision.
 
-The build used to run the production database is always the first of the builds list. If a build fails, it is
-put after the build currently running the production database.
+The build used to run the production database is always the first of the builds list. If a build
+fails, it is put after the build currently running the production database.
 
 Staging
 -------
@@ -63,18 +65,17 @@ Staging
 Staging builds duplicate the production database,
 and try to load this duplicate with the revisions of the staging branches.
 
-Each time you push a new revision on a staging branch, the build created uses a new copy of the production database.
-The databases are not re-used between builds of the same branch. This ensures:
+Each time you push a new revision on a staging branch, the build created uses a new copy of the
+production database. The databases are not re-used between builds of the same branch. This ensures:
 
-* staging builds use databases that are close to what the production looks like,
-  so you do not make your tests with outdated data,
+* staging builds use databases that are close to what the production looks like, so you do not make
+  your tests with outdated data,
 
-* you can play around as much as you want in the same staging database,
-  and you can then ask for a rebuild when you want to restart with a new copy of the production.
+* you can play around as much as you want in the same staging database, and you can then ask for a
+  rebuild when you want to restart with a new copy of the production.
 
-Nevertheless, this means that if you make configuration changes in staging databases
-and do not apply them in the production,
-they will not be passed on the next build of the same staging branch.
+Nevertheless, this means that if you make configuration changes in staging databases and do not
+apply them in the production, they will not be passed on the next build of the same staging branch.
 
 Development
 -----------
@@ -86,30 +87,30 @@ as they are meant to raise errors if something wrong occurs.
 
 If all tests pass, and there is no error, the build will be considered successful.
 
-According to the list of modules to install and test, a development build can take up to 1 hour to be ready.
-This is due to the large number of tests set in the default Odoo modules suite.
+According to the list of modules to install and test, a development build can take up to 1 hour to
+be ready. This is due to the large number of tests set in the default Odoo modules suite.
 
 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.
+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:: 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
-the *Github* link. For other branches than the production, you can create a new build which will use the latest revision
-of the branch using the link *rebuild*. This last link is not available when there is already a build in progress for
-the branch.
+For each branch, you can access the last build's database using the *Connect* link and jump to the
+branch code using the *Github* link. For other branches than the production, you can create a new
+build which will use the latest revision 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:: builds/interface-builds-build.png
    :align: center
 
-For each build, you can access the revision changes using the button with the Github icon.
-You can access the build's database as the administrator using the *Connect* button.
-Also, you can access the database with another user using the *Connect as* button,
-in the dropdown menu of the *Connect* button.
+For each build, you can access the revision changes using the button with the Github icon. You can
+access the build's database as the administrator using the *Connect* button. Also, you can access
+the database with another user using the *Connect as* button, in the dropdown menu of the *Connect*
+button.
 
 .. _odoosh-gettingstarted-builds-download-dump:
 
@@ -118,6 +119,6 @@ in the dropdown menu of the *Connect* button.
 
 .. _odoosh-gettingstarted-builds-dropdown-menu:
 
-In the dropdown menu of the build, you can access the same features than in :ref:`the branches view <odoosh-gettingstarted-branches-tabs>`:
-*Logs*, *Web Shell*, *Editor*, *Outgoing e-mails*.
-You also have the possibility to *Download a dump* of the build's database.
+In the dropdown menu of the build, you can access the same features than in :ref:`the branches view
+<odoosh-gettingstarted-branches-tabs>`: *Logs*, *Web Shell*, *Editor*, *Outgoing e-mails*. You also
+have the possibility to *Download a dump* of the build's database.

content/administration/odoo_sh/getting_started/create.rst

@@ -1,9 +1,9 @@
 
 .. _odoosh-gettingstarted-create:
 
-==================================
+===================
 Create your project
-==================================
+===================
 
 Deploy your platform
 ====================
@@ -16,7 +16,8 @@ Go to `Odoo.sh <https://www.odoo.sh/>`_ and hit the *Deploy your platform* butto
 Sign in with Github
 ===================
 
-Sign in with your Github account. If you do not have an account yet, hit the *Create an account* link.
+Sign in with your Github account. If you do not have an account yet, hit the *Create an account*
+link.
 
 .. image:: create/github-signin.png
    :align: center
@@ -33,34 +34,44 @@ Odoo.sh basically needs:
 
 * to know your Github login and email,
 * to create a new repository in case you decide to start from scratch,
-* to read your existing repositories, including the ones of your organizations, in case you want to start from an existing repository,
+* to read your existing repositories, including the ones of your organizations, in case you want to
+  start from an existing repository,
 * to create a webhook to be notified each time you push changes,
-* to commit changes to make your deployment easier, merging branches or adding new `submodules <https://git-scm.com/book/en/v2/Git-Tools-Submodules>`_ for example.
+* to commit changes to make your deployment easier, merging branches or adding new `submodules
+  <https://git-scm.com/book/en/v2/Git-Tools-Submodules>`_ for example.
 
 Submit your project
 ===================
 
-Choose if you want to start from scratch by creating a new repository, or if you want to use an existing repository.
+Choose if you want to start from scratch by creating a new repository, or if you want to use an
+existing repository.
 
 Then, choose a name or select the repository you want to use.
 
-Choose the Odoo version you want to use. If you plan to import an existing database or an existing set of applications, you might need to choose the according version. If you start from scratch, use the latest version.
+Choose the Odoo version you want to use. If you plan to import an existing database or an existing
+set of applications, you might need to choose the according version. If you start from scratch, use
+the latest version.
 
-Enter your *subscription code*. This is also called *subscription referral*, *contract number* or *activation code*.
+Enter your *subscription code*. This is also called *subscription referral*, *contract number* or
+*activation code*.
 
 It should be the code of your Enterprise subscription that includes Odoo.sh.
 
-Partners can use their partnership codes to start a trial. Should their clients start a project, they ought to get an Enterprise subscription including Odoo.sh and use its subscription code. The partner will get the full amount as back commission.
-Contact your sales representative or account manager in order to get it.
+Partners can use their partnership codes to start a trial. Should their clients start a project,
+they ought to get an Enterprise subscription including Odoo.sh and use its subscription code. The
+partner will get 50% of the amount back as commission. Contact your sales representative or account
+manager in order to get it.
 
 When submitting the form, if you are notified your subscription is not valid, it either means:
 
 * it is not an existing subscription,
 * it is not a partnership subscription,
 * it is an enterprise subscription, but which does not include Odoo.sh,
-* it is neither a partnership subscription or an enterprise subscription (e.g. an online subscription).
+* it is neither a partnership subscription or an enterprise subscription (e.g. an online
+  subscription).
 
-In case of doubt with your subscription, please contact the `Odoo support <https://www.odoo.com/help>`_.
+In case of doubt with your subscription, please contact the `Odoo support
+<https://www.odoo.com/help>`_.
 
 .. image:: create/deploy-form.png
    :align: center
@@ -68,7 +79,8 @@ In case of doubt with your subscription, please contact the `Odoo support <https
 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.
+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:: create/deploy-done.png
    :align: center
@@ -88,9 +100,10 @@ If you use community or custom modules, add them in a branch in your Github repo
 Databases hosted on the Odoo.com online platform do not have any custom modules.
 Users of these databases can therefore skip this step.
 
-You can structure your modules as you wish, Odoo.sh will automatically detect the folders containing Odoo addons.
-For instance, you can put all your modules folder in the root directory of your repository,
-or group the modules in folders by categories that you define (accounting, project, ...).
+You can structure your modules as you wish, Odoo.sh will automatically detect the folders containing
+Odoo addons. For instance, you can put all your modules folder in the root directory of your
+repository, or group the modules in folders by categories that you define (accounting, project,
+...).
 
 For community modules available in public Git repositories,
 you can also consider to add them using :ref:`Submodules <odoosh-advanced-submodules>`.
@@ -111,7 +124,8 @@ Access the URL :file:`/web/database/manager` of your on-premise database and dow
   If you cannot access the database manager, it may have been disabled by your system administrator.
   See the :ref:`database manager security documentation <db_manager_security>`.
 
-You will need the master password of your database server. If you do not have it, contact your system administrator.
+You will need the master password of your database server. If you do not have it, contact your
+system administrator.
 
 .. image:: create/create-import-onpremise-backup.png
    :align: center
@@ -124,64 +138,68 @@ Choose a zip including the filestore as the backup format.
 Odoo Online databases
 ~~~~~~~~~~~~~~~~~~~~~
 
-`Access your databases manager <https://accounts.odoo.com/my/databases/manage>`_ and download a backup of your database.
+`Access your databases manager <https://accounts.odoo.com/my/databases/manage>`_ and download a
+backup of your database.
 
 .. image:: create/create-import-online-backup.png
-  :align: center
+   :align: center
 
 .. Warning::
 
-  Saas releases (e.g. *saas-**) are not supported on Odoo.sh.
+  Online versions (e.g. *saas-**) are not supported on Odoo.sh.
 
 Upload the backup
 -----------------
 
-Then, in your Odoo.sh project, in the backups tab of your production branch, import the backup you just downloaded.
+Then, in your Odoo.sh project, in the backups tab of your production branch, import the backup you
+just downloaded.
 
 .. 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.
+Once the backup imported, you can access the database using the *Connect* button in the history of
+the branch.
 
 .. image:: create/create-import-production-done.png
-  :align: center
+   :align: center
 
 Check your outgoing email servers
 ---------------------------------
 
 There is a default mail server provided with Odoo.sh.
 To use it, there must be no enabled outgoing mail server configured in your database in
-:menuselection:`Settings --> Technical --> Outgoing Mail Servers`
-(:ref:`Developer mode <developer-mode>` must be activated).
+:menuselection:`Settings --> Technical --> Outgoing Mail Servers` (:ref:`Developer mode
+<developer-mode>` must be activated).
 
-After the import of your database,
-all outgoing email servers are disabled so you use the Odoo.sh email server provided by default.
+After the import of your database, all outgoing email servers are disabled so you use the Odoo.sh
+email server provided by default.
 
-.. Warning::
-
-  Port 25 is (and will stay) closed. If you want to connect to an external SMTP server, you should use ports 465 and 587.
+.. warning::
+   Port 25 is (and will stay) closed. If you want to connect to an external SMTP server, you should
+   use ports 465 and 587.
 
 Check your scheduled actions
 ----------------------------
 
 All scheduled actions are disabled after the import.
 
-This is to prevent your newly imported database to perform actions that could impact your running production,
-such as sending the mails remaining in the queue, processing mass mailings, or third-party services synchronization
-(Calendars, files hosting, ...).
+This is to prevent your newly imported database to perform actions that could impact your running
+production, such as sending the mails remaining in the queue, processing mass mailings, or
+third-party services synchronization (Calendars, files hosting, ...).
 
 If you plan to make the imported database your production, enable the scheduled actions you need.
-You can check what is enabled in the database of origin and enable the same actions in the imported database.
-Scheduled actions are located under :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions`.
+You can check what is enabled in the database of origin and enable the same actions in the imported
+database. Scheduled actions are located under :menuselection:`Settings --> Technical --> Automation
+--> Scheduled Actions`.
 
 Register your subscription
 --------------------------
 
 Your subscription is unlinked after the import.
 
-The imported database is considered a duplicate by default and the enterprise subscription is therefore removed,
-as you can only have one database linked per subscription.
+The imported database is considered a duplicate by default and the enterprise subscription is
+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.
+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.

content/administration/odoo_sh/getting_started/first_module.rst

@@ -1,14 +1,14 @@
-
-==================================
+=================
 Your first module
-==================================
+=================
 
 Overview
 ========
 
 This chapter helps you to create your first Odoo module and deploy it in your Odoo.sh project.
 
-This tutorial requires :ref:`you created a project on Odoo.sh <odoosh-gettingstarted-create>`, and you know your Github repository's URL.
+This tutorial requires :ref:`you created a project on Odoo.sh <odoosh-gettingstarted-create>`, and
+you know your Github repository's URL.
 
 Basic use of Git and Github is explained.
 
@@ -27,7 +27,7 @@ Create the development branch
 =============================
 
 From Odoo.sh
--------------
+------------
 
 In the branches view:
 
@@ -43,20 +43,18 @@ In the branches view:
 .. |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:: first_module/firstmodule-development-editor.png
-  :align: center
+   :align: center
 
 .. image:: first_module/firstmodule-development-editor-interface.png
-  :align: center
+   :align: center
 
 From your computer
 ------------------
 
-
 Clone your Github repository on your computer:
 
 .. code-block:: bash
@@ -72,7 +70,6 @@ Create a new branch:
 
   $ git checkout -b feature-1 master
 
-
 Create the module structure
 ===========================
 
@@ -88,15 +85,15 @@ From the Odoo.sh editor, in a terminal:
 
   $ odoo-bin scaffold my_module ~/src/user/
 
-Or, from your computer, if you have an :ref:`installation of Odoo <setup/install/source>`:
+Or, from your computer, if you have an :doc:`installation of Odoo <../../install/source>`:
 
 .. code-block:: bash
 
   $ ./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 <first_module/my_module.zip>` in which you replace every occurrences of
-*my_module* to the name of your choice.
+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:
 
@@ -119,11 +116,11 @@ The below structure will be generated:
       ├── templates.xml
       └── views.xml
 
-.. Warning::
+.. warning::
 
-  Do not use special characters other than the underscore ( _ ) for your module name, not even an hyphen ( - ).
-  This name is used for the Python classes of your module,
-  and having classes name with special characters other than the underscore is not valid in Python.
+   Do not use special characters other than the underscore ( _ ) for your module name, not even an
+   hyphen ( - ). This name is used for the Python classes of your module, and having classes name
+   with special characters other than the underscore is not valid in Python.
 
 Uncomment the content of the files:
 
@@ -141,7 +138,7 @@ Uncomment the content of the files:
   the manifest of your module, including for instance its title, description and data files to load.
   You just need to uncomment the access control list data file:
 
-  .. code-block:: xml
+  .. code-block:: python
 
     # 'security/ir.model.access.csv',
 
@@ -149,7 +146,7 @@ Manually
 --------
 
 If you want to create your module structure manually,
-you can follow :doc:`Build an Odoo module </developer/howtos/backend>` to understand
+you can follow the :doc:`/developer/tutorials/getting_started` tutorial to understand
 the structure of a module and the content of each file.
 
 Push the development branch
@@ -180,8 +177,8 @@ The above command is explained in the section
 <odoosh-gettingstarted-online-editor-push>` of the
 :ref:`Online Editor <odoosh-gettingstarted-online-editor>`
 chapter.
-It includes the explanation regarding the fact you will be prompted to type your username and password,
-and what to do if you use the two-factor authentication.
+It includes the explanation regarding the fact you will be prompted to type your username and
+password, and what to do if you use the two-factor authentication.
 
 Or, from your computer terminal:
 
@@ -217,11 +214,11 @@ Once the database ready, you can access it by clicking the *Connect* button.
   :align: center
 
 If your Odoo.sh project is configured to install your module automatically,
-you will directly see it amongst the database apps. Otherwise, it will be available in the apps to install.
+you will directly see it amongst the database apps. Otherwise, it will be available in the apps to
+install.
 
 You can then play around with your module, create new records and test your features and buttons.
 
-
 Test with the production data
 =============================
 
@@ -232,23 +229,24 @@ you can test it with the production data using a staging branch.
 
 You can either:
 
-* Make your development branch a staging branch, by drag and dropping it onto the *staging* section title.
+* Make your development branch a staging branch, by drag and dropping it onto the *staging* section
+  title.
 
   .. image:: first_module/firstmodule-test-devtostaging.png
-    :align: center
+     :align: center
 
 * Merge it in an existing staging branch, by drag and dropping it onto the given staging branch.
 
   .. image:: first_module/firstmodule-test-devinstaging.png
-    :align: center
+     :align: center
 
 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.
+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:: first_module/firstmodule-test-mergedinstaging.png
-  :align: center
+   :align: center
 
 Once the database ready, you can access it using the *Connect* button.
 
@@ -257,11 +255,13 @@ Once the database ready, you can access it using the *Connect* button.
 Install your module
 -------------------
 
-Your module will not be installed automatically, you have to install it from the apps menu.
-Indeed, the purpose of the staging build is to test the behavior of your changes as it would be on your production,
-and on your production you would not like your module to be installed automatically, but on demand.
+Your module will not be installed automatically, you have to install it from the apps menu. Indeed,
+the purpose of the staging build is to test the behavior of your changes as it would be on your
+production, and on your production you would not like your module to be installed automatically, but
+on demand.
 
-Your module may not appear directly in your apps to install either, you need to update your apps list first:
+Your module may not appear directly in your apps to install either, you need to update your apps
+list first:
 
 * Activate the :ref:`developer mode <developer-mode>`
 * in the apps menu, click the *Update Apps List* button,
@@ -307,14 +307,16 @@ you have to install it manually as explained in the
 Add a change
 ============
 
-This section explains how to add a change in your module by adding a new field in a model and deploy it.
+This section explains how to add a change in your module by adding a new field in a model and deploy
+it.
 
 From the Odoo.sh editor,
  * browse to your module folder *~/src/user/my_module*,
  * then, open the file *models/models.py*.
 
 Or, from your computer,
- * use the file browser of your choice to browse to your module folder *~/src/odoo-addons/my_module*,
+ * use the file browser of your choice to browse to your module folder
+   *~/src/odoo-addons/my_module*,
  * then, open the file *models/models.py* using the editor of your choice,
    such as *Atom*, *Sublime Text*, *PyCharm*, *vim*, ...
 
@@ -350,8 +352,8 @@ and modify a view stored in database.
 In order to be applied in existing databases, such as your production database,
 these changes requires the module to be updated.
 
-If you would like the update to be performed automatically by the Odoo.sh platform when you push your changes,
-increase your module version in its manifest.
+If you would like the update to be performed automatically by the Odoo.sh platform when you push
+your changes, increase your module version in its manifest.
 
 Open the module manifest *__manifest__.py*.
 
@@ -367,7 +369,8 @@ with
 
   'version': '0.2',
 
-The platform will detect the change of version and trigger the update of the module upon the new revision deployment.
+The platform will detect the change of version and trigger the update of the module upon the new
+revision deployment.
 
 Browse to your Git folder.
 
@@ -412,12 +415,12 @@ Or, from your computer terminal:
 The platform will then create a new build for the branch *feature-1*.
 
 .. image:: first_module/firstmodule-test-addachange-build.png
-  :align: center
+   :align: center
 
-Once you tested your changes, you can merge your changes in the production branch, for instance by drag-and-dropping the
-branch on the production branch in the Odoo.sh interface. As you increased the module version in the manifest,
-the platform will update the module automatically and your new field will be directly available.
-Otherwise you can manually update the module within the apps list.
+Once you tested your changes, you can merge your changes in the production branch, for instance by
+drag-and-dropping the branch on the production branch in the Odoo.sh interface. As you increased the
+module version in the manifest, the platform will update the module automatically and your new field
+will be directly available. Otherwise you can manually update the module within the apps list.
 
 Use an external Python library
 ==============================
@@ -425,10 +428,18 @@ Use an external Python library
 If you would like to use an external Python library which is not installed by default,
 you can define a *requirements.txt* file listing the external libraries your modules depends on.
 
+.. note::
+   - It is not possible to install or upgrade system packages on an Odoo.sh database (e.g., apt
+     packages). However, under specific conditions, packages can be considered for installation.
+     This also applies to **Python modules** requiring system packages for their compilation, and
+     **third-party Odoo modules**.
+   - **PostgreSQL extensions** are not supported on Odoo.sh.
+   - For more information, consult our `FAQ <https://www.odoo.sh/faq#install_dependencies>`_.
+
 The platform will use this file to automatically install the Python libraries your project needs.
 
-The feature is explained in this section by using the `Unidecode library <https://pypi.python.org/pypi/Unidecode>`_ in
-your module.
+The feature is explained in this section by using the `Unidecode library
+<https://pypi.python.org/pypi/Unidecode>`_ in your module.
 
 Create a file *requirements.txt* in the root folder of your repository
 
@@ -442,8 +453,8 @@ Add
 
   unidecode
 
-Then use the library in your module, for instance to remove accents from characters in the name field of your
-model.
+Then use the library in your module, for instance to remove accents from characters in the name
+field of your model.
 
 Open the file *models/models.py*.
 

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

@@ -1,9 +1,9 @@
 
 .. _odoosh-gettingstarted-online-editor:
 
-==================================
+=============
 Online Editor
-==================================
+=============
 
 Overview
 ========
@@ -120,24 +120,23 @@ In this last command,
 .. image:: online-editor/interface-editor-commit-push.png
    :align: center
 
-.. Note::
-  The SSH Github remote is not used because your SSH private key
-  is not hosted in your build containers (for obvious security concerns)
-  nor forwarded through an SSH Agent (as you access this editor through a web browser)
-  and you therefore cannot authenticate yourself to Github using SSH.
-  You have to use the HTTPS remote of your Github repository to push your changes,
-  which is added automatically named as *https* in your Git remotes.
-  You will be prompted to enter your Github username and password.
-  If you activated the two-factor authentication on Github,
-  you can create a
-  `personal access token <https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/>`_
-  and use it as password. Granting the ``repo`` permission suffices.
+.. note::
+   The SSH Github remote is not used because your SSH private key
+   is not hosted in your build containers (for obvious security concerns)
+   nor forwarded through an SSH Agent (as you access this editor through a web browser)
+   and you therefore cannot authenticate yourself to Github using SSH.
+   You have to use the HTTPS remote of your Github repository to push your changes,
+   which is added automatically named as *https* in your Git remotes.
+   You will be prompted to enter your Github username and password.
+   If you activated the two-factor authentication on Github,
+   you can create a `personal access token
+   <https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/>`_
+   and use it as password. Granting the ``repo`` permission suffices.
 
-
-.. Note::
-  The Git source folder *~/src/user* is not checked out on a branch but rather on a detached revision:
-  This is because builds work on specific revisions rather than branches.
-  In other words, this means you can have multiple builds on the same branch, but on different revisions.
+.. note::
+   The Git source folder *~/src/user* is not checked out on a branch but rather on a detached revision:
+   This is because builds work on specific revisions rather than branches.
+   In other words, this means you can have multiple builds on the same branch, but on different revisions.
 
 Once your changes are pushed,
 according to your :ref:`branch push behavior <odoosh-gettingstarted-branches-tabs-settings>`,
@@ -166,12 +165,11 @@ You can also open an Odoo Shell console to play around
 with the Odoo registry and model methods of your database. You can also directly read or write
 on your records.
 
-.. Warning::
-  In an Odoo Console, transactions are automatically committed.
-  This means, for instance, that changes in records are applied effectively in the database.
-  If you change the name of a user, the name of the user is changed in your database
-  as well.
-  You therefore should use Odoo consoles carefully on production databases.
+.. warning::
+   In an Odoo Console, transactions are automatically committed.
+   This means, for instance, that changes in records are applied effectively in the database.
+   If you change the name of a user, the name of the user is changed in your database as well.
+   You therefore should use Odoo consoles carefully on production databases.
 
 You can use *env* to invoke models of your database registry, e.g. :code:`env['res.users']`.
 
@@ -196,4 +194,4 @@ You can also use
 to display graphs.
 
 .. image:: online-editor/interface-editor-console-odoo-graph.png
-  :align: center
+   :align: center

content/administration/odoo_sh/getting_started/settings.rst

@@ -1,7 +1,6 @@
-
-==================================
+========
 Settings
-==================================
+========
 
 Overview
 ========
@@ -21,8 +20,8 @@ The name of your project.
 
 This defines the address that will be used to access your production database.
 
-Addresses of your staging and development builds are derived from this name and assigned automatically.
-However, when you change your project name, only future builds will use the new name.
+Addresses of your staging and development builds are derived from this name and assigned
+automatically. However, when you change your project name, only future builds will use the new name.
 
 .. _odoosh-gettingstarted-settings-collaborators:
 
@@ -39,48 +38,108 @@ There are two levels of users:
 * Admin: has access to all features of Odoo.sh.
 * User: does not have access to the project settings nor to the production and staging databases.
 
-The user group is meant for developers who can make modifications in your code but are not allowed to access the
-production data.
-Users of this group cannot connect to the production and staging databases using the *1-click connect* feature,
-but they can of course use their regular account on these databases if they have one, using their regular credentials.
+The user group is meant for developers who can make modifications in your code but are not allowed
+to access the production data. Users of this group cannot connect to the production and staging
+databases using the *1-click connect* feature, but they can of course use their regular account on
+these databases if they have one, using their regular credentials.
 
 In addition, they cannot use the webshell nor have access to the server logs.
 
-+---------------------+-----------------+-----------+-----------+
-|                     |                 | User      | Admin     |
-+=====================+=================+===========+===========+
-|Development          | History         |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | 1-click connect |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Logs            |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Shell/SSH       |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Mails           |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Settings        |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|Production & Staging | History         |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | 1-click connect |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Logs            |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Shell/SSH       |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Mails           |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Monitoring      |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Backups         |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Settings        |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|Status               |                 |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|Settings             |                 |           |     X     |
-+---------------------+-----------------+-----------+-----------+
+.. list-table::
+   :header-rows: 1
+   :widths: auto
+
+   * -
+     -
+     - User
+     - Admin
+   * - Development
+     - History
+     - |green|
+     - |green|
+   * -
+     - 1-click connect
+     - |green|
+     - |green|
+   * -
+     - Logs
+     - |green|
+     - |green|
+   * -
+     - Shell/SSH
+     - |green|
+     - |green|
+   * -
+     - Mails
+     - |green|
+     - |green|
+   * -
+     - Upgrade
+     - |green|
+     - |green|
+   * -
+     - Settings
+     - |green|
+     - |green|
+   * - Production & Staging
+     - History
+     - |green|
+     - |green|
+   * -
+     - 1-click connect
+     -
+     - |green|
+   * -
+     - Logs
+     -
+     - |green|
+   * -
+     - Shell/SSH
+     -
+     - |green|
+   * -
+     - Mails
+     -
+     - |green|
+   * -
+     - Monitoring
+     -
+     - |green|
+   * -
+     - Backups
+     -
+     - |green|
+   * -
+     - Upgrade
+     -
+     - |green|
+   * -
+     - Settings
+     - |green|\*
+     - |green|
+   * - Status
+     -
+     - |green|
+     - |green|
+   * - Settings
+     -
+     -
+     - |green|
+
+.. note::
+    \* Only in staging branches
+
+.. |green| raw:: html
+
+   <span class="text-success" style="font-size: 32px; line-height: 0.5">●</span>
+
+.. |orange| raw:: html
+
+   <span class="text-warning" style="font-size: 32px; line-height: 0.5">●</span>
+
+.. |red| raw:: html
+
+   <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>
 
 Public Access
 =============
@@ -90,7 +149,8 @@ Allow public access to your development builds.
 .. 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.
+If activated, this option exposes the Builds page publicly, allowing visitors to connect to your
+development builds.
 
 In addition, visitors have access to the logs, shell and mails of your development builds.
 
@@ -98,11 +158,11 @@ Production and staging builds are excluded, visitors can only see their status.
 
 .. _odoosh-gettingstarted-settings-modules-installation:
 
-
 Custom domains
 ==============
 
-To configure additional domains please refer to the corresponding branch's :ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`.
+To configure additional domains please refer to the corresponding branch's :ref:`settings tab
+<odoosh-gettingstarted-branches-tabs-settings>`.
 
 .. _odoosh-gettingstarted-settings-submodules:
 
@@ -112,10 +172,10 @@ Submodules
 Configure the deploy keys for the private repositories you use
 as submodules in your branches to allow Odoo.sh to download them.
 
-.. Warning::
-  These settings are required for **private repositories** only.
-  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.
+.. warning::
+   These settings are required for **private repositories** only. 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:: settings/interface-settings-submodules.png
    :align: center
@@ -130,7 +190,8 @@ To configure the deploy key for a private repository, proceed as follows:
 * in the input, paste the SSH URL of your private sub-repository and click on *Add*,
 
   * e.g. *git@github.com:USERNAME/REPOSITORY.git*
-  * it can be another Git server than Github, such as Bitbucket, Gitlab or even your own self-hosted server
+  * it can be another Git server than Github, such as Bitbucket, Gitlab or even your own self-hosted
+    server
 
 * copy the public key,
 
@@ -157,8 +218,9 @@ Storage size is computed as follows:
 
 * the size of the disk files available in your container: database filestore, sessions storage directory...
 
-.. Warning::
-  In case you want to analyze disk usage, you can run the tool `ncdu <https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell.
+.. warning::
+   In case you want to analyze disk usage, you can run the tool `ncdu
+   <https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell.
 
 Should your production database size grow to exceed what's provisioned in your subscription, it
 will automatically be synchronized with it.
@@ -191,7 +253,8 @@ add more, it will automatically be synchronized with your subscription.
 Activation
 ==========
 
-Shows the status of the project's activation. You can change the project's activation code if needed.
+Shows the status of the project's activation. You can change the project's activation code if
+needed.
 
 .. image:: settings/interface-settings-activation.png
    :align: center

content/administration/odoo_sh/getting_started/status.rst

@@ -1,12 +1,12 @@
-
-==================================
+======
 Status
-==================================
+======
 
 Overview
 ========
 
-The status page shows statistics regarding the servers your project uses. It includes the servers availability.
+The status page shows statistics regarding the servers your project uses. It includes the servers
+availability.
 
 .. image:: status/interface-status.png
    :align: center

content/administration/odoo_sh/overview.rst

@@ -1,8 +1,8 @@
 :nosearch:
 
-=================
+========
 Overview
-=================
+========
 
 .. toctree::
    :titlesonly:

content/administration/odoo_sh/overview/introduction.rst

@@ -1,7 +1,6 @@
-
-==============================
+=======================
 Introduction to Odoo.sh
-==============================
+=======================
 
 .. youtube:: QuNsa9n9PMg
     :align: right

content/administration/upgrade.rst

@@ -1,257 +1,407 @@
-: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:
+.. _administration/upgrade:
 
-   upgrade/online_hosting
-   upgrade/odoo_sh
-   upgrade/on_premise
-   upgrade/faq
+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.
 
-An upgrade is switching to a newer version of Odoo (e.g., Odoo 14.0 to Odoo 15.0).
+.. _upgrade_faq/rolling_release:
+
+.. spoiler:: Automatic upgrades: Odoo Online's Rolling Release process
+
+   The Rolling Release process allows Odoo Online customers to upgrade their database directly from
+   a message prompt sent to the database administrator as soon as a new version is released. The
+   invitation to upgrade is only sent if no issues are detected during the automatic tests.
+
+   .. image:: upgrade/rr-upgrade-message.png
+      :alt: The upgrade message prompt on the top right of the database
+
+   It is strongly recommended to manually :ref:`test the upgrade first <upgrade/test_your_db>`.
+   Clicking :guilabel:`I want to test first` redirects to `the database manager
+   <https://www.odoo.com/my/databases/>`_, where it is possible to request an upgraded test database
+   and check it for any discrepancies.
+
+   It is **not** recommended to click :guilabel:`Upgrade Now` without testing first, as it
+   immediately triggers the live production database upgrade.
+
+   If the Rolling Release process detects an issue with the upgrade, it will be deactivated until
+   the issue is resolved.
 
 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
+  - 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)
+  - Migrating from another ERP to Odoo
 
-.. note:: |assistance-contact|
+.. warning::
+   If your database contains custom modules, it cannot be upgraded until a version of your custom
+   modules is available for the target version of Odoo. For customers maintaining their own custom
+   modules, we recommend to parallelize the process by :ref:`requesting an upgraded database
+   <upgrade/request-test-database>` while also :doc:`upgrading the source code of your custom
+   modules </developer/howtos/upgrade_custom_db>`.
 
-.. seealso::
-   - :ref:`upgrade/sla`
 
-.. _upgrade/process-workflow:
+Upgrading in a nutshell
+-----------------------
 
-Process workflow
-================
+#. Request an upgraded test database (see :ref:`obtaining an upgraded test database
+   <upgrade/request-test-database>`).
 
-The upgrade process in a nutshell:
+#. If applicable, upgrade the source code of your custom module to be compatible with the new
+   version of Odoo (see :doc:`/developer/howtos/upgrade_custom_db`).
 
-#. 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).
+#. Thoroughly test the upgraded database (see :ref:`testing the new version of the database
+   <upgrade/test_your_db>`).
 
-.. 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>`
+#. Report any issue encountered during the testing to Odoo via the `support page
+   <https://odoo.com/help?stage=migration>`__.
 
-.. _upgrade/testing-phase:
+#. Once all issues are resolved and you are confident that the upgraded database can be used as
+   your main database without any issues, plan the upgrade of your production database.
 
-Testing
-=======
+#. Request the upgrade for the production database, rendering it unavailable for the time it takes
+   to complete the process (see :ref:`upgrading the production database <upgrade/upgrade-prod>`).
 
-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).
+#. Report any issue encountered during the upgrade to Odoo via the `support page
+   <https://odoo.com/help?stage=post_upgrade>`__.
 
-Once you receive your upgraded test database, check that all data, processes, and functionality are
-still correct and working as expected.
+.. _upgrade/request-test-database:
 
-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
+Obtaining an upgraded test database
 -----------------------------------
 
-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.
+The `Upgrade page <https://upgrade.odoo.com/>`_ is the main platform for requesting an upgraded
+database. However, depending on the hosting type, you can upgrade from the command line
+(on-premise), the `Odoo Online database manager <https://odoo.com/my/databases>`_, or your `Odoo.sh
+project <https://odoo.sh/project>`_.
 
-.. _upgrade/supported-versions:
+.. note::
+   The Upgrade platform follows the same `Privacy Policy <https://www.odoo.com/privacy>`_ as the
+   other Odoo.com services. Visit the `General Data Protection Regulation page
+   <https://www.odoo.com/gdpr>`_ to learn more about how Odoo handles your data and privacy.
 
-Supported versions
-------------------
+.. tabs::
 
-Please note that Odoo provides support and bug fixing only for the three last major versions of
-Odoo.
+   .. group-tab:: Odoo Online
 
-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).
+      Odoo Online databases can be manually upgraded via the `database manager
+      <https://odoo.com/my/databases>`_.
+
+      The database manager displays all databases associated with the user's account. Databases
+      not on the most recent version of Odoo display an arrow in a circle icon next to their name,
+      indicating that they can be upgraded.
+
+      .. image:: upgrade/databases-page.png
+         :alt: The database manager with an upgrade button next to the name of a database.
+
+      Click the **arrow in a circle** icon to start the upgrade process. In the popup, fill in:
+
+      - The **version** of Odoo you want to upgrade to, usually the latest version
+      - The **email** address that should receive the link to the upgraded database
+      - The :guilabel:`Purpose` of the upgrade, which is automatically set to :guilabel:`Test` for
+        your first upgrade request
+
+      .. image:: upgrade/upgrade-popup.png
+         :alt: The "Upgrade your database" popup.
+
+      The :guilabel:`Upgrade in progress` tag is displayed next to the database name until
+      completion. Once the process succeeds, an email containing a link to the upgraded test
+      database is sent to the address provided. The database can also be accessed from the database
+      manager by clicking the dropdown arrow before the database name.
+
+      .. image:: upgrade/access-upgraded-db.png
+         :alt: Clicking the menu arrow displays the upgraded test database.
+
+   .. group-tab:: Odoo.sh
+
+      Odoo.sh is integrated with the upgrade platform to simplify the upgrade process.
+
+      .. image:: upgrade/odoo-sh-staging.png
+         :alt: Odoo.sh project and tabs
+
+      The **latest production daily automatic backup** is then sent to the `upgrade platform
+      <https://upgrade.odoo.com>`_.
+
+      Once the upgrade platform is done upgrading the backup and uploading it on the branch, it is
+      put in a **special mode**: each time a **commit is pushed** on the branch, a **restore
+      operation** of the upgraded backup and an **update of all the custom modules** occur. This
+      allows you to test your custom modules on a pristine copy of the upgraded database. The log
+      file of the upgrade process can be found in your newly upgraded staging build by going to
+      :file:`~/logs/upgrade.log`.
+
+      .. important::
+         In databases where custom modules are installed, their source code must be up-to-date with
+         the target version of Odoo before the upgrade can be performed. If there are none, the
+         "update on commit" mode is skipped, the upgraded database is built as soon as it is
+         transferred from the upgrade platform, and the upgrade mode is exited.
+
+         Check out the :doc:`/developer/howtos/upgrade_custom_db` page for more information.
+
+   .. group-tab:: On-premise
+
+      The standard upgrade process can be initiated by entering the following command line on the
+      machine where the database is hosted:
+
+      .. code-block:: console
+
+         $ python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t <target version>
+
+      The following command can be used to display the general help and the main commands:
+
+      .. code-block:: console
+
+         $ python <(curl -s https://upgrade.odoo.com/upgrade) --help
+
+      An upgraded test database can also be requested via the `Upgrade page
+      <https://upgrade.odoo.com/>`_.
+
+      .. important::
+         In databases where custom modules are installed, their source code must be up-to-date with
+         the target version of Odoo before the upgrade can be performed. Check out the
+         :doc:`/developer/howtos/upgrade_custom_db` page for more information.
+
+      .. note::
+         - For security reasons, only the person who submitted the upgrade request can download it.
+         - For storage reasons, the database's copy is submitted without a filestore to the upgrade
+           server. Therefore, the upgraded database does not contain the production filestore.
+         - Before restoring the upgraded database, its filestore must be merged with the production
+           filestore to be able to perform tests in the same conditions as it would be in the new
+           version.
+         - The upgraded database contains:
+
+           - A `dump.sql` file containing the upgraded database
+           - A `filestore` folder containing files extracted from in-database records into
+             attachments (if there are any) and new standard Odoo files from the targeted Odoo
+             version (e.g., new images, icons, payment provider's logos, etc.).
+             This is the folder that should be merged with the production filestore
+             in order to get the full upgraded filestore.
+
+.. note::
+   You can request multiple test databases if you wish to test an upgrade more than once.
+
+.. _upgrade/upgrade_report:
+
+.. note::
+   When an upgrade request is completed, an upgrade report is attached to the successful upgrade
+   email, and it becomes available in the Discuss app for users who are part of the "Administration
+   / Settings" group. This report provides important information about the changes introduced by
+   the new version.
+
+.. _upgrade/test_your_db:
+
+Testing the new version of the database
+---------------------------------------
+
+It is essential to spend some time testing the upgraded test database to ensure that you are not
+stuck in your day-to-day activities by a change in views, behavior, or an error message once the
+upgrade goes live.
+
+.. note::
+   Test databases are neutralized, and some features are disabled to prevent them from impacting the
+   production database:
+
+   #. Scheduled actions are disabled.
+   #. Outgoing mail servers are disabled by archiving the existing ones and adding a fake one.
+   #. Payment providers and delivery carriers are reset to the test environment.
+   #. Bank synchronization is disabled. Should you want to test the synchronization, contact your
+      bank synchronization provider to get sandbox credentials.
+
+Testing as many of your business flows as possible is strongly recommended to ensure they are
+working correctly and to get more familiar with the new version.
+
+.. admonition:: Basic test checklist
+
+   - Are there views that are deactivated in your test database but active in your production
+     database?
+   - Are your usual views still displayed correctly?
+   - Are your reports (invoice, sales order, etc.) correctly generated?
+   - Are your website pages working correctly?
+   - Are you able to create and modify records? (sales orders, invoices, purchases, users, contacts,
+     companies, etc.)
+   - Are there any issues with your mail templates?
+   - Are there any issues with saved translations?
+   - Are your search filters still present?
+   - Can you export your data?
+
+.. spoiler:: Example of end-to-end testing
+
+   - Checking a random product in your product catalog and comparing its test and production data to
+     verify everything is the same (product category, selling price, cost price, vendor, accounts,
+     routes, etc.).
+   - Buying this product (Purchase app).
+   - Confirming the reception of this product (Inventory app).
+   - Checking if the route to receive this product is the same in your production database
+     (Inventory app).
+   - Selling this product (Sales app) to a random customer.
+   - Opening your customer database (Contacts app), selecting a customer (or company), and checking
+     its data.
+   - Shipping this product (Inventory app).
+   - Checking if the route to ship this product is the same as in your production database
+     (Inventory app).
+   - Validating a customer invoice (Invoicing or Accounting app).
+   - Crediting the invoice (issuing a credit note) and checking if it behaves as in your production
+     database.
+   - Checking your reports' results (Accounting app).
+   - Randomly checking your taxes, currencies, bank accounts, and fiscal year (Accounting app).
+   - Making an online order (Website apps) from the product selection in your shop until the
+     checkout process and checking if everything behaves as in your production database.
+
+   This list is **not** exhaustive. Extend the example to your other apps based on your use of Odoo.
+
+If you face an issue while testing your upgraded test database, you can request the assistance of
+Odoo via the `support page <https://odoo.com/help?stage=migration>`__ by selecting the option
+related to testing the upgrade. In any case, it is essential to report any
+problem encountered during the testing to fix it before upgrading your production database.
+
+You might encounter significant differences with standard views, features, fields, and models during
+testing. Those changes cannot be reverted on a case-by-case basis. However, if a change introduced
+by a new version breaks a customization, it is the responsibility of the maintainer of your custom
+module to make it compatible with the new version of Odoo.
+
+.. tip::
+   Do not forget to test:
+
+   - Integrations with external software (EDI, APIs, etc.)
+   - Workflows between different apps (online sales with eCommerce, converting a lead all the way to
+     a sales order, delivery of products, etc.)
+   - Data exports
+   - Automated actions
+   - Server actions in the action menu on form views, as well as by selecting multiple records on
+     list views
+
+.. _upgrade/upgrade-prod:
+
+Upgrading the production database
+---------------------------------
+
+Once the :ref:`tests <upgrade/test_your_db>` are completed and you are confident that the upgraded
+database can be used as your main database without any issues, it is time to plan the go-live day. It
+can be planned in coordination with Odoo's upgrade support analysts, reachable via the `support page
+<https://odoo.com/help>`__.
+
+Your production database will be unavailable during its upgrade. Therefore, we recommend planning
+the upgrade at a time when the use of the database is minimal.
+
+As the standard upgrade scripts and your database are constantly evolving, it is also recommended
+to frequently request another upgraded test database to ensure that the upgrade process is
+still successful, especially if it takes a long time to finish. **Fully rehearsing the upgrade
+process the day before upgrading the production database is also recommended.**
+
+.. important::
+   - Going into production without first testing may lead to:
+
+     - Users failing to adjust to the changes and new features
+     - Business interruptions (e.g., no longer having the possibility to validate an action)
+     - Poor customer experience (e.g., an eCommerce website that does not work correctly)
+
+The process of upgrading a production database is similar to upgrading a test database with a few
+exceptions.
+
+.. tabs::
+
+   .. group-tab:: Odoo Online
+
+      The process is similar to :ref:`obtaining an upgraded test database
+      <upgrade/request-test-database>`, except for the purpose option, which must be set to
+      :guilabel:`Production` instead of :guilabel:`Test`.
+
+      .. warning::
+         Once the upgrade is requested, the database will be unavailable until the upgrade is
+         finished. Once the process is completed, it is impossible to revert to the previous
+         version.
+
+   .. group-tab:: Odoo.sh
+
+      The process is similar to :ref:`obtaining an upgraded test database
+      <upgrade/request-test-database>` on the :guilabel:`Production` branch.
+
+      .. image:: upgrade/odoo-sh-prod.png
+         :alt: View from the upgrade tab
+
+      The process is **triggered as soon as a new commit is made** on the branch. This
+      allows the upgrade process to be synchronized with the deployment of the custom modules'
+      upgraded source code.
+      If there are no custom modules, the upgrade process is triggered immediately.
+
+      .. important::
+         The database is unavailable throughout the process. If anything goes wrong, the platform
+         automatically reverts the upgrade, as it would be for a regular update. In case of success,
+         a backup of the database before the upgrade is created.
+
+      The update of your custom modules must be successful to complete the entire upgrade process.
+      Make sure the status of your staging upgrade is :guilabel:`successful` before trying it in
+      production. More information on how to upgrade your custom modules can be found on
+      :doc:`/developer/howtos/upgrade_custom_db`.
+
+   .. group-tab:: On-premise
+
+      The command to upgrade a database to production is similar to the one of upgrading a test
+      database except for the argument `test`, which must be replaced by `production`:
+
+      .. code-block:: console
+
+         $ python <(curl -s https://upgrade.odoo.com/upgrade) production -d <your db name> -t <target version>
+
+      An upgraded production database can also be requested via the `Upgrade page
+      <https://upgrade.odoo.com/>`_.
+      Once the database is uploaded, any modification to your production database will **not** be
+      present on your upgraded database. This is why we recommend not using it during the upgrade
+      process.
+
+      .. important::
+         When requesting an upgraded database for production purposes, the copy is submitted without
+         a filestore. Therefore, the upgraded database filestore must be merged with the production
+         filestore before deploying the new version.
+
+In case of an issue with your production database, you can request the assistance of Odoo via the
+`support page <https://odoo.com/help?stage=post_upgrade>`__ by selecting the option related to
+the upgrade in production.
 
-.. 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
+Service-level agreement (SLA)
 -----------------------------
 
-* 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
+With Odoo Enterprise, upgrading a database to the most recent version of Odoo is **free**, including
+any support required to rectify potential discrepancies in the upgraded database.
 
-You can get more information about your Enterprise Licence on our :ref:`Odoo Enterprise Subscription
-Agreement <upgrade>` page.
+Information about the upgrade services included in the Enterprise Licence is available in the
+:ref:`Odoo Enterprise Subscription Agreement <upgrade>`. However, this section clarifies what
+upgrade services you can expect.
 
-.. note:: |assistance-contact|
+Upgrade services covered by the SLA
+===================================
+
+Databases hosted on Odoo's cloud platforms (Odoo Online and Odoo.sh) or self-hosted (On-Premise) can
+benefit from upgrade services at all times for:
+
+- the upgrade of all **standard applications**;
+- the upgrade of all **customizations created with the Studio app**, as long as Studio is still
+  installed and the respective subscription is still active; and
+- the upgrade of all **developments and customizations covered by a maintenance of customizations
+  subscription**.
+
+Upgrade services are limited to the technical conversion and adaptation of a database (standard
+modules and data) to make it compatible with the version targeted by the upgrade.
+
+Upgrade services not covered by the SLA
+=======================================
+
+The following upgrade-related services are **not** included:
+
+- the **cleaning** of pre-existing data and configurations while upgrading;
+- the upgrade of **custom modules created in-house or by third parties**, including Odoo partners;
+- lines of **code added to standard modules**, i.e., customizations created outside the Studio app,
+  code entered manually, and :ref:`automated actions using Python code
+  <studio/automated-actions/action>`; and
+- **training** on using the upgraded version's features and workflows.
 
 .. seealso::
-   - :doc:`upgrade/faq`
-   - :doc:`odoo_sh`
-   - :doc:`maintain/supported_versions`
+   - :doc:`Odoo.sh documentation <odoo_sh>`
+   - :doc:`Supported Odoo versions <maintain/supported_versions>`

content/administration/upgrade/faq.rst

@@ -1,228 +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
-
-===
-FAQ
-===
-
-.. _upgrade-faq/why:
-
-Why upgrade
-===========
-
-* You benefit from the latest features of the :ref:`new major version
-  <upgrade-faq/release-notes>` released by Odoo.
-* If you are in an :ref:`unsupported version <upgrade/supported-versions>`, you get a new version
-  with support.
-
-.. _upgrade-faq/when:
-
-When to upgrade
-===============
-
-Whenever you want. You can make your upgrade request as soon as a new version is released or when
-your version turns unsupported, and you still wish to enjoy support.
-
-.. _upgrade-faq/availability:
-
-Availability of the new version
-===============================
-
-As soon as Odoo announces the release of a new major version, you can create a test upgrade request
-to try the latest version. Please note that at this point, the upgrade scripts will only have been
-tested with demo data. Please report any issue you might encounter while testing via the `Odoo
-Support page <https://www.odoo.com/help>`_ and make sure to be happy with your test version before
-requesting the upgrade of your database in production.
-
-.. _upgrade-faq/duration:
-
-Duration of the upgrade
-=======================
-
-It is impossible to give time estimates for every upgrade request.
-
-In general, the "smaller" the database, the quickest the upgrade request is completed. A single-user
-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 to be similar to the
-production upgrade.
-
-.. _upgrade-faq/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.
-
-So, in a nutshell, what can impact your upgrade lead time?
-
-* Source & targeted versions
-* Installed apps
-* Volume of data
-* Amount of customization (models, fields, methods, workflows, reports, website, etc.)
-* Installation of new apps or configuration changes after the start of the test phase
-* User commitment
-
-.. _upgrade-faq/custom-modules:
-
-Upgrade of the custom modules
-=============================
-
-As stated in our :doc:`/legal/terms/enterprise`, section :ref:`charges_standard`, this optional
-service is subject to additional fees.
-
-Depending on your situation, the custom code could be upgraded by our services, by one of our
-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)
-==============================================
-
-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::
-    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>`_
-
-.. _upgrade-faq/hosting-types-switch:
-
-Switching the hosting types (Self-Hosting vs. Online Hosting - SaaS vs. Cloud Platform - Odoo.sh)
-=================================================================================================
-
-An upgrade does not cover a change of `Hosting types <https://www.odoo.com/page/hosting-types>`_.
-
-Open the following link to get :doc:`more information about how to change your hosting type
-<../maintain/hosting_changes>`.
-
-.. 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
-========================
-
-Open our `Release Note <https://www.odoo.com/page/release-notes>`_ page to get a summary of the new
-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>`_.
-
-- 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)**.
-
-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.
-
-Your data is hosted on servers that follow our security guidelines, namely:
-
-- SSL - All web connections to client instances are protected with 256-bit SSL encryption
-  (HTTPS with a 2048-bit modulus SSL certificate), and running behind Grade A SSL stacks. All our
-  certificate chains are using SHA-2 already.
-- Safe System - Our servers are running recent Linux distribution with up-to-date security patches,
-  with firewall and intrusion countermeasures (not disclosed for obvious reasons).
-
-Servers are located at the same locations as our Cloud providers with the following services:
-
-- Restricted perimeter, physically accessed by authorized data center employees only
-- Physical access control with security badges or biometrical security
-- Security cameras monitoring the data center locations 24/7
-- Security personnel on-site 24/7
-
-The uploaded and migrated databases uploaded to the Upgrade platform are kept for up to 3 months and
-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>`_.
-
-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,132 +0,0 @@
-=======
-Odoo.sh
-=======
-
-.. _upgrade/odoo_sh/overview:
-
-Overview
-========
-
-Odoo.sh is integrated with the upgrade platform to make the upgrade process easier.
-
-.. note::
-   The :guilabel:`Upgrade` tab is available in the branches view. It is only available for valid
-   projects with a valid production build.
-
-.. image:: odoo_sh/odoo-sh-menu.png
-   :align: center
-   :alt: Click on the upgrade menu
-
-The suggested upgrade steps on Odoo.sh are:
-
-#. On a :guilabel:`Development` branch, upgrade your custom modules to keep them compatible with the
-   new version and thoroughly **test them**.
-#. Switch that branch to the :guilabel:`Staging` branch, **upgrade** the last daily production
-   backup and **test it**. Write upgrade scripts if necessary.
-#. Trigger the production upgrade from your :guilabel:`Production` branch and sit tight.
-
-.. seealso::
-   - :doc:`../../administration/upgrade`
-   - :doc:`Upgrade FAQ <../upgrade/faq>`
-   - :doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`
-
-.. _upgrade/odoo_sh/custom-modules:
-
-Upgrade your custom modules
-===========================
-
-The first step is to upgrade your custom modules to keep them compatible with the new version. Fork
-your :guilabel:`Production` branch in the :guilabel:`Development` stage, then go to the settings of
-your :guilabel:`Development` branch and select the Odoo version you target. If needed, modify your
-code to be compatible with the new version. Make sure to **test** your features are still working
-correctly.
-
-.. note::
-   Depending on your contract, the upgrade of your custom modules can be done by yourself, by your
-   Partner or by Odoo (if you hold a subscription including maintenance of customizations).
-
-.. _upgrade/odoo_sh/testing-phase:
-
-Upgrade your database on a staging branch
-=========================================
-
-Take the upgraded development branch and drag & drop it to :guilabel:`Staging`.
-
-Go to the :guilabel:`Upgrade` tab and select the :guilabel:`target version`. Then, click on
-:guilabel:`Test Upgrade`.
-
-.. image:: odoo_sh/odoo-sh-staging.png
-   :align: center
-   :alt: Odoo.sh project and tabs
-
-The **latest production daily automatic backup** is sent to the
-`upgrade platform <https://www.upgrade.odoo.com>`_ to start the upgrade test process.
-
-.. note::
-   You can follow the upgrade process by going to the :guilabel:`Upgrade` menu of your
-   :guilabel:`Production` branch.
-
-When the upgraded backup is ready on the `upgrade platform <https://www.upgrade.odoo.com>`_, it is
-automatically downloaded back to your project.
-
-The branch is now in a **special mode**: each time a **commit is pushed** on the branch, a
-**restore operation** of the upgraded backup occurs, and an **update of all the custom modules**
-happens. This allows you to quickly iterate on your custom modules upgrade scripts. The log file of
-the upgrade process can be found at :file:`~/logs/upgrade.log` in your newly upgraded staging build.
-
-.. note::
-   - The **special upgrade mode** is automatically closed after 30 days.
-   - It may happen that custom modules are no longer needed after an upgrade. Custom modules in the
-     upgraded database are set to be updated. If the modules are missing in the code, the update
-     fails, thus failing the whole process. An empty module with a manifest and possibly some custom
-     upgrade script are necessary to clean up the database. The complete removal of the module has
-     to be handled afterwards.
-
-Functionally test your upgraded database
-========================================
-
-Now that the test upgraded database is available on your staging branch, **thoroughly test it** and
-make sure everything runs as it's supposed to. Once you are satisfied with the result, you are ready
-to upgrade your production database.
-
-Production upgrade
-==================
-
-Once you are happy with your testing, you can start the process on the :guilabel:`Production`
-branch.
-
-On your :guilabel:`Production` branch, go to the :guilabel:`Upgrade` tab, select the
-:guilabel:`targeted version` and click on the :guilabel:`start Upgrade` button.
-
-.. image:: odoo_sh/odoo-sh-prod.png
-   :align: center
-   :alt: View from the upgrade tab
-
-The actual process is **triggered as soon as you push a new commit** in your branch. Make sure you
-are pushing code that is compatible with the new version. For example by merging the code from your
-upgraded staging branch.
-
-.. note::
-   You can see the progress of the upgrade by going to the :guilabel:`Upgrade` tab of the main
-   branch.
-
-.. image:: odoo_sh/odoo-sh-progress.png
-   :align: center
-   :alt: View showing the progress of the upgrade
-
-.. important::
-   Your database is unavailable throughout the process.
-
-.. note::
-   If anything goes wrong, the platform automatically reverts the upgrade, the same as it would be
-   for a regular update. In case of success, a backup is always made.
-
-The update of your custom modules must be successful to complete the entire upgrade process. Make
-sure the status of your staging upgrade is :guilabel:`successful` before trying it in production.
-
-.. note::
-   It may happen that custom modules are no longer needed after an upgrade. Custom modules in the
-   upgraded database are set to be updated. If the modules are missing in the code, the update
-   fails, thus failing the whole process. An empty module with a manifest and possibly some custom
-   upgrade script are necessary to clean up the database. The complete removal of the module has to
-   be handled afterwards.