[MERGE] Forward-port of branch 12.0 up to 6a5c652b8c

crm/optimize/setup.rst

@@ -203,14 +203,23 @@ Configure Odoo VOIP
 
 In Odoo, the configuration should be done in the user's preferences.
 
-The SIP Login/Browser's Extension is the number you configured previously in the
-sip.conf file. In our example, 1060. The SIP Password is the secret you chose in
-the sip.conf file. The extension of your office's phone is not a required field
-but it is used if you want to transfer your call from Odoo to an external phone
-also configured in the sip.conf file.
 
-The configuration should also be done in the sale settings under the title "PBX
+.. image:: media/voip_config01.png
-Configuration". You need to put the IP you define in the http.conf file and the
+  :align: center
-WebSocket should be: ws://127.0.0.1:8088/ws. The part "127.0.0.1" needs to be
+
-the same as the IP defined previously and the "8088" is the port you defined in
+- The SIP Login/Browser's Extension is the number you configured previously in the sip.conf file (in our example: 1060). 
-the http.conf file.
+
+- The SIP Password is the secret you chose in the sip.conf file. 
+
+- The extension of your office's phone is not a required field but it is used if you want to transfer your call from Odoo to an external phone also configured in the sip.conf file.
+
+
+The configuration should also be done in the General Settings under the "Integrations" section. 
+
+.. image:: media/onsip02.png
+  :align: center
+
+- The PBX Server IP should be the same as the IP you define in the http.conf file.
+
+- The WebSocket should be: ws://localhost:XXXX/ws where "localhost" needs to be the same as the IP defined previously and "XXXX" needs to be the port defined in the http.conf file.
+

iot/config/flash_sdcard.rst

@@ -9,7 +9,7 @@ Updating your SD Card with Etcher
 =================================
 
 Go to Balena’s website and download
-`Etcher <http://wwww.balena.org>`__, It’s a free and
+`Etcher <https://www.balena.io/>`__, It’s a free and
 open-source utility used for burning image files. Install and launch it.
 
 Now, download the latest image `here <http://nightly.odoo.com/master/posbox/iotbox/>`__, and extract it from the zip file. Then, open *Etcher* and select the image.

website/publish/domain_name.rst

@@ -89,6 +89,9 @@ Until recently, Odoo users needed to use a third-party CDN service provider such
 It is not required anymore: Odoo generates the certificate for you automatically, using integration with `Let's Encrypt Certificate Authority and ACME protocol <https://letsencrypt.org/how-it-works/>`__.
 In order to get this, simply add your domain name in your customer portal (a separate certificate is generated for each domain name specified).
 
+.. warning::
+  **Please note that the certificate generation may take up to 24h.**
+
 If you already use CloudFlare or a similar service, you can keep using it or simply change for Odoo. The choice is yours.
 
 My website is indexed twice by Google