Forward port 10.0 to 11.0

accounting/others/adviser/assets.rst

@@ -107,7 +107,7 @@ before posting them to your accounts.
 .. tip:: if you put the asset on the product, the asset category will
          automatically be filled in the supplier bill.
 
-How to deprecate an asset?
+How to depreciate an asset?
 ==========================
 
 Odoo will create depreciation journal entries automatically at the right

accounting/others/taxes/B2B_B2C.rst

@@ -88,15 +88,15 @@ must:
 
 For the purpose of this documentation, we will use the above use case:
 
--   your product default sale price is 8.26€ price excluded
+-   your product default sale price is 8.26€ tax excluded
 
--   but we want to sell it at 10€, price included, in our shops or
+-   but we want to sell it at 10€, tax included, in our shops or
     eCommerce website
 
 Setting your products
 ---------------------
 
-Your company must be configured with price excluded by default. This is
+Your company must be configured with tax excluded by default. This is
 usually the default configuration, but you can check your **Default Sale
 Tax** from the menu :menuselection:`Configuration --> Settings` 
 of the Accounting application.
@@ -155,8 +155,8 @@ This is the expected behavior for a customer of your shop.
 Avoid changing every sale order
 ===============================
 
-If you negotiate a contract with a customer, whether you negotiate price
-included or price excluded, you can set the pricelist and the fiscal
+If you negotiate a contract with a customer, whether you negotiate tax
+included or tax excluded, you can set the pricelist and the fiscal
 position on the customer form so that it will be applied automatically
 at every sale of this customer.
 

accounting/overview/main_concepts/in_odoo.rst

@@ -22,14 +22,14 @@ entries are automatically balanced (sum of debits = sum of credits).
 Accrual and Cash Basis Methods
 ==============================
 
-Odoo support both accrual and cash basis reporting. This allows you to
+Odoo supports both accrual and cash basis reporting. This allows you to
 report income / expense at the time transactions occur (i.e., accrual basis), or when
 payment is made or received (i.e., cash basis).
 
 Multi-companies
 ===============
 
-Odoo allows to manage several companies within the same database. Each
+Odoo allows one to manage several companies within the same database. Each
 company has its own chart of accounts and rules. You can get
 consolidation reports following your consolidation rules.
 
@@ -51,9 +51,9 @@ web-service.
 International Standards
 =======================
 
-Odoo accounting support more than 50 countries. The Odoo core
-accounting implement accounting standards that is common to all
-countries and specific modules exists per country for the
+Odoo accounting supports more than 50 countries. The Odoo core
+accounting implements accounting standards that are common to all
+countries. Specific modules exist per country for the
 specificities of the country like the chart of accounts, taxes, or
 bank interfaces.
 
@@ -61,7 +61,7 @@ In particular, Odoo's core accounting engine supports:
 
 * Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking
   countries including Ireland, Canada, Australia, and New Zealand)
-  where cost of good sold are reported when products are
+  where costs of good sold are reported when products are
   sold/delivered.
 * European accounting where expenses are accounted at the supplier
   bill.
@@ -115,8 +115,8 @@ bank statement lines to your accounting transactions. Odoo also
 remembers how you've treated other bank statement lines and provides
 suggested general ledger transactions.
 
-Calculates the tax you owe your tax authority
-=============================================
+Calculate the tax you owe your tax authority
+============================================
 
 Odoo totals all your accounting transactions for your tax period and
 uses these totals to calculate your tax obligation. You can then check
@@ -136,7 +136,7 @@ average price, LIFO (for countries allowing it) and FIFO.
 Easy retained earnings
 ======================
 
-Retained earnings is the portion of income retained by your
+Retained earnings are the portion of income retained by your
 business. Odoo automatically calculates your current year earnings in
 real time so no year-end journal or rollover is required.  This is
 calculated by reporting the profit and loss balance to your balance

discuss/email_servers.rst

@@ -14,6 +14,11 @@ to manage your email server's reputation yourself.
 
 You will find here below some useful 
 information to do so by integrating your own email solution with Odoo.
+.. note::
+    Office 365 email servers don't allow easiliy to send external emails
+    from hosts like Odoo. 
+    Refer to the `Office 365 documentation`_
+    to make it working.
 
 How to manage outbound messages
 ===============================
@@ -150,3 +155,6 @@ alias in your mail server.
    You can change this value in developer mode.
    Go to :menuselection:`Settings --> Technical --> Automation --> 
    Scheduled Actions` and look for *Mail: Fetchmail Service*.
+   
+.. _Office 365 documentation:
+    https://support.office.com/en-us/article/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-365-69f58e99-c550-4274-ad18-c805d654b4c4