[MERGE] forward port of branch 8.0 up to dc41a9b

5 files changed, 60 insertions, 2 deletions

diff --git a/doc/cla/corporate/eezee-it.md b/doc/cla/corporate/eezee-it.md
new file mode 100644
index 00000000000..12cedecec59
--- /dev/null
+++ b/doc/cla/corporate/eezee-it.md
@@ -0,0 +1,22 @@
+Belgium, 2015-03-02
+
+EEZEE-IT 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,
+
+Antony Brugger antony.brugger@eezee-it.com https://github.com/antonybrugger
+
+List of contributors:
+
+Julien Laloux julien.laloux@eezee-it.com https://github.com/jlaloux
+Sylvain Van Hoof sylvain.vanhoof@eezee-it.com https://github.com/sylvainvanhoof
+Aristóbulo Meneses aristobulo.meneses@eezee-it.com https://github.com/aristobulo-eezee
+Janik De Goÿ janik.de.goy@eezee-it.com https://github.com/jdegoy
+François Lawarrée francois.lawarre@eezee-it.com https://github.com/francoislawarree
+José Moreno jose.moreno@eezee-it.com https://github.com/jose-eezee
+Javier Carrasco javier.carrasco@eezee-it.com https://github.com/jose-eezee
+David Cajot david.cajot@eezee-it.com https://github.com/dcajot
\ No newline at end of file
diff --git a/doc/cla/corporate/versada.md b/doc/cla/corporate/versada.md
new file mode 100644
index 00000000000..24610ad24fc
--- /dev/null
+++ b/doc/cla/corporate/versada.md
@@ -0,0 +1,14 @@
+Lithuania, 2015-02-26
+
+Versada 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,
+
+Andrius Preimantas andrius@versada.lt https://github.com/andrius-preimantas
+
+List of contributors:
+
+Andrius Preimantas andrius@versada.lt https://github.com/andrius-preimantas
+
diff --git a/doc/cla/individual/Sathors.md b/doc/cla/individual/Sathors.md
new file mode 100644
index 00000000000..8e005313156
--- /dev/null
+++ b/doc/cla/individual/Sathors.md
@@ -0,0 +1,11 @@
+Ecuador, 2nd of March 2015
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Nicolas Schmitt sathors@free.fr https://github.com/Sathors
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index 280cd079622..434b0d9cd9d 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -278,6 +278,14 @@ customize the amout of logging output
         In case of conflict between :option:`--log-level` and
         :option:`--log-handler`, the latter is used
 
+Advanced options
+----------------
+
+.. option:: --auto-reload
+
+    enable auto-reloading of python files and xml files without having to
+    restart the server. Requires pyinotify_.
+
 .. _reference/cmdline/scaffold:
 
 Scaffolding
@@ -347,3 +355,4 @@ to that file.
     http://www.postgresql.org/docs/9.2/static/libpq-connect.html#AEN38208
 .. _Werkzeug's proxy support:
     http://werkzeug.pocoo.org/docs/0.9/contrib/fixers/#werkzeug.contrib.fixers.ProxyFix
+.. _pyinotify: https://github.com/seb-m/pyinotify/wiki
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 4221eb15225..701dec1a137 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -124,8 +124,10 @@ daemon and automatically start it.
 .. danger:: 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. Use the version available on
-            `the wkhtmltopdf download page`_.
+            automatically. The recommended version is 0.12.1 and is available on
+            `the wkhtmltopdf download page`_, in the archive section. As there
+            is no official release for Debian Jessie, you can find ours on
+            http://nightly.odoo.com/extra/.
 
 Configuration
 '''''''''''''