[MERGE] forward port branch 12.0 up to 82a1e1dcc33

1 files changed, 8 insertions, 5 deletions

diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 1088d90d8d8..21a22c7cd0d 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -210,10 +210,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
 ^^^^^^^^^^
@@ -588,7 +591,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