diff options
| author | Xavier Morel <xmo@odoo.com> | 2017-07-03 11:45:55 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2017-07-03 11:49:03 +0200 |
| commit | 9a07a4599ce08bd1e3a74579a982fa3a58dc6cb2 (patch) | |
| tree | 4608699ce4d61cf5680f9406776c6a1daf287298 /doc/setup | |
| parent | 828c7c3da92970e3f0836a62f858ac2f5229947a (diff) | |
[FIX] doc warnings
* add Sphinx 1.6 compatibility (use app.set_translator when
available as in that case programmatically setting
html_translator_class is broken)
* fix a bunch of code block lexers to avoid warnings & get better
coloration
* add a few options which were referred to without being actually
defined
* fix some rST formatting
Diffstat (limited to 'doc/setup')
| -rw-r--r-- | doc/setup/deploy.rst | 16 | ||||
| -rw-r--r-- | doc/setup/install.rst | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst index ec1a31e0a3c..34a06a01be3 100644 --- a/doc/setup/deploy.rst +++ b/doc/setup/deploy.rst @@ -48,7 +48,7 @@ Configuration samples in ``/etc/odoo.conf`` set: -.. code-block:: apacheconf +.. code-block:: ini [options] dbfilter = ^mycompany.*$ @@ -60,7 +60,7 @@ in ``/etc/odoo.conf`` set: in ``/etc/odoo.conf`` set: -.. code-block:: apacheconf +.. code-block:: ini [options] dbfilter = ^%d$ @@ -101,7 +101,7 @@ Configuration sample in ``/etc/postgresql/9.5/main/pg_hba.conf`` set: -.. code-block:: apacheconf +.. code-block:: text # IPv4 local connections: host all all 127.0.0.1/32 md5 @@ -109,7 +109,7 @@ in ``/etc/postgresql/9.5/main/pg_hba.conf`` set: in ``/etc/postgresql/9.5/main/postgresql.conf`` set: -.. code-block:: apacheconf +.. code-block:: text listen_addresses = 'localhost,192.168.1.2' port = 5432 @@ -154,7 +154,7 @@ Configuration sample in ``/etc/odoo.conf`` set: -.. code-block:: apacheconf +.. code-block:: ini [options] admin_passwd = mysupersecretpassword @@ -226,7 +226,7 @@ Configuration sample in ``/etc/odoo.conf``: -.. code-block:: apacheconf +.. code-block:: ini [options] limit_memory_hard = 1677721600 @@ -267,13 +267,13 @@ Configuration sample in ``/etc/odoo.conf`` set: -.. code-block:: apacheconf +.. code-block:: ini proxy_mode = True in ``/etc/nginx/sites-enabled/odoo.conf`` set: -.. code-block:: apacheconf +.. code-block:: nginx #odoo server upstream odoo { diff --git a/doc/setup/install.rst b/doc/setup/install.rst index de21d6c53ab..afc9b0c8f14 100644 --- a/doc/setup/install.rst +++ b/doc/setup/install.rst @@ -439,7 +439,7 @@ Source installation requires manually installing dependencies: command from a cmd.exe prompt (replace ``\YourOdooPath`` by the actual path where you downloaded Odoo): - .. code-block:: ps1 + .. code-block:: doscon C:\> cd \YourOdooPath C:\YourOdooPath> C:\Python27\Scripts\pip.exe install -r requirements.txt @@ -484,7 +484,7 @@ Source installation requires manually installing dependencies: - on Windows, `install nodejs <http://nodejs.org/download/>`_, reboot (to update the :envvar:`PATH`) and install less: - .. code-block:: ps1 + .. code-block:: doscon C:\> npm install -g less @@ -517,7 +517,7 @@ Common necessary configurations are: Under Windows a typical way to execute odoo would be: -.. code-block:: ps1 +.. code-block:: doscon C:\YourOdooPath> python odoo-bin -w odoo -r odoo --addons-path=addons,../mymodules --db-filter=mydb$ |