diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-14 11:58:45 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-14 11:58:45 +0200 |
| commit | 19b4f5efe4ee69f0fcd73ebe80f6347b30681354 (patch) | |
| tree | f8c7cf10fcf11bb03512b0e31358c53325fc381d /doc/setup | |
| parent | 4e7981f7ac65d464b49a874b55cc293122559d23 (diff) | |
| parent | fa7430c157a095d2a779245cefa704e63f2ffde1 (diff) | |
[MERGE] forward port branch saas-10 up to fa7430c
Diffstat (limited to 'doc/setup')
| -rw-r--r-- | doc/setup/deploy.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst index 3209154c41b..5b906bfcd7a 100644 --- a/doc/setup/deploy.rst +++ b/doc/setup/deploy.rst @@ -233,15 +233,15 @@ connections to the secure port .. warning:: - In case you are using the Point of Sale module in combinaison with a `POSBox`_, + In case you are using the Point of Sale module in combination with a `POSBox`_, you must disable the HTTPS configuration for the route ``/pos/web`` to avoid - mix-content errors. + mixed-content errors. Configuration sample -------------------- * redirect http requests to https -* proxiing requests to odoo +* proxy requests to odoo in ``/etc/odoo.conf`` set: @@ -440,4 +440,4 @@ of the supported browsers by Odoo version is the following: .. _use an SSH tunnel: http://www.postgresql.org/docs/9.3/static/ssh-tunnels.html .. _WSGI: http://wsgi.readthedocs.org/ -.. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2
\ No newline at end of file +.. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2 |