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