Skip to content

Commit

Permalink
[FIX] doc: update to version 11
Browse files Browse the repository at this point in the history
Use python 3.5
Refer to correct page of the doc
Remove old bazar to git (was intended for the 8.0)

Remove outdated setup_dev script: it was intended for odoo developers but if you
are not able to make a git clone, you are going to have a bad time later.
  • Loading branch information
mart-e committed Oct 11, 2017
1 parent e1104ac commit f5b2a4b
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 444 deletions.
17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,4 @@ Getting started with Odoo
For a standard installation please follow the <a href="https://www.odoo.com/documentation/11.0/setup/install.html">Setup instructions</a>
from the documentation.

If you are a developer you may type the following command at your terminal:

wget -O- https://raw.githubusercontent.com/odoo/odoo/11.0/setup/setup_dev.py | python

Then follow <a href="https://www.odoo.com/documentation/11.0/tutorials.html">the developer tutorials</a>


For Odoo employees
------------------

To add the odoo-dev remote use this command:

$ ./setup/setup_dev.py setup_git_dev

To fetch odoo merge pull requests refs use this command:

$ ./setup/setup_dev.py setup_git_review

2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
todo_include_todos = False

intersphinx_mapping = {
'python': ('https://docs.python.org/2/', None),
'python': ('https://docs.python.org/3/', None),
'werkzeug': ('http://werkzeug.pocoo.org/docs/', None),
'sqlalchemy': ('http://docs.sqlalchemy.org/en/rel_0_9/', None),
'django': ('https://django.readthedocs.org/en/latest/', None),
Expand Down
242 changes: 0 additions & 242 deletions doc/git.rst

This file was deleted.

7 changes: 3 additions & 4 deletions doc/setup/deploy.rst
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ It should be stored securely, and should be generated randomly e.g.

.. code-block:: console
$ python -c 'import base64, os; print(base64.b64encode(os.urandom(24)))'
$ python3 -c 'import base64, os; print(base64.b64encode(os.urandom(24)))'
which will generate a 32 characters pseudorandom printable string.

Expand All @@ -505,9 +505,8 @@ distinction is made according to the browser version in order to be
up-to-date. Odoo is supported on the current browser version. The list
of the supported browsers by Odoo version is the following:

- **Odoo 8:** IE9, Mozilla Firefox, Google Chrome, Safari, Microsoft Edge
- **Odoo 9:** IE11, Mozilla Firefox, Google Chrome, Safari, Microsoft Edge
- **Odoo 10:** Mozilla Firefox, Google Chrome, Safari, Microsoft Edge
- **Odoo 10+:** Mozilla Firefox, Google Chrome, Safari, Microsoft Edge

.. [#different-machines]
to have multiple Odoo installations use the same PostgreSQL database,
Expand All @@ -524,7 +523,7 @@ of the supported browsers by Odoo version is the following:
"self-signed" certificates are easier to deploy on a controlled
environment than over the internet.
.. _regular expression: https://docs.python.org/2/library/re.html
.. _regular expression: https://docs.python.org/3/library/re.html
.. _ARP spoofing: http://en.wikipedia.org/wiki/ARP_spoofing
.. _Nginx termination example:
http://nginx.com/resources/admin-guide/nginx-ssl-termination/
Expand Down
2 changes: 1 addition & 1 deletion doc/setup/enterprise.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ On Linux, using an installer

.. code-block:: console
$ python /usr/bin/odoo.py -d <database_name> -i web_enterprise --stop-after-init
$ python3 /usr/bin/odoo.py -d <database_name> -i web_enterprise --stop-after-init
* You should be able to connect to your Odoo Enterprise instance using your usual mean of identification.
You can then link your database with your Odoo Enterprise Subscription by entering the code you received
Expand Down
Loading

0 comments on commit f5b2a4b

Please sign in to comment.