diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-14 11:56:05 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-14 11:56:05 +0200 |
| commit | fa7430c157a095d2a779245cefa704e63f2ffde1 (patch) | |
| tree | 0775ac60b058712f58148390e2bfbd5c581f35b6 /doc | |
| parent | 874fb705433a88166b8e4f7ca725db2d51969681 (diff) | |
| parent | 5be40868b1172131b8109a3de19f31266eecf0e2 (diff) | |
[MERGE] forward port branch 9.0 up to 5be4086
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/goopen.md | 15 | ||||
| -rw-r--r-- | doc/setup/deploy.rst | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/doc/cla/corporate/goopen.md b/doc/cla/corporate/goopen.md new file mode 100644 index 00000000000..91f5cded22a --- /dev/null +++ b/doc/cla/corporate/goopen.md @@ -0,0 +1,15 @@ +Slovenia, 2016-09-05 + +GoOpen, računalniške storitve, Aleš Ferlan s.p. agrees to the terms of the +Odoo Corporate Contributor License Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Aleš Ferlan alefer89@protonmail.com + +List of contributors: + +Aleš Ferlan alefer89@protonmail.com diff --git a/doc/setup/deploy.rst b/doc/setup/deploy.rst index 7684abc3345..6b027a62bdd 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: @@ -428,4 +428,4 @@ which will generate a 32 characters pseudorandom printable string. .. _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 |