[MERGE] Forward-port of 10.0 up to 2a17601b52

applications.rst

@@ -20,4 +20,4 @@ Applications
    livechat/livechat
    expense/expense
    general
-   mobile/firebase
+   mobile/firebase

ecommerce/shopper_experience/paypal.rst

@@ -69,6 +69,8 @@ Set up your Paypal account
     .. image:: media/paypal_account_optional.png
      :align: center
 
+  .. tip:: For Encrypted Website Payments & EWP_SETTINGS error,
+     please check the `paypal documentation. <https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/encryptedwebpayments/#encrypted-website-payments-ewp>`__
 
 Set up Odoo
 ===========

inventory/routes/costing/landed_costs.rst

@@ -46,7 +46,7 @@ Costs**, such as freight, insurance or custom duties. Go to
 .. image:: media/landed_costs03.png
     :align: center
 
-.. note:: 
+.. note::
     Landed costs are only possible for products configured in real
     time valuation with real price costing method. The costing method is
     configured on the product category.

inventory/shipping/operation/invoicing.rst

@@ -61,8 +61,8 @@ On your sale order, choose the carrier that will be used. Click on
 The price is computed when you **save** the sale order. Confirm the sale
 order and proceed to deliver the product.
 
-The real shipping cost are computed when the delivery order is
-validated.
+The real shipping cost is computed when the delivery order is
+validated, you can see the real cost in the chatter of the delivery order.
 
 .. image:: media/invoicing02.png
    :align: center