From c765ea9bad89e9940ed16d32935177c3b3660360 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 5 Sep 2022 14:14:28 +0000 Subject: [PATCH] [REL] freeze 16.0 branch --- Makefile | 2 +- README.md | 16 ++++++++-------- conf.py | 3 ++- content/administration/install/install.rst | 2 +- content/contributing/documentation.rst | 2 +- .../howtos/rdtraining/05_securityintro.rst | 2 +- content/developer/reference/backend/testing.rst | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 0db73c8be..b68279f73 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ SOURCE_DIR = content HTML_BUILD_DIR = $(BUILD_DIR)/html ifdef VERSIONS - HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master + HTML_BUILD_DIR := $(HTML_BUILD_DIR)/16.0 endif ifneq ($(CURRENT_LANG),en) HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG) diff --git a/README.md b/README.md index ea94649fd..bc6e565e4 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/16.0/contributing/documentation.html#install-git) +- [Python 3.7 or 3.8](https://www.odoo.com/documentation/16.0/contributing/documentation.html#python) +- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/16.0/requirements.txt). +- [Make](https://www.odoo.com/documentation/16.0/contributing/documentation.html#make) +- A local copy of the [odoo/odoo repository in 16.0](https://github.com/odoo/odoo/tree/16.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/16.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/16.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. @@ -43,4 +43,4 @@ To **report a content issue**, **request new content** or **ask a question**, us 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). \ No newline at end of file +[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game). diff --git a/conf.py b/conf.py index 72deebb4c..6a5e7e2a0 100644 --- a/conf.py +++ b/conf.py @@ -22,7 +22,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 = '16.0' # The minimal Sphinx version required to build the documentation. needs_sphinx = '3.0.0' @@ -186,6 +186,7 @@ sphinx.transforms.i18n.docname_to_domain = ( # 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 = { + '16.0': "Odoo 16", 'master': "Master", 'saas-15.2': "Odoo Online", '15.0': "Odoo 15", diff --git a/content/administration/install/install.rst b/content/administration/install/install.rst index 84362081d..fcb7849d3 100644 --- a/content/administration/install/install.rst +++ b/content/administration/install/install.rst @@ -547,7 +547,7 @@ Dependencies .. tab:: Debian/Ubuntu For Debian-based systems, the packages are listed in the `debian/control - `_ file of the Odoo sources. + `_ file of the Odoo sources. On Debian/Ubuntu, the following commands should install the required packages: diff --git a/content/contributing/documentation.rst b/content/contributing/documentation.rst index 71fb9ed08..5958ae05f 100644 --- a/content/contributing/documentation.rst +++ b/content/contributing/documentation.rst @@ -218,7 +218,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/developer/howtos/rdtraining/05_securityintro.rst b/content/developer/howtos/rdtraining/05_securityintro.rst index 77e9c9e40..9a19783f6 100644 --- a/content/developer/howtos/rdtraining/05_securityintro.rst +++ b/content/developer/howtos/rdtraining/05_securityintro.rst @@ -18,7 +18,7 @@ Data Files (CSV) Odoo is a highly data driven system. Although behavior is customized using Python code, part of a module's value is in the data it sets up when loaded. One way to load data is through a CSV file. One example is the -`list of country states `__ +`list of country states `__ which is loaded at installation of the ``base`` module. .. code-block:: text diff --git a/content/developer/reference/backend/testing.rst b/content/developer/reference/backend/testing.rst index ba1dd2065..2d481223a 100644 --- a/content/developer/reference/backend/testing.rst +++ b/content/developer/reference/backend/testing.rst @@ -598,7 +598,7 @@ Javascript #. Add any step you want. Every step contains at least a trigger. You can either use the `predefined steps -`_ or write +`_ or write your own personalized step. Here are some example of steps: