diff --git a/Makefile b/Makefile index c06f920fa..315e61e89 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ SOURCE_DIR = content HTML_BUILD_DIR = $(BUILD_DIR)/html ifdef VERSIONS - HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master + HTML_BUILD_DIR := $(HTML_BUILD_DIR)/saas-14.5 endif ifneq ($(CURRENT_LANG),en) HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG) diff --git a/README.md b/README.md index e2e7b778c..0fe9a92e7 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ ### 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](https://www.odoo.com/documentation/15.0/contributing/documentation.html#install-git) +- [Python 3.6, 3.7, or 3.8](https://www.odoo.com/documentation/15.0/contributing/documentation.html#python) +- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/15.0/requirements.txt). +- [Make](https://www.odoo.com/documentation/15.0/contributing/documentation.html#make) +- A local copy of the [odoo/odoo repository in 15.0](https://github.com/odoo/odoo/tree/15.0) (Optional) ### Instructions @@ -23,7 +23,7 @@ 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) +3. See [this guide](https://www.odoo.com/documentation/15.0/contributing/documentation.html#preview-your-changes) for more detailed instructions. Optional: to fully build the developer documentation with inline docstrings for documented Python @@ -34,7 +34,7 @@ be shown. ## 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/15.0/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. diff --git a/conf.py b/conf.py index 041437a65..98fdb2103 100644 --- a/conf.py +++ b/conf.py @@ -19,7 +19,7 @@ copyright = 'Odoo S.A.' # `version` if 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 = 'saas-14.5' # The minimal Sphinx version required to build the documentation. needs_sphinx = '3.0.0' @@ -70,19 +70,20 @@ if not odoo_dir.is_dir(): 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." + f"`git clone https://github.com/odoo/odoo` or create a symbolic link." ) else: sys.path.insert(0, str(odoo_dir.absolute())) 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}`." + f"In order to fully build the 'Developer' documentation, checkout the matching branch " + f"with `cd odoo && git checkout {version}`." ) else: _logger.info(f"Found Odoo sources directory matching documentation version {release}.") diff --git a/content/contributing/documentation.rst b/content/contributing/documentation.rst index 75cb1162a..619585154 100644 --- a/content/contributing/documentation.rst +++ b/content/contributing/documentation.rst @@ -224,7 +224,7 @@ Python comes with its own package manager: `pip a single command. #. Download and install the recommended release (`see README file - `_) of **Python 3** on your machine. + `_) of **Python 3** on your machine. #. Make sure to have **pip** installed on your machine (on Windows, you can install pip alongside Python). #. Execute the following commands in a terminal to verify that both installations finished diff --git a/content/contributing/documentation/rst_guidelines.rst b/content/contributing/documentation/rst_guidelines.rst index ea80b8bf3..03784182b 100644 --- a/content/contributing/documentation/rst_guidelines.rst +++ b/content/contributing/documentation/rst_guidelines.rst @@ -36,8 +36,8 @@ A reference to the rendered :file:`prices.html` and :file:`variants.html` could #. Absolute: - - ``https://odoo.com/documentation/master/applications/sales/sales/products_prices/prices.html`` - - ``https://odoo.com/documentation/master/applications/sales/sales/products_prices/products/variants.html`` + - ``https://odoo.com/documentation/15.0/applications/sales/sales/products_prices/prices.html`` + - ``https://odoo.com/documentation/15.0/applications/sales/sales/products_prices/products/variants.html`` #. Relative: diff --git a/redirects.txt b/redirects.txt index ad02414b6..9df48fe48 100644 --- a/redirects.txt +++ b/redirects.txt @@ -278,3 +278,5 @@ purchase/replenishment/flows/compute_date.rst applications/inventory_and_mrp/inv purchase/replenishment/flows/purchase_triggering.rst applications/inventory_and_mrp/purchase/products/reordering.rst # (#814) purchase/replenishment/flows/setup_stock_rule.rst applications/inventory_and_mrp/purchase/products/reordering.rst # (#814) purchase/replenishment/multicompany/setup.rst applications/general/multi_companies/manage_multi_companies.rst # (#814) + +# Redirections introduced in 15.0 :