[IMP] marketing: sms pricing and faq doc updates

X-original-commit: 1591e1f087

.gitattributes

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

.github/CODEOWNERS

@@ -1,11 +0,0 @@
-# All changes to technical files (build environment and Sphinx extensions) have to be approved
-/extensions/         @odoo/doc-review
-.gitignore           @odoo/doc-review
-commit_template.txt  @odoo/doc-review
-conf.py              @odoo/doc-review
-Makefile             @odoo/doc-review
-requirements.txt     @odoo/doc-review
-
-# All changes to legal material have to be approved
-/content/legal/     @odoo/legal
-/content/legal.rst  @odoo/legal

.gitignore

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

.tx/config

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

Makefile

@@ -19,12 +19,14 @@ SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSIO
                  -D versions=$(VERSIONS) -D languages=$(LANGUAGES) -D language=$(CURRENT_LANG) \
                  -D is_remote_build=$(IS_REMOTE_BUILD) \
                  -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \
+                 -A plausible_script=$(PLAUSIBLE_SCRIPT) \
+                 -A plausible_domain=$(PLAUSIBLE_DOMAIN) \
 				 -j $(WORKERS)
 SOURCE_DIR     = content
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/15.0
 endif
 ifneq ($(CURRENT_LANG),en)
   HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)
@@ -40,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..."
@@ -53,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
@@ -69,7 +72,7 @@ gettext:
 $(HTML_BUILD_DIR)/_static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss
 	@echo "Compiling stylesheets..."
 	mkdir -p $(HTML_BUILD_DIR)/_static
-	pysassc extensions/odoo_theme/static/style.scss $(HTML_BUILD_DIR)/_static/style.css
+	python3 -m pysassc extensions/odoo_theme/static/style.scss $(HTML_BUILD_DIR)/_static/style.css
 	@echo "Compilation finished."
 
 #=== Development and debugging rules ===#
@@ -77,6 +80,9 @@ $(HTML_BUILD_DIR)/_static/style.css: extensions/odoo_theme/static/style.scss ext
 fast: SPHINXOPTS += -A collapse_menu=True
 fast: html
 
-static: $(HTML_BUILD_DIR)/static/style.css
+static: $(HTML_BUILD_DIR)/_static/style.css
 	cp -r extensions/odoo_theme/static/* $(HTML_BUILD_DIR)/_static/
 	cp -r static/* $(HTML_BUILD_DIR)/_static/
+
+test:
+	python tests/rst_style.py $(SOURCE_DIR)

README.md

@@ -4,47 +4,33 @@
 
 ### Requirements
 
-- [Git](https://www.odoo.com/documentation/master/contributing/documentation.html#install-git)
-- [Python 3.6, 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.
-
-If you have a pull request that is ready for review, request one from the
-[odoo/doc-review](https://github.com/orgs/odoo/teams/doc-review) team.
-
+[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,11 +1,14 @@
-import re
 import os
+import re
+import shutil
 import sys
 from pathlib import Path
 
-from pygments.lexers import JsonLexer, XmlLexer
-from sphinx.util import logging
+import docutils
 import sphinx
+from pygments.lexers import JsonLexer, XmlLexer
+from sphinx.ext import graphviz
+from sphinx.util import logging
 
 _logger = logging.getLogger(__name__)
 
@@ -16,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 = '15.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'
@@ -48,52 +65,85 @@ exclude_patterns = [
 # See https://docutils.sourceforge.io/docs/ref/rst/roles.html#standard-roles for other roles.
 default_role = 'literal'
 
+
+# Whether scaled down images should be be wrapped in a `<a/>` tag linking to the image file or not.
+html_scaled_image_link = False
+
 # If true, '()' will be appended to :func: etc. cross-reference text
 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}',
+}
+
 # Add extensions directory to PYTHONPATH
 extension_dir = Path('extensions')
 sys.path.insert(0, str(extension_dir.absolute()))
 
 # Search for the directory of odoo sources to know whether autodoc should be used on the dev doc
-odoo_dir = Path('odoo')
+odoo_sources_candidate_dirs = (Path('odoo'), Path('../odoo'))
+odoo_sources_dirs = [
+    d for d in odoo_sources_candidate_dirs if d.is_dir() and (d / 'odoo-bin').exists()
+]
 odoo_dir_in_path = False
-if not odoo_dir.is_dir():
-    parent_odoo_dir = Path('../odoo')
-    if parent_odoo_dir.is_dir():
-        _logger.info('Using parent dir to find odoo sources')
-        odoo_dir = parent_odoo_dir
-if not odoo_dir.is_dir():
+
+if not odoo_sources_dirs:
     _logger.warning(
-        f"Could not find Odoo sources directory at {odoo_dir.absolute()}.\n"
-        f"The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
-        f"In order to fully build the 'Developer' documentation, clone the repository with "
-        f"`git clone https://github.com/odoo/odoo` or create a symbolink link."
+        "Could not find Odoo sources directory in neither of the following folders:\n"
+        "%(dir_list)s\n"
+        "The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
+        "In order to fully build the 'Developer' documentation, clone the repository with "
+        "`git clone https://github.com/odoo/odoo` or create a symbolic link.",
+        {'dir_list': '\n'.join([f'\t- {d.resolve()}' for d in odoo_sources_candidate_dirs])},
     )
 else:
-    sys.path.insert(0, str(odoo_dir.absolute()))
+    if (3, 6) < sys.version_info < (3, 7):
+        # Running odoo needs python 3.7 min but monkey patch version_info to be compatible with 3.6.
+        sys.version_info = (3, 7, 0)
+    odoo_dir = odoo_sources_dirs[0].resolve()
+    source_read_replace_vals['ODOO_RELPATH'] = '/../' + str(odoo_sources_dirs[0])
+    sys.path.insert(0, str(odoo_dir))
+    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 if 'alpha' not in odoo_release.version else 'master'
+    odoo_version = odoo_release.version.replace('~', '-') \
+        if 'alpha' not in odoo_release.version else 'master'
     if release != odoo_version:
         _logger.warning(
-            f"Found Odoo sources directory but with version '{odoo_version}' incompatible with "
-            f"documentation version '{version}'.\n"
-            f"The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
-            f"In order to fully build the 'Developer' documentation, checkout the matching branch"
-            f" with `cd odoo && git checkout {version}`."
+            "Found Odoo sources in %(directory)s but with version '%(odoo_version)s' incompatible "
+            "with documentation version '%(doc_version)s'.\n"
+            "The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
+            "In order to fully build the 'Developer' documentation, checkout the matching branch"
+            " with `cd odoo && git checkout %(doc_version)s`.",
+            {'directory': odoo_dir, 'odoo_version': odoo_version, 'doc_version': version},
         )
     else:
-        _logger.info(f"Found Odoo sources directory matching documentation version {release}.")
+        _logger.info(
+            "Found Odoo sources in %(directory)s matching documentation version '%(version)s'.",
+            {'directory': odoo_dir, 'version': release},
+        )
         odoo_dir_in_path = True
 
+# Mapping between odoo models related to master data and the declaration of the
+# data. This is used to point users to available xml_ids when giving values for
+# a field with the autodoc_field extension.
+model_references = {
+    'account.account.type': 'addons/account/data/data_account_type.xml',
+    'res.country': 'odoo/addons/base/data/res_country_data.xml',
+    'res.currency': 'odoo/addons/base/data/res_currency_data.xml',
+}
+
 # The Sphinx extensions to use, as module names.
 # They can be extensions coming with Sphinx (named 'sphinx.ext.*') or custom ones.
 extensions = [
-    # Parse Python docstrings (autodoc, automodule, autoattribute directives)
-    'sphinx.ext.autodoc' if odoo_dir_in_path else 'autodoc_placeholder',
-
     # Link sources in other projects (used to build the reference doc)
     'sphinx.ext.intersphinx',
 
@@ -106,23 +156,35 @@ extensions = [
     # Youtube and Vimeo videos integration (youtube, vimeo directives)
     'embedded_video',
 
-    'exercise_admonition',
+    'custom_admonitions',
 
     # Redirection generator
     'redirects',
 
-    # Code switcher (switcher and case directives)
-    'switcher',
+    # Content tabs
+    'sphinx_tabs.tabs',
+
+    # Spoilers
+    'spoilers',
 
     # Strange html domain logic used in memento pages
     'html_domain',
 ]
+
 if odoo_dir_in_path:
     # GitHub links generation
     extensions += [
         'sphinx.ext.linkcode',
         'github_link',
+        # Parse Python docstrings (autodoc, automodule, autoattribute directives)
+        'sphinx.ext.autodoc',
+        'autodoc_field',
     ]
+else:
+    extensions += [
+        'autodoc_placeholder',
+    ]
+extensions.append('sphinx.ext.graphviz' if shutil.which('dot') else 'graphviz_placeholder')
 
 todo_include_todos = False
 
@@ -142,19 +204,36 @@ sphinx.transforms.i18n.docname_to_domain = (
     sphinx.util.i18n.docname_to_domain
 ) = lambda docname, compact: docname.split('/')[1 if docname.startswith('applications/') else 0]
 
-supported_languages = {
-    'de': 'Deutsch',
-    'en': 'English',
-    'es': 'Español',
-    'fr': 'Français',
-    'nl': 'Nederlands',
-    'pt_BR': 'Português (BR)',
-    'uk': 'українська',
-    'zh_CN': '简体中文',
+# The version names that should be shown in the version switcher, if the config option `versions`
+# is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
+versions_names = {
+    'master': "Master",
+    '16.0': "Odoo 16",
+    'saas-15.2': "Odoo Online",
+    '15.0': "Odoo 15",
+    '14.0': "Odoo 14",
+    '13.0': "Odoo 13",
 }
 
-# The specifications of redirect rules used by the redirects extension.
-redirects_file = 'redirects.txt'
+# The language names that should be shown in the language switcher, if the config option `languages`
+# is populated. If a language is passed to `languages` but is not listed here, it will not be shown.
+languages_names = {
+    'de': 'DE',
+    'en': 'EN',
+    'es': 'ES',
+    'fr': 'FR',
+    'nl': 'NL',
+    'pt_BR': 'PT',
+    'ro': 'RO',
+    'uk': 'UA',
+    'zh_CN': 'ZH',
+}
+
+# The directory in which files holding redirect rules used by the 'redirects' extension are listed.
+redirects_dir = 'redirects/'
+
+sphinx_tabs_disable_tab_closing = True
+sphinx_tabs_disable_css_loading = True
 
 #=== Options for HTML output ===#
 
@@ -175,8 +254,8 @@ html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'img', 'fa
 # They are copied after the builtin static files, so a file named "default.css" will overwrite the
 # builtin "default.css".
 html_static_path = ['static']
-html_add_permalinks = '¶'  # Sphinx < 3.5
-html_permalinks = True  # Sphinx >= 3.5
+html_permalinks = True
+
 # Additional JS & CSS files that can be imported with the 'custom-js' and 'custom-css' metadata.
 # Lists are empty because the files are specified in extensions/themes.
 html_js_files = []
@@ -198,7 +277,7 @@ latex_elements = {
     'tableofcontents': '',  # no TOC
 
     # Output manually in latex docs
-    'releasename': '14.0',
+    'releasename': release,
 }
 
 latex_additional_files = ['static/latex/odoo.sty']
@@ -218,7 +297,7 @@ 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'),
@@ -238,6 +317,21 @@ latex_logo = 'static/img/odoo_logo.png'
 # If true, show URL addresses after external links.
 latex_show_urls = 'True'
 
+# https://github.com/sphinx-doc/sphinx/issues/4054#issuecomment-329097229
+def source_read_replace(app, docname, source):
+    """Substitute parts of strings with computed values.
+
+    Since the RST substitution is not working everywhere, i.e. in directives'
+    options, we need to be able to input those values when reading the sources.
+    This is using the config `source_read_replace_vals`, mapping a name to its
+    replacement. This will look for the name surrounded by curly braces in the source.
+
+    Meant to be connected to the `source-read` event.
+    """
+    result = source[0]
+    for key in app.config.source_read_replace_vals:
+        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
@@ -246,12 +340,34 @@ def setup(app):
     app.add_config_value('versions', None, 'env')
     app.add_config_value('languages', None, 'env')
     app.add_config_value('is_remote_build', None, 'env')  # Whether the build is remotely deployed
+    app.add_config_value('source_read_replace_vals', {}, 'env')
+    app.connect('source-read', source_read_replace)
 
     app.add_lexer('json', JsonLexer)
     app.add_lexer('xml', XmlLexer)
 
     app.connect('html-page-context', _generate_alternate_urls)
 
+    # Add a `condition` option on directives to ignore them based on config values
+    app.add_config_value('odoo_dir_in_path', None, 'env')
+    def context_eval(expr):
+        return eval(expr, {confval.name: confval.value for confval in app.config})
+
+    def patch(to_patch):
+        to_patch.option_spec['condition'] = context_eval
+        original_run = to_patch.run
+        def new_run(self):
+            if not self.options.get('condition', True):
+                return []
+            return original_run(self)
+        to_patch.run = new_run
+
+    for to_patch in (
+        sphinx.directives.code.LiteralInclude,
+        docutils.parsers.rst.directives.tables.CSVTable,
+    ):
+        patch(to_patch)
+
 
 def _generate_alternate_urls(app, pagename, templatename, context, doctree):
     """ Add keys of required alternate URLs for the current document in the rendering context.
@@ -283,15 +399,18 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
 
         The entry 'version' is added by Sphinx in the rendering context.
         """
-        # If the list of versions is not set, assume that the project has no alternate version
-        _alternate_versions = app.config.versions and app.config.versions.split(',') or []
-        context['alternate_versions'] = [
-            (_alternate_version, _build_url(_version=_alternate_version))
-            for _alternate_version in sorted(_alternate_versions, reverse=True)
-            if _alternate_version != version and (
-                _alternate_version != 'master' or pagename.startswith('developer')
-            )
-        ]
+        context['version_display_name'] = versions_names[version]
+
+        # If the list of versions is not set, assume the project has no alternate version
+        _provided_versions = app.config.versions and app.config.versions.split(',') or []
+
+        # Map alternate versions to their display names and URLs.
+        context['alternate_versions'] = []
+        for _alternate_version, _display_name in versions_names.items():
+            if _alternate_version in _provided_versions and _alternate_version != version:
+                context['alternate_versions'].append(
+                    (_display_name, _build_url(_alternate_version))
+                )
 
     def _localize():
         """ Add the pairs of (lang, code, url) for the current document in the rendering context.
@@ -301,20 +420,24 @@ 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")
-        context['language'] = supported_languages.get(_current_lang)
+        # 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
-        _alternate_languages = app.config.languages and app.config.languages.split(',') or []
-        context['alternate_languages'] = [
-            (
-                supported_languages.get(_alternate_lang),
-                _alternate_lang.split('_')[0] if _alternate_lang != 'en' else 'x-default',
-                _build_url(_lang=_alternate_lang),
-            )
-            for _alternate_lang in _alternate_languages
-            if _alternate_lang in supported_languages and _alternate_lang != _current_lang
-        ]
+        _provided_languages = app.config.languages and app.config.languages.split(',') or []
+
+        # Map alternate languages to their display names and URLs.
+        context['alternate_languages'] = []
+        for _alternate_lang, _display_name in languages_names.items():
+            if _alternate_lang in _provided_languages and _alternate_lang != _current_lang:
+                context['alternate_languages'].append(
+                    (
+                        _display_name,
+                        _alternate_lang.split('_')[0] if _alternate_lang != 'en' else 'x-default',
+                        _build_url(_lang=_alternate_lang),
+                    )
+                )
 
     def _build_url(_version=None, _lang=None):
         if app.config.is_remote_build:

content/administration.rst

@@ -18,4 +18,5 @@ These guides provide instructions on how to install, maintain and upgrade Odoo d
 
     administration/install
     administration/maintain
+    administration/upgrade
     administration/odoo_sh

content/administration/install.rst

@@ -4,6 +4,8 @@
 Install
 =======
 
+.. If you add content on this page, remove the redirect rule 'install -> install/install'
+
 .. toctree::
 
     install/install

content/administration/install/deploy.rst

@@ -7,7 +7,7 @@ internet-facing server. It follows :ref:`installation <setup/install>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.
 
-.. warning:: If you are setting up a public server, be sure to check our :ref:`security` recommandations!
+.. warning:: If you are setting up a public server, be sure to check our :ref:`security` recommendations!
 
 .. _db_filter:
 
@@ -299,7 +299,7 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
   }
 
   server {
-    listen 443;
+    listen 443 ssl;
     server_name odoo.mycompany.com;
     proxy_read_timeout 720s;
     proxy_connect_timeout 720s;
@@ -312,7 +312,6 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
     proxy_set_header X-Real-IP $remote_addr;
 
     # SSL parameters
-    ssl on;
     ssl_certificate /etc/ssl/nginx/server.crt;
     ssl_certificate_key /etc/ssl/nginx/server.key;
     ssl_session_timeout 30m;
@@ -517,6 +516,7 @@ security-related topics:
 
 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.

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>
@@ -44,4 +48,4 @@ For Exim
 
 .. tip::
    If you don't have access/manage your email server, use :ref:`inbound messages
-   <discuss/email_servers/inbound_messages>`.
+   <email_communication/inbound_messages>`.

content/administration/install/install.rst

@@ -33,7 +33,7 @@ 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
+Using the Enterprise version is possible on `Odoo Online`_ and accessing the code is
 restricted to Enterprise customers and partners. The Community version is freely
 available to anyone.
 
@@ -55,17 +55,17 @@ around and try things out with no commitment.
 
 Demo_ instances require no local installation, just a web browser.
 
-SaaS
-----
+Odoo Online
+-----------
 
-Trivial to start with, fully managed and migrated by Odoo S.A., Odoo's SaaS_
+Trivial to start with, fully managed and migrated by Odoo S.A., `Odoo Online`_
 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
+Like demo_ instances, `Odoo Online`_ instances require no local installation, a web
 browser is sufficient.
 
 
@@ -105,12 +105,13 @@ Linux
 -----
 
 Debian/Ubuntu
-'''''''''''''
+~~~~~~~~~~~~~
 
-Odoo 13.0 'deb' package currently supports `Debian Buster`_, `Ubuntu 18.04`_ or above.
+Odoo {CURRENT_MAJOR_VERSION} 'deb' package currently supports `Debian 11 (Bullseye)`_,
+`Ubuntu 20.04 (Focal)`_ or above.
 
 Prepare
-^^^^^^^
+*******
 
 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
@@ -126,7 +127,7 @@ Odoo instance. Execute the following command in order to install the PostgreSQL
              details on the various versions.
 
 Repository
-^^^^^^^^^^
+**********
 
 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**:
@@ -134,7 +135,7 @@ used to install *Odoo Community Edition* by executing the following commands **a
 .. code-block:: console
 
     # wget -O - https://nightly.odoo.com/odoo.key | apt-key add -
-    # echo "deb http://nightly.odoo.com/13.0/nightly/deb/ ./" >> /etc/apt/sources.list.d/odoo.list
+    # echo "deb http://nightly.odoo.com/{CURRENT_MAJOR_BRANCH}/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.
@@ -142,7 +143,7 @@ You can then use the usual `apt-get upgrade` command to keep your installation u
 At this moment, there is no nightly repository for the Enterprise Edition.
 
 Deb Package
-^^^^^^^^^^^
+***********
 
 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_>`_.
@@ -178,12 +179,13 @@ and automatically start the server.
                 $ sudo pip3 install num2words
 
 Fedora
-''''''
+~~~~~~
 
-Odoo 13.0 'rpm' package supports Fedora 30.
+Odoo {CURRENT_MAJOR_VERSION} 'rpm' package supports Fedora 34.
 
 Prepare
-^^^^^^^
+*******
+
 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:
@@ -201,7 +203,7 @@ server:
              details on the various versions.
 
 Repository
-^^^^^^^^^^
+**********
 
 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
@@ -209,13 +211,13 @@ commands:
 
 .. code-block:: console
 
-    $ sudo dnf config-manager --add-repo=https://nightly.odoo.com/13.0/nightly/rpm/odoo.repo
+    $ 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
 
 RPM package
-^^^^^^^^^^^
+***********
 
 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_>`_.
@@ -224,7 +226,7 @@ Once downloaded, the package can be installed using the 'dnf' package manager:
 
 .. code-block:: console
 
-    $ sudo dnf localinstall odoo_13.0.latest.noarch.rpm
+    $ sudo dnf localinstall odoo_{CURRENT_MAJOR_BRANCH}.latest.noarch.rpm
     $ sudo systemctl enable odoo
     $ sudo systemctl start odoo
 
@@ -237,9 +239,8 @@ 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 can be more convenient for module developers as the Odoo source is more easily accessible than
+using packaged installation.
 
 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
@@ -248,16 +249,18 @@ packaged installations, and allows overriding settings using
 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.
 
+.. _setup/install/source/windows:
+
 Windows
 -------
 
 Fetch the sources
-'''''''''''''''''
+~~~~~~~~~~~~~~~~~
 
 There are two ways to obtain the source code of Odoo: as a zip **archive** or through **git**.
 
 Archive
-^^^^^^^
+*******
 
 Community Edition:
 
@@ -270,45 +273,56 @@ Enterprise Edition:
 * `Official download page <download_>`_
 * `GitHub repository <enterprise-repository_>`_
 
+.. _setup/install/source/windows/git:
+
 Git
-^^^
+***
 
-The following requires git_ to be installed on your machine and that you have basic knowledge of
-git commands.
+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.
 
-Community Edition:
+.. 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.
 
-.. code-block:: doscon
+.. tabs::
 
-    C:\> git clone https://github.com/odoo/odoo.git
+   .. tab:: Clone with HTTPS
 
+      .. code-block:: doscon
 
-Enterprise Edition: (see :ref:`setup/install/editions` to get access)
+         C:\> git clone https://github.com/odoo/odoo.git
+         C:\> git clone https://github.com/odoo/enterprise.git
 
-.. code-block:: doscon
+   .. tab:: Clone with SSH
 
-  C:\> git clone https://github.com/odoo/enterprise.git
+      .. code-block:: doscon
 
-.. 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.
+         C:\> git clone git@github.com:odoo/odoo.git
+         C:\> git clone git@github.com:odoo/enterprise.git
+
+.. _setup/install/source/windows/prepare:
 
 Prepare
-'''''''
+~~~~~~~
 
 Python
-^^^^^^
+******
 
-Odoo requires Python 3.6 or later to run. Visit `Python's download page <https://www.python.org/downloads/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.6 or above, as previous
+.. 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
@@ -322,7 +336,7 @@ sure that **pip** is checked.
               C:\> pip --version
 
 PostgreSQL
-^^^^^^^^^^
+**********
 
 Odoo uses PostgreSQL as database management system. `Download and install PostgreSQL <https://www.postgresql.org/download/windows/>`_
 (supported version: 10.0 and later).
@@ -343,7 +357,7 @@ create a new PostgreSQL user:
       `Yes`.
 
 Dependencies
-^^^^^^^^^^^^
+************
 
 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>`_.
@@ -383,7 +397,7 @@ needed:
    (typically: `C:\\Users\\<user>\\AppData\\Roaming\\npm\\`).
 
 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.
@@ -409,19 +423,34 @@ A typical way to run the server would be:
 
 Where `CommunityPath` is the path of the Odoo Community installation, `dbuser` is the
 PostgreSQL login, `dbpassword` is the PostgreSQL password
-and `mydb` is the default database to serve on `localhost:8069`. You can add other
-directory paths separated by a comma to ``addons`` at the end of the addons-path option.
+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/source/linux:
 
 Linux
 -----
 
 Fetch the sources
-'''''''''''''''''
+~~~~~~~~~~~~~~~~~
 
 There are two ways to obtain the source code of Odoo: as a zip **archive** or through **git**.
 
 Archive
-^^^^^^^
+*******
 
 Community Edition:
 
@@ -434,42 +463,53 @@ Enterprise Edition:
 * `Official download page <download_>`_
 * `GitHub repository <enterprise-repository_>`_
 
+.. _setup/install/source/linux/git:
+
 Git
-^^^
+***
 
-The following requires git_ to be installed on your machine and that you have basic knowledge of
-git commands.
+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.
 
-Community Edition:
+.. 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.
 
-.. code-block:: console
+.. tabs::
 
-    $ git clone https://github.com/odoo/odoo.git
+   .. tab:: Clone with HTTPS
 
+      .. code-block:: console
 
-Enterprise Edition: (see :ref:`setup/install/editions` to get access)
+         $ git clone https://github.com/odoo/odoo.git
+         $ git clone https://github.com/odoo/enterprise.git
 
-.. code-block:: console
+   .. tab:: Clone with SSH
 
-  $ git clone https://github.com/odoo/enterprise.git
+      .. code-block:: console
 
-.. 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.
+         $ git clone git@github.com:odoo/odoo.git
+         $ git clone git@github.com:odoo/enterprise.git
+
+.. _setup/install/source/linux/prepare:
 
 Prepare
-'''''''
+~~~~~~~
 
 Python
-^^^^^^
+******
 
-Odoo requires Python 3.6 or later to run. Use your package manager to download and install Python 3
+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.6 or above, as previous
+.. 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
@@ -483,7 +523,7 @@ on your machine if it is not already done.
               $ pip3 --version
 
 PostgreSQL
-^^^^^^^^^^
+**********
 
 Odoo uses PostgreSQL as database management system. Use your package manager to download and install
 PostgreSQL (supported version: 10.0 and later).
@@ -506,7 +546,7 @@ create a new PostgreSQL user:
           connect to the database without password.
 
 Dependencies
-^^^^^^^^^^^^
+************
 
 For libraries using native code, it is necessary to install development tools and native
 dependencies before the Python dependencies of Odoo. They are available in `-dev` or `-devel`
@@ -551,7 +591,7 @@ needed:
        $ sudo npm install -g rtlcss
 
 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.
@@ -578,19 +618,34 @@ A typical way to run the server would be:
     $ python3 odoo-bin --addons-path=addons -d mydb
 
 Where `CommunityPath` is the path of the Odoo Community installation
-and `mydb` is the default database to serve on `localhost:8069`. You can add other
-directory paths separated by a comma to ``addons`` at the end of the addons-path option.
+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/source/mac_os:
 
 Mac OS
 ------
 
 Fetch the sources
-'''''''''''''''''
+~~~~~~~~~~~~~~~~~
 
 There are two ways to obtain the source code of Odoo: as a zip **archive** or through **git**.
 
 Archive
-^^^^^^^
+*******
 
 Community Edition:
 
@@ -603,42 +658,53 @@ Enterprise Edition:
 * `Official download page <download_>`_
 * `GitHub repository <enterprise-repository_>`_
 
+.. _setup/install/source/mac_os/git:
+
 Git
-^^^
+***
 
-The following requires git_ to be installed on your machine and that you have basic knowledge of
-git commands.
+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.
 
-Community Edition:
+.. 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.
 
-.. code-block:: console
+.. tabs::
 
-    $ git clone https://github.com/odoo/odoo.git
+   .. tab:: Clone with HTTPS
 
+      .. code-block:: console
 
-Enterprise Edition: (see :ref:`setup/install/editions` to get access)
+         $ git clone https://github.com/odoo/odoo.git
+         $ git clone https://github.com/odoo/enterprise.git
 
-.. code-block:: console
+   .. tab:: Clone with SSH
 
-  $ git clone https://github.com/odoo/enterprise.git
+      .. code-block:: console
 
-.. 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.
+         $ git clone git@github.com:odoo/odoo.git
+         $ git clone git@github.com:odoo/enterprise.git
+
+.. _setup/install/source/mac_os/prepare:
 
 Prepare
-'''''''
+~~~~~~~
 
 Python
-^^^^^^
+******
 
-Odoo requires Python 3.6 or later to run. Use your preferred package manager (homebrew_, macports_)
+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.6 or above, as previous
+.. 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
@@ -652,11 +718,16 @@ to download and install Python 3 on your machine if it is not already done.
               $ pip3 --version
 
 PostgreSQL
-^^^^^^^^^^
+**********
 
 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:
 
@@ -669,7 +740,7 @@ create a new PostgreSQL user:
           connect to the database without password.
 
 Dependencies
-^^^^^^^^^^^^
+************
 
 Odoo dependencies are listed in the `requirements.txt` file located at the root of the Odoo
 community directory.
@@ -713,7 +784,7 @@ needed:
        $ sudo npm install -g rtlcss
 
 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.
@@ -740,9 +811,26 @@ A typical way to run the server would be:
     $ python3 odoo-bin --addons-path=addons -d mydb
 
 Where `CommunityPath` is the path of the Odoo Community installation
-and `mydb` is the default database to serve on `localhost:8069`. You can add other
-directory paths separated by a comma to ``addons`` at the end of the addons-path option.
+and `mydb` is the name of the PostgreSQL database.
 
+.. warning::
+   Some versions of python on Mac might lead to the following error message: `current limit exceeds
+   maximum limit`. In that case, add the following parameter `--limit-memory-hard 0` to avoid the
+   problem.
+
+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:
 
@@ -750,20 +838,20 @@ Docker
 ======
 
 The full documentation on how to use Odoo with Docker can be found on the
-official Odoo `docker image <https://registry.hub.docker.com/_/odoo/>`_ page.
+official Odoo `docker image <https://hub.docker.com/_/odoo/>`_ page.
 
-.. _Debian Buster: https://www.debian.org/releases/buster/
+.. _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 18.04: http://releases.ubuntu.com/18.04/
+.. _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
+.. _Odoo Online: 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

content/administration/maintain.rst

@@ -6,9 +6,13 @@ Maintain
 
 .. toctree::
 
+    maintain/domain_names
+    maintain/azure_oauth
+    maintain/google_oauth
+    maintain/mailjet_api
     maintain/update
-    maintain/db_upgrade
     maintain/enterprise
     maintain/hosting_changes
-    maintain/db_premise
+    maintain/odoo_online
+    maintain/on_premise
     maintain/supported_versions

content/administration/maintain/azure_oauth.rst

@@ -0,0 +1,216 @@
+=======================================================
+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>`_
+
+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 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 Azure AD 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 (IMAP) 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:`Deregulated 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_from>`.
+
+Then, cick 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.
+
+Multiple user configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Each user should have a separate server set up. The :guilabel:`from-filter` 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-filter` is able to use this server.
+
+After setting the :guilabel:`from-filter`, set up a fallback email account to allow for the sending
+of :guilabel:`notifications`. The fallback email must be configured as a :guilabel:`general
+transactional server`. The :guilabel:`mail.default.from` system parameter must be set to the
+:guilabel:`username` of the general transactional server account. For more information see
+:ref:`Use a default email address <email_communication/default>`.
+
+.. note::
+   The :guilabel:`System Parameters` can be accessed by activating
+   :doc:`../../applications/general/developer_mode` in the :menuselection:`Settings --> Technical
+   --> Parameters --> System Parameters` menu.
+
+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/db_upgrade.rst

@@ -1,413 +0,0 @@
-
-.. |assistance-contact| replace::
-   If you need Odoo assistance on this matter, please contact your Odoo Account Manager or contact
-   our `Sales department`_.
-.. _Sales department: mailto:sales@odoo.com
-
-.. _db-upgrade:
-
-================
-Versions upgrade
-================
-
-.. _db-upgrade/overview:
-
-Overview
-========
-
-.. _db-upgrade/process:
-
-The upgrade process
--------------------
-
-This documentation is for our *On-Premise* (self-hosted) and *Odoo.sh* customers.
-
-.. _db-upgrade/definition:
-
-Definition
-~~~~~~~~~~
-
-An upgrade is switching to a newer version of Odoo (e.g., Odoo 13.0 to Odoo 14.0)
-
-An upgrade does not cover:
-
-* changing :ref:`Editions <db-upgrade/faq/editions-change>` (i.e., Community to Enterprise edition)
-* switching :ref:`hosting type <db-upgrade/faq/hosting-types-switch>` (i.e., On-Premise to Online or
-  Odoo.sh)
-* migration from another ERP to Odoo
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/process-workflow:
-
-Process workflow
-~~~~~~~~~~~~~~~~
-
-The upgrade process in a nutshell:
-
-#. You create a test upgrade request.
-#. | The request is processed by Odoo:
-   | This happens via an automated process that runs the database through an upgrade script and
-     takes between 20 and 120 minutes. Only if an issue(s) arises will we have to intervene
-     manually and adjust the script specifically to your database until the upgrade succeeds.
-#. Odoo delivers a test database.
-#. You test your database for possible discrepancies (see :ref:`db-upgrade/test-guidance`)
-#. If there are any discrepancies, you report them to the Upgrade support team via the
-   :ref:`Help portal <db-upgrade/test-assistance>`.
-#. We will fix the issues and send you a new test database.
-#. Once you 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.
-
-.. _db-upgrade/service-level:
-
-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 service at all times.
-
-The upgrade of:
-
-* standard applications
-* Studio customization (as long as the 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 the technical conversion and adaptation of your database (standard
-modules and data) to make it compatible with the targeted version.
-
-What upgrading does NOT cover
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* The cleaning of pre-existing data & configuration while upgrading
-* Any new developments and/or upgrade of your own :ref:`custom modules
-  <db-upgrade/faq/custom-modules>`
-* `Training <https://www.odoo.com/learn>`_ on the new version
-
-You can get more information about your Enterprise Licence on our :ref:`Odoo Enterprise Subscription
-Agreement <upgrade>` page.
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/get-started:
-
-Get started
-===========
-
-The upgrade process varies depending on where your database is hosted.
-
-.. _db-upgrade/online:
-
-Online (SaaS)
--------------
-
-If you are hosted Online, please check your `database manager <https://www.odoo.com/my/databases>`_.
-
-.. _db-upgrade/odoo-sh:
-
-Odoo.sh
--------
-
-If you are Odoo.sh hosted, check our :doc:`specific instructions to be able to upgrade
-<../odoo_sh/advanced/upgrade_your_database>`.
-
-.. _db-upgrade/on-premise:
-
-On-Premise
-----------
-
-There are two possibilities:
-
-#. Via the interface of our `website form <https://upgrade.odoo.com>`_
-#. | For technically-advanced users and partners, via the following command line (to be used on the
-     machine where your database is hosted):
-   | ``python <(curl -s beta.upgrade.odoo.com/upgrade) test -d <your db name> -t 14.0``
-
-What does it do?
-~~~~~~~~~~~~~~~~
-
-The above command will dump your database to a file, then send it to the upgrade platform for
-upgrade, displaying you the live logs, then restore the upgraded database back on your server as a
-duplicate test database.
-
-.. _db-upgrade/steps:
-
-Steps
-=====
-
-.. _db-upgrade/steps-test:
-
-The testing phase
------------------
-
-.. _db-upgrade/test-process:
-
-Test process
-~~~~~~~~~~~~
-
-Also referred to as the pre-production phase, the test 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 often as you
-want (one at a time).
-
-Once you receive your upgraded test database, you should check that all data, processes and
-functionality are still correct and working as expected.
-
-If you do find discrepancies, you'll be able to:
-
-* | :ref:`Report your issues <db-upgrade/test-assistance>`
-  | and/or
-* Ask for a new :ref:`test request <db-upgrade/test-db-request>` after the reported issues have
-  been fixed in the upgrade script.
-
-When you do not find any discrepancies, you'll be able to:
-
-* Move on to the upgrade of your :ref:`production database <db-upgrade/production-live>`.
-
-.. _db-upgrade/test-db-request:
-
-Request a test database
-~~~~~~~~~~~~~~~~~~~~~~~
-
-When filling the `website form <https://upgrade.odoo.com>`_, select *Testing* purpose.
-
-.. image:: media/db-upgrade-test-purpose.png
-   :align: center
-   :alt: Selection of the "Testing" purpose in the upgrade form on Odoo
-
-.. _db-upgrade/test-guidance:
-
-Test guidance
-~~~~~~~~~~~~~
-
-Every business and organization has its own operational needs and will have to test its specific
-Odoo instance respectively. However, we recommend you look at `the test scenario
-<https://drive.google.com/open?id=1Lm4JqbsHBirB1wMi14UChoz_YHLjx5ec>`_ we created, a high-level idea
-of what you should test and look out for.
-
-.. todo:: change link "test scenario" once the related doc is published
-
-.. _db-upgrade/test-assistance:
-
-Assistance
-~~~~~~~~~~
-
-If you encounter issues or problems in the **test database**, please contact the Odoo Upgrade
-Support:
-
-#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
-#. Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
-
-   .. image:: media/db-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 than the upgrade one and will slow down the processing and response time.
-
-#. Please provide as much detail as you can. Where applicable, illustrate the current and previous
-   flows with videos and/or screenshots. This will avoid clarifying questions and speed up the
-   resolution process significantly.
-
-   .. image:: media/db-upgrade-test-assistance-details.png
-      :align: center
-      :alt: "Detailed Description" field in the support form on Odoo
-
-.. note::
-   * The purpose of the test phase is not to correct existing data or configurations in your
-     database.
-   * |assistance-contact|
-
-.. _db-upgrade/steps-production:
-
-The production launch
----------------------
-
-.. _db-upgrade/production-live:
-
-Production goes live
-~~~~~~~~~~~~~~~~~~~~
-
-The production upgrade request is when you decide to upgrade your current database with all your
-production data (invoices, VAT returns, inventories, current orders) to a new version of your choice.
-
-After your :ref:`tests <db-upgrade/steps-test>` are completed to your satisfaction, submit the
-request to upgrade your production database via our `website form <https://upgrade.odoo.com>`_.
-Select *Production* purpose.
-
-.. image:: media/db-upgrade-production-purpose.png
-   :align: center
-   :alt: Selection of the "Production" purpose in the upgrade form on Odoo
-
-.. danger::
-   Going into production without first testing may lead to:
-
-   - business interruptions (e.g. no longer having the possibility to validate an action)
-   - poor customer experiences (e.g. an eCommerce website that does not work correctly)
-
-.. _db-upgrade/production-assistance:
-
-Assistance
-~~~~~~~~~~
-
-If you encounter issues or problems in the **production database**, please contact the **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. Where applicable, illustrate the current and previous
-   flows with videos and/or screenshots. This will avoid clarifying questions and speed up the
-   resolution process significantly.
-
-   .. image:: media/db-upgrade-production-assistance-details.png
-      :align: center
-      :alt: "Detailed Description" field in the support form on Odoo
-
-   .. warning::
-      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
-      to another team than the support one and will slow down the processing and response time.
-
-.. _db-upgrade/faq:
-
-FAQ
-===
-
-.. _db-upgrade/faq/why:
-
-Why upgrade?
-------------
-
-* You benefit from the latest features of the :ref:`new major version
-  <db-upgrade/faq/release-notes>` released by Odoo.
-* If you are in an :ref:`unsupported version <db-upgrade/supported-versions>`, you get a new version
-  with support.
-
-.. _db-upgrade/faq/when:
-
-When to upgrade?
-----------------
-
-Whenever you want. You can make your upgrade request as soon as a new version is released on our
-`website form <https://upgrade.odoo.com>`_.
-
-.. _db-upgrade/faq/availability:
-
-Availability of the new version
--------------------------------
-
-Please kindly note that as soon as we announce the release of a new major version (usually at the
-end of year), the Upgrade Service team needs to adapt the upgrade scripts to it, which is why the
-new version is not immediately available for existing databases.
-
-.. _db-upgrade/faq/finalization:
-
-Finalization of the upgrade (:abbr:`ETA (Estimated Time of Arrival)`)
----------------------------------------------------------------------
-
-Unfortunately, it is impossible to give time estimates for every upgrade request. Odoo offers so
-many possibilities (e.g. branding, workflows, customization, etc) that it can get tricky to upgrade,
-and translate to the new structure. If you use multiple apps managing sensitive data (e.g.,
-Accounting, Inventory, etc.), some cases may still require a human intervention, making the process
-slower.
-
-This is especially true during the first months following the release of a new major version, which
-can significantly lengthen the upgrade delay.
-
-In general, the ‘smaller’ the database, the quickest the upgrade. 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.
-
-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
-
-Usually, the delays experienced during the first request (waiting time between the time you
-submitted your first request for a test upgrade) can generally give you an idea of the time to wait
-for the production request.
-
-.. _db-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.
-
-If you have a custom code, you can choose to have it upgraded by our services, by one of our
-`partners <https://www.odoo.com/partners>`_ or you can do it yourself.
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/faq/editions-change:
-
-Editions change (from Community to Enterprise)
-----------------------------------------------
-
-An upgrade does not cover a change of `Editions <https://www.odoo.com/page/editions>`_
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/faq/hosting-types-switch:
-
-Switching the hosting types (Self-hosted vs Online vs 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
-<hosting_changes>`.
-
-.. note:: |assistance-contact|
-
-.. _db-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.
-
-.. _db-upgrade/assistance:
-
-Assistance
-==========
-
-.. _db-upgrade/contact:
-
-Contact our Upgrade service support
------------------------------------
-
-Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
-Upgrade Team <mailto:upgrade@odoo.com>`_. We will be very pleased to answer it as soon as possible.
-
-.. _db-upgrade/supported-versions:
-
-Supported versions
-------------------
-
-Please note that Odoo provides support and bug fixing only for the three last major versions of Odoo.
-
-This is a factor to take into consideration before upgrading. If you are on an older version, we
-suggest you to prefer the most recent version to benefit from a longer support (before having to
-upgrade again).
-
-You can get more information about our :doc:`supported versions <supported_versions>`.

content/administration/maintain/domain_names.rst

@@ -0,0 +1,336 @@
+============
+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.
+
+You can use a custom domain name to access your Odoo database and websites:
+
+- 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``.
+
+.. seealso::
+   - `Odoo Tutorials: Register a Free Domain Name
+     <https://www.odoo.com/slides/slide/register-a-free-domain-name-1663>`_
+   - `Odoo Quick Tips: Get a free domain name! <https://www.youtube.com/watch?v=eAfgeNOHLP4>`_
+
+.. _domain-name/about:
+
+About domain names
+==================
+
+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:
+
+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.
+
+.. 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.
+
+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>`.
+
+.. 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.
+
+.. _domain-name/odoo-manage:
+
+Manage your domain name registered with Odoo
+--------------------------------------------
+
+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`.
+
+.. image:: domain_names/manage.png
+   :align: center
+   :alt: Management of the domain names linked to an Odoo database
+
+.. note::
+   Please `submit a support ticket <https://www.odoo.com/help>`_ if you need further assistance to
+   manage your domain name.
+
+.. _domain-name/existing:
+
+Configure your existing domain name
+===================================
+
+If you already own a domain name, you can use it to point to your 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:
+
+#. :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>`.
+
+.. _domain-name/cname:
+
+Add a CNAME record
+------------------
+
+A **CNAME record** is a type of DNS record that points to the domain of another website rather than
+directly to an IP address.
+
+You need a CNAME record that points to your Odoo database. The requirements are detailed in your
+database manager.
+
+.. 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``)
+
+   .. group-tab:: Odoo.sh
+
+      Your project's main address is defined in :menuselection:`Settings --> Project Name`.
+
+      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.
+
+#. 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.
+
+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``).
+
+.. 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``.
+
+   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.
+
+.. _domain-name/db-map:
+
+Map your domain name with your Odoo database
+--------------------------------------------
+
+.. 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.
+
+      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
+
+   .. 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`.
+
+      .. image:: domain_names/odoo-sh-map.png
+         :align: center
+         :alt: Mapping a domain name with 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.
+
+.. _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.
+
+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
+<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.
+
+.. _domain-name/web-base-url:
+
+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>`.
+
+The **web base URL** of a database, or **root URL** 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.
+
+.. 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``.
+
+.. 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``
+
+.. _domain-name/website-map:
+
+Map your domain name with your website
+======================================
+
+Mapping your domain name to your website isn't the same as mapping it with 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
+  email to your customers.
+- If you have multiple websites, it maps your domain name with 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
+
+.. 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``.
+
+   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.
+
+.. 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
+   the company in use.
+
+.. seealso::
+  - :doc:`/applications/general/email_communication/email_servers`

content/administration/maintain/enterprise.rst

@@ -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

content/administration/maintain/google_oauth.rst

@@ -0,0 +1,192 @@
+========================================
+Connect Gmail to Odoo using Google OAuth
+========================================
+
+Odoo is compatible with Google's OAuth for Gmail. In order to send secure emails from a custom
+domain, all that is required is to configure a few settings on Google's *Workspace* platform, as
+well as on the back end of the Odoo database. This configuration works by using either a personal
+email address or an address created by a custom domain.
+
+.. tip::
+   For more information, visit `Google's documentation
+   <https://support.google.com/cloud/answer/6158849>`_ on setting up OAuth.
+
+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).
+
+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.
+
+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`.
+
+.. image:: google_oauth/new-project.png
+   :align: center
+   :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.
+
+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`.
+
+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.
+
+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`.
+- 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.
+
+.. image:: google_oauth/client-credentials.png
+   :align: center
+   :alt: Client ID and Client Secret for Google OAuth.
+
+Setup in Odoo
+=============
+
+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`.
+
+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.
+
+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.
+
+.. 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`.
+
+A new window from :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.
+
+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
+server in Odoo. The configuration automatically loads the token in Odoo, and a tag stating
+:guilabel:`Gmail Token Valid` appears in green.
+
+.. image:: google_oauth/green-token.png
+   :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.
+
+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:
+
+.. image:: google_oauth/published-status.png
+   :align: center
+   :alt: OAuth is Limited to 100 Sensitive Scope Logins.
+
+To correct this warning, navigate to the `Google API Platform
+<https://console.cloud.google.com/apis/credentials/consent>`_. If the :guilabel:`Publishing status`
+is :guilabel:`In Production`, click :guilabel:`Back to Testing` to correct the issue.
+
+No Test Users Added
+-------------------
+
+If no test users are added to the OAuth consent screen, then a 403 access denied error will
+populate.
+
+.. image:: google_oauth/403-error.png
+   :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.
+
+Gmail Module not updated
+------------------------
+
+If the :guilabel:`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`.
+
+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.
+
+.. 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.

content/administration/maintain/hosting_changes.rst

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

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_servers/outgoing-email-server>`.
+   #. 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/odoo_online.rst

@@ -0,0 +1,155 @@
+===============================
+Odoo Online 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:: odoo_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:: odoo_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:`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
+=======
+
+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`
+
+.. _odoo_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.
+
+.. _odoo_online/rename:
+
+Rename
+======
+
+Rename the database and its URL.
+
+.. _odoo_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>`_.
+
+.. _odoo_online/domains:
+
+Domains
+=======
+
+Configure custom domains to access the database via another URL.
+
+.. seealso::
+   - :doc:`domain_names`
+
+.. _odoo_online/tags:
+
+Tags
+====
+
+Add tags to sort your databases out. You can search the 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 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:: odoo_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>`_.
+
+.. _odoo_online/contact-support:
+
+Contact Support
+===============
+
+Access the Odoo `support page <https://www.odoo.com/help>`_ with your database's details already
+pre-filled.
+
+.. _odoo_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:: odoo_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/on_premise.rst

@@ -1,9 +1,6 @@
-
-.. _db_premise:
-
-===============================
-On-premises Database management
-===============================
+==============================
+On-premise database management
+==============================
 
 Register a database
 ===================
@@ -12,7 +9,7 @@ To register your database, you just need to enter your Subscription Code in the
 banner in the App Switcher. Make sure you do not add extra spaces before or after
 your subscription code. If the registration is successful, it will turn green and
 will provide you with the Expiration Date of your freshly-registered database. You
-can check this Epiration Date in the About menu (Odoo 9) or in the Settings Dashboard
+can check this Expiration Date in the About menu (Odoo 9) or in the Settings Dashboard
 (Odoo 10).
 
 Registration Error Message
@@ -21,13 +18,13 @@ Registration Error Message
 If you are unable to register your database, you will likely encounter this
 message:
 
-.. image:: media/error_message_sub_code.png
-    :align: center
-    :alt: Something went wrong while registering your database,
-          you can try again or contact Odoo Help
+.. 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
 
 Solutions
-'''''''''
+~~~~~~~~~
 
 * Do you have a valid Enterprise subscription?
 
@@ -44,16 +41,14 @@ Solutions
   * You can unlink the old database yourself on your `Odoo Contract
     <https://accounts.odoo.com/my/subscription>`__ with the button "Unlink database"
 
-    .. image:: media/unlink_single_db.png
-        :align: center
-
+    .. image:: on_premise/unlink_single_db.png
+       :align: center
 
     A confirmation message will appear; make sure this is the correct database as
     it will be deactivated shortly:
 
-    .. image:: media/unlink_confirm_enterprise_edition.png
-        :align: center
-
+    .. image:: on_premise/unlink_confirm_enterprise_edition.png
+       :align: center
 
 * Do you have the updated version of Odoo 9?
 
@@ -65,9 +60,8 @@ Solutions
     <https://accounts.odoo.com/my/subscription>`__, a short message will appear
     specifying which database is problematic:
 
-    .. image:: media/unlink_db_name_collision.png
-        :align: center
-
+    .. image:: on_premise/unlink_db_name_collision.png
+       :align: center
 
     In this case, you need to change the UUID on your test databases to solve this
     issue. You will find more information about this in :ref:`this section <duplicate_premise>`.
@@ -88,25 +82,22 @@ 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
 -----------------------------------
 
 If you have more users in your local database than provisionned in your
 Odoo Enterprise subscription, you may encounter this message:
 
-.. image:: media/add_more_users.png
-    :align: center
-    :alt: This database will expire in X days, you
-          have more users than your subscription allows
+.. 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
 
 
 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.
@@ -125,16 +116,15 @@ Database expired error message
 If your database reaches its expiration date before your renew your subscription,
 you will encounter this message:
 
-.. image:: media/database_expired.png
-    :align: center
-    :alt: This database has expired.
-
+.. image:: on_premise/database_expired.png
+   :align: center
+   :alt: This database has expired.
 
 This **blocking** message appears after a non-blocking message that lasts 30 days.
 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
@@ -145,7 +135,6 @@ Solutions
 None of those solutions worked for you? Please contact our
 `Support <https://www.odoo.com/help>`__
 
-
 .. _force_ping:
 
 .. _duplicate_premise:
@@ -157,9 +146,8 @@ You can duplicate your database by accessing the database manager on your
 server (<odoo-server>/web/database/manager). In this page, you can easily
 duplicate your database (among other things).
 
-.. image:: media/db_manager.gif
-    :align: center
-
+.. image:: on_premise/db_manager.gif
+   :align: center
 
 When you duplicate a local database, it is **strongly** advised to change
 the duplicated database's uuid (Unniversally Unique Identifier), since this
@@ -167,13 +155,14 @@ 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
 use the unix command ``uuidgen`` to generate a new uuid. You can then simply replace it like any
 other record by clicking on it and using the edit button.
 
-.. image:: media/db_uuid.png
-    :align: center
+.. image:: on_premise/db_uuid.png
+   :align: center

content/administration/maintain/supported_versions.rst

@@ -5,13 +5,16 @@
 Supported versions
 ==================
 
-
 Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
 
-Users hosted on **Odoo Online** may use intermediary versions (sometimes called *SaaS versions*) that are
-supported as well. These versions are not published for Odoo.sh or On-Premise
-installations.
+.. note::
+   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?
 =====================================
@@ -20,38 +23,43 @@ This matrix shows the support status of every version.
 
 **Major releases are in bold type.**
 
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-|                    | Odoo Online | Odoo.sh  | On-Premise   |   Release date |                                              |
-+====================+=============+==========+==============+================+==============================================+
-| **Odoo 14.0**      |    |green|  | |green|  |   |green|    | October 2020   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 13.saas~4     |    |green|  | N/A      | N/A          | August 2019    |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 13.0**      |    |green|  | |green|  |   |green|    | October 2019   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 12.saas~3     |    |green|  | N/A      | N/A          | August 2019    |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 12.0**      |    |green|  | |green|  |   |green|    | October 2018   | *End-of-support is planned for October 2021* |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 11.saas~3     |   |orange|  | N/A      | N/A          | April 2018     |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 11.0**      |   |orange|  | |orange| |    |red|     | October 2017   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 10.saas~15    |   |orange|  | N/A      | N/A          | March 2017     |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 10.saas~14    |   |orange|  | N/A      | N/A          | January 2017   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 10.0**      |   |orange|  | |orange| |    |red|     | October 2016   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 9.saas~11     |   |orange|  | N/A      | N/A          | May 2016       |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 9.0**       |   |orange|  | N/A      |    |red|     | October 2015   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 8.saas~6      |   |orange|  | N/A      | N/A          | February 2015  |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 8.0**       |   |orange|  | N/A      |    |red|     | September 2014 |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-
++-----------------+-------------+----------+-------------+----------------+------------------------+
+|                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
++=================+=============+==========+=============+================+========================+
+| **Odoo 16.0**   | |green|     | |green|  | |green|     | October 2022   | October 2025 (planned) |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo saas~15.2  | |green|     | 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   | October 2024 (planned) |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 14.0**   | |green|     | |green|  | |green|     | October 2020   | October 2023 (planned) |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 13.0**   | |red|       | |red|    | |red|       | October 2019   | October 2022           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| 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           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
 
 .. note::
 
@@ -61,19 +69,15 @@ This matrix shows the support status of every version.
 
     N/A Never released for this platform
 
-    |orange| Some of our older customers may still run this version on our Odoo Online servers, we provide help only on blocking issues and advise you to upgrade.
-
     🏁 Future version, not released yet
 
+.. |green| raw:: html
 
-.. |green| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6IzAwYTcwMCIvPjwvc3ZnPg==
-   :width: 15
+   <span class="text-success" style="font-size: 32px; line-height: 0.5">●</span>
 
-.. |red| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2QwMDAwMCIvPjwvc3ZnPg==
-   :width: 15
+.. |red| raw:: html
 
-.. |orange| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2ZmYTcwMCIvPjwvc3ZnPg==
-   :width: 15
+   <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>
 
 I run an older version of Odoo/OpenERP/TinyERP
 ==============================================

content/administration/maintain/update.rst

@@ -104,6 +104,7 @@ 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)
@@ -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,13 +1,12 @@
 :nosearch:
 
-=================
+========
 Advanced
-=================
+========
 
 .. toctree::
    :titlesonly:
 
    advanced/containers
    advanced/submodules
-   advanced/upgrade_your_database
    advanced/frequent_technical_questions

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/misc/other/cmdline>`.
+:doc:`CLI documentation </developer/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:
@@ -232,6 +232,6 @@ Save the file and then run the Odoo Shell:
 Finally, *via* the Odoo Shell, you can trigger the piece of code/function/method
 you want to debug.
 
-.. image:: ./media/pdb_sh.png
+.. image:: containers/pdb_sh.png
     :align: center
     :alt: Console screenshot showing ``pdb`` running in an Odoo.sh shell.

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

@@ -1,48 +0,0 @@
-
-=====================
-Upgrade your database
-=====================
-
-.. _odoosh-advanced-upgrade_your_database:
-
-Download and Upload your database
-=================================
-
-Download a dump of your database (from the :ref:`Builds view <odoosh-gettingstarted-builds-download-dump>`), choose the
-exact copy and without filestore options. Upload the .sql.gz dump on https://upgrade.odoo.com/upload and
-select the Testing Purpose. If you have custom code, you can choose to have it upgraded by us, or do it yourself. Once
-it's processed, you'll get a dump of the database in return.
-
-.. warning::
-   Do *not* upload *backups* of your production database (found in the Backups tab of the production branch) as these
-   are incompatible with the Upgrade platform - they contain your complete sources, etc. that are not needed for the
-   upgrade. Make sure to download a **Dump** instead - either through the Backups tab using the *Download Dump* button
-   or through the Builds page by using the *Download Dump* entry of the contextual menu of your latest production build.
-
-Test your upgraded database
-===========================
-
-Create a staging branch that will run the upgraded database. Either make sure your production branch's code is
-compatible between the two Odoo versions and fork your production branch, or make a new staging branch containing
-the upgraded code.
-
-Once the staging build is done (it doesn't matter if it failed due to the version incompatibility), import your
-upgraded dump in the backups tab of the branch. The platform will automatically detect the version of the dump and
-change the version of Odoo's source code to the corresponding version for the build.
-
-Test the upgraded database and make sure everything runs as it's supposed to.
-
-Replace your existing production database
-=========================================
-
-Once you've tested everything and you're satisfied, start the process over to get an up-to-date upgraded dump:
-
-* Make a new dump of your production database (as described in step 1)
-* Upload it on upgrade.odoo.com and select the Production purpose
-* Receive the newly upgraded dump and import it in your production branch. The build might get marked as failed because
-  the platform will run it with the upgraded databases' Odoo version together with the old custom code.
-* Merge or commit the upgraded custom code in the production branch
-
-If anything goes wrong, remember you can restore a backup. The platform will always make one before you make any
-Odoo.sh operation on the production database. If the restored backup comes from a previous version, the platform will
-detect it and change the project's Odoo version back if it needs to.

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,32 +1,32 @@
-
-==================================
+========
 Branches
-==================================
+========
 
 Overview
 ========
 
 The branches view gives you an overview of the different branches your repository has.
 
-.. image:: ./media/interface-branches.png
+.. image:: branches/interface-branches.png
    :align: center
 
 .. _odoosh-gettingstarted-branches-stages:
 
 Stages
-===============
+======
 
 Odoo.sh offers three different stages for your branches: production, staging and development.
 
 You can change the stage of a branch by drag and dropping it into the stage section title.
 
-.. image:: ./media/interface-branches-stagechange.png
+.. image:: branches/interface-branches-stagechange.png
    :align: center
 
 .. _stage_production:
 
 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/misc/other/cmdline>`.
+:doc:`the command line </developer/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>`.
@@ -107,9 +108,10 @@ 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:: ./media/interface-branches-merge.png
+.. image:: branches/interface-branches-merge.png
    :align: center
 
 When you want to test the changes of your development branches with the production data,
@@ -147,16 +149,17 @@ 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,
 * The various events linked to the platform, such as stage changes, database imports, backup restores.
 
-.. image:: ./media/interface-branches-history.png
+.. image:: branches/interface-branches-history.png
    :align: center
 
 For each event, a status is displayed in the top right-hand corner.
@@ -168,36 +171,38 @@ 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.
 
-.. image:: ./media/interface-branches-mails.png
+.. image:: branches/interface-branches-mails.png
    :align: center
    :scale: 50%
 
 Shell
 -----
+
 A shell access to your container. You can perform basic linux commands (:code:`ls`, :code:`top`)
 and open a shell on your database by typing :code:`psql`.
 
-.. image:: ./media/interface-branches-shell.png
+.. image:: branches/interface-branches-shell.png
    :align: center
 
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
 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.
 
-.. image:: ./media/interface-branches-editor.png
+.. image:: branches/interface-branches-editor.png
    :align: center
 
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
@@ -205,19 +210,23 @@ for instance side by side.
 
 Monitoring
 ----------
+
 This link contains various monitoring metrics of the current build.
 
-.. image:: ./media/interface-branches-monitoring.png
+.. image:: branches/interface-branches-monitoring.png
    :align: center
 
 You can zoom, change the time range or select a specific metric on each graph.
 On the graphs, annotations help you relate to changes on the build (database import, git push, etc...).
 
+.. _odoosh/logs:
+
 Logs
 ----
+
 A viewer to have a look to your server logs.
 
-.. image:: ./media/interface-branches-logs.png
+.. image:: branches/interface-branches-logs.png
    :align: center
 
 Different logs are available:
@@ -238,10 +247,11 @@ 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.
 
-.. image:: ./media/interface-branches-backups.png
+.. image:: branches/interface-branches-backups.png
    :align: center
 
 Odoo.sh makes daily backups of the production database. It keeps 7 daily, 4 weekly and 3 monthly backups.
@@ -257,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:
@@ -277,13 +287,24 @@ The *import database* feature accepts database archives in the format provided b
 * the Odoo.sh backup download button of this *Backups* tab,
 * the Odoo.sh dump download button in the :ref:`Builds view <odoosh-gettingstarted-builds>`.
 
+.. _odoo_sh/upgrade:
+
+Upgrade
+-------
+
+Available for production and staging branches for valid projects.
+
+.. seealso::
+    :doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`
+
 .. _odoosh-gettingstarted-branches-tabs-settings:
 
 Settings
 --------
+
 Here you can find a couple of settings that only apply to the currently selected branch.
 
-.. image:: ./media/interface-branches-settings.jpg
+.. image:: branches/interface-branches-settings.jpg
    :align: center
 
 **Behaviour upon new commit**
@@ -300,7 +321,7 @@ back from staging to development will automatically be set to 'Do nothing'.
 
 Choose the modules to install automatically for your development builds.
 
-.. image:: ./media/interface-settings-modulesinstallation.png
+.. image:: branches/interface-settings-modulesinstallation.png
    :align: center
 
 * *Install only my modules* will install the modules of the branch only. This is the default option.
@@ -382,18 +403,19 @@ we are considering the feature if there is enough demand.
 In case the domain of your users email addresses use SPF (Sender Policy Framework) or DKIM
 (DomainKeys Identified Mail), don't forget to authorize Odoo as a sending host in your domain name
 settings to increase the deliverability of your outgoing emails.
-The configuration steps are explained in the :ref:`Discuss app documentation <discuss-email_servers-spf-compliant>`.
+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:: ./media/interface-branches-shellcommands.png
+.. image:: branches/interface-branches-shellcommands.png
    :align: center
 
 Each command can be copied in the clipboard to be used in a terminal,
@@ -403,6 +425,7 @@ such as ``<URL>``, ``<PATH>``, ...
 
 Clone
 -----
+
 Download the Git repository.
 
 .. code-block:: bash
@@ -418,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
@@ -434,6 +458,7 @@ Uploads the new branch *feature-1* on your remote repository.
 
 Merge
 -----
+
 Merge the current branch in another branch.
 
 .. code-block:: bash
@@ -450,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:
 
@@ -462,12 +489,12 @@ To do so, follow these steps:
    (only apply the step 1)
 #. Paste the copied content to your profile SSH keys and press "Add"
 
-   .. image:: ./media/SSH-key-pasting.png
+   .. image:: branches/SSH-key-pasting.png
       :align: center
 
 #. The key should appear below
 
-   .. image:: ./media/SSH-key-appearing.png
+   .. image:: branches/SSH-key-appearing.png
       :align: center
 
 Connection
@@ -481,7 +508,7 @@ To connect to your builds using ssh use the following command in a terminal:
 
 You will find a shortcut for this command into the SSH tab in the upper right corner.
 
-.. image:: ./media/SSH-panel.png
+.. image:: branches/SSH-panel.png
    :align: center
 
 Provided you have the :ref:`correct access rights <odoosh-gettingstarted-settings-collaborators>` on the project,
@@ -491,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,19 +1,20 @@
 
 .. _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:: ./media/interface-builds.png
+.. image:: builds/interface-builds.png
    :align: center
 
 In this view, a row represents a branch, and a cell of a row represents a build of this branch.
@@ -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,38 +87,38 @@ 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:: ./media/interface-builds-branches.png
+.. image:: builds/interface-builds-branches.png
    :align: center
 
-For each branch, you can access the last build's database using the *Connect* link and jump to the branch code using
-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:: ./media/interface-builds-build.png
+.. image:: builds/interface-builds-build.png
    :align: center
 
-For each build, you can access the revision changes using the button with the Github icon.
-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:
 
-.. image:: ./media/interface-builds-build-dropdown.png
+.. image:: builds/interface-builds-build-dropdown.png
    :align: center
 
 .. _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.