diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-28 17:44:46 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-28 17:44:46 +0100 |
| commit | efe7ca16b77edce73bf538ccb70678a52afdfd1d (patch) | |
| tree | ad5af92d3bb397fd58fd861e6ce8e3abd2902ec6 /doc | |
| parent | b09f624f20781d65baf2060df40383898e6f86e5 (diff) | |
| parent | bb6f6c57f97b091f3f68161039de980eb9ce739d (diff) | |
[MERGE] forward port branch 11.0 up to bb6f6c57f97
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/cla/corporate/camptocamp.md | 1 | ||||
| -rw-r--r-- | doc/setup/install.rst | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/cla/corporate/camptocamp.md b/doc/cla/corporate/camptocamp.md index 206fad26646..e4206b66474 100644 --- a/doc/cla/corporate/camptocamp.md +++ b/doc/cla/corporate/camptocamp.md @@ -34,3 +34,4 @@ Damien Crier damien.crier@camptocamp.com https://github.com/damdam-s Simone Orsi simahawk@gmail.com https://github.com/simahawk Patrick Tombez patrick.tombez@camptocamp.com https://github.com/p-tombez Julien Coux julien.coux@camptocamp.com https://github.com/jcoux +Alexandre Saunier alexandre.saunier@camptocamp.com https://github.com/asaunier diff --git a/doc/setup/install.rst b/doc/setup/install.rst index c1f65abafd1..add4f22962b 100644 --- a/doc/setup/install.rst +++ b/doc/setup/install.rst @@ -217,10 +217,13 @@ command is available and configured properly, run the following commands : $ sudo systemctl start postgresql In order to print PDF reports, you must install wkhtmltopdf_ yourself: -the version of wkhtmltopdf_ available in debian repositories does not support -headers and footers so it can not be installed automatically. -The recommended version is 0.12.1 and is available on `the wkhtmltopdf download page`_, -in the archive section. +the version of wkhtmltopdf_ available in Debian repositories does +not support headers and footers so it is not used as a direct dependency. +The recommended version is 0.12.5 and is available on +`the wkhtmltopdf download page`_, in the archive section. Previously +recommended version 0.12.1 is a good alternative. +More details on the various versions and their respective quirks can be +found in our `wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_. Repository ^^^^^^^^^^ @@ -606,7 +609,7 @@ official Odoo `docker image <https://registry.hub.docker.com/_/odoo/>`_ page. http://www.enterprisedb.com/products-services-training/pgdownload .. _Quilt: http://en.wikipedia.org/wiki/Quilt_(software) .. _saas: https://www.odoo.com/page/start -.. _the wkhtmltopdf download page: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.1 +.. _the wkhtmltopdf download page: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5 .. _UAC: http://en.wikipedia.org/wiki/User_Account_Control .. _wkhtmltopdf: http://wkhtmltopdf.org .. _pip: https://pip.pypa.io |