From d3d0531832c7189404c3254e70b327a44448a03e Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Fri, 3 Dec 2021 11:25:39 +0100 Subject: [PATCH] [REL] freeze saas-15.1 branch --- Makefile | 2 +- README.md | 14 +++++++------- conf.py | 2 +- content/contributing/documentation.rst | 2 +- .../contributing/documentation/rst_guidelines.rst | 4 ++-- redirects.txt | 4 +++- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 36388a436..8dc6fd178 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-15.1 endif ifneq ($(CURRENT_LANG),en) HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG) diff --git a/README.md b/README.md index c0d58eee0..1f00b75d7 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.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/saas-15.1/contributing/documentation.html#install-git) +- [Python 3.7 or 3.8](https://www.odoo.com/documentation/saas-15.1/contributing/documentation.html#python) +- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/saas-15.1/requirements.txt). +- [Make](https://www.odoo.com/documentation/saas-15.1/contributing/documentation.html#make) +- A local copy of the [odoo/odoo repository in saas-15.1](https://github.com/odoo/odoo/tree/saas-15.1) (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/saas-15.1/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/saas-15.1/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 1233ed37d..c77efdc3d 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-15.1' # The minimal Sphinx version required to build the documentation. needs_sphinx = '3.0.0' diff --git a/content/contributing/documentation.rst b/content/contributing/documentation.rst index da383f7f8..e558ba012 100644 --- a/content/contributing/documentation.rst +++ b/content/contributing/documentation.rst @@ -220,7 +220,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..e75e4d605 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/saas-15.1/applications/sales/sales/products_prices/prices.html`` + - ``https://odoo.com/documentation/saas-15.1/applications/sales/sales/products_prices/products/variants.html`` #. Relative: diff --git a/redirects.txt b/redirects.txt index 118f9048c..485a10937 100644 --- a/redirects.txt +++ b/redirects.txt @@ -317,4 +317,6 @@ developer/reference/javascript/qweb.rst developer/refer developer/reference/backend/assets.rst developer/reference/frontend/assets.rst developer/reference/frontend/owl_component_system.rst developer/reference/frontend/owl_components.rst -developer/reference/frontend/generic_components.rst developer/reference/frontend/owl_components.rst \ No newline at end of file +developer/reference/frontend/generic_components.rst developer/reference/frontend/owl_components.rst + +# Redirections introduced in saas-15.1 :