[MERGE] forward port from 11.0

accounting/localizations/mexico.rst

@@ -269,34 +269,34 @@ process in Odoo, this considerations to understand the behavior are important.
 
    **1.1. How can I generate an invoice with payment term `PUE`?**
 
-   `According to the SAT documentation`_ a payment is classified as `PUE` if
+   `According to the SAT documentation`_ a payment is classified as ``PUE`` if
    the invoice was agreed to be fully payed before the 17th of the next
    calendar month (the next month of the CFDI date), any other condition
-   will generate a `PPD` invoice.
+   will generate a ``PPD`` invoice.
 
    **1.2. How can I get this with Odoo?**
 
    In order to set the appropriate CFDI payment term (PPD or PUE), you can
-   easily set it by using the `Payment Terms` defined in the invoice.
+   easily set it by using the ``Payment Terms`` defined in the invoice.
 
-   - If an invoice is generated without `Payment Term` the attribute
+   - If an invoice is generated without ``Payment Term`` the attribute
-     `MetodoPago` will be `PUE`.
+     ``MetodoPago`` will be ``PUE``.
 
    - Today, if is the first day of the month and is generated an invoice with
-     `Payment Term` `30 Net Days` the `Due Date` calculated is going to be
+     ``Payment Term`` ``30 Net Days`` the ``Due Date`` calculated is going to
-     the first day of the following month, this means its before the 17th of
+     be the first day of the following month, this means its before the 17th
-     the next month, then the attribute `MetodoPago` will be `PUE`.
+     of the next month, then the attribute ``MetodoPago`` will be ``PUE``.
 
-   - Today, if an invoice is generated with `Payment Term` `30 Net Days` and
+   - Today, if an invoice is generated with ``Payment Term`` ``30 Net Days``
-     the `Due Date` is higher than the day 17 of the next month the
+     and the ``Due Date`` is higher than the day 17 of the next month the
-     `MetodoPago` will be `PPD`.
+     ``MetodoPago`` will be ``PPD``.
 
-   - If having a `Payment Term` with 2 lines or more, for example
+   - If having a ``Payment Term`` with 2 lines or more, for example
-     `30% Advance End of Following Month`, this is an installments term,
+     ``30% Advance End of Following Month``, this is an installments term,
-     then the attribute `MetodoPago` will be `PPD`.
+     then the attribute ``MetodoPago`` will be ``PPD``.
 
 2. To test a normal signed payment just create an invoice with payment term
-   `30% Advance End of Following Month` and then register a payment to it.
+   ``30% Advance End of Following Month`` and then register a payment to it.
 3. You must print the payment in order to retrieve the PDF properly.
 4. Regarding the "Payments in Advance" you must create a proper invoice with
    the payment in advance itself as a product line setting the proper SAT code

accounting/overview/main_concepts/intro.rst

@@ -38,4 +38,4 @@ through all your companies data.
 
 Of course, Odoo is mobile too. You can use it to check your accounts on the go.
 
-Try Odoo now, and join 2 millions of happy users.
+Try Odoo now, and join 2 million happy users.

odoo_sh/advanced/containers.rst

@@ -78,7 +78,7 @@ Here are the Odoo.sh pertinent directories:
 Both Python 2.7 and 3.5 are installed in the containers. However:
 
 * If your project is configured to use Odoo 10.0, the Odoo server runs with Python 2.7.
-* If your project is configured to use Odoo 11.0, the Odoo server runs with Python 3.5.
+* If your project is configured to use Odoo 11.0 or greater, the Odoo server runs with Python 3.5.
 
 Database shell
 ==============

odoo_sh/getting_started/branches.rst

@@ -284,11 +284,11 @@ The production branch has no settings. It can't be muted, will always update the
 run on the project's version of Odoo. If you want to upgrade your production to a newer version please refer to the
 :ref:`Upgrade section <odoosh-advanced-upgrade_your_database>`.
 
-Git commands
+Shell commands
-============
+==============
-In the top right-hand corner of the view, different Git commands are available.
+In the top right-hand corner of the view, different shell commands are available.
 
-.. image:: ./media/interface-branches-gitcommands.png
+.. image:: ./media/interface-branches-shellcommands.png
    :align: center
 
 Each command can be copied in the clipboard to be used in a terminal,
@@ -343,6 +343,24 @@ Merges the branch *staging-1* in the current branch.
 
 Uploads the changes you just added in the *master* branch on your remote repository.
 
+SSH
+---
+Connect to your builds using ssh. 
+
+.. code-block:: bash
+
+  $ ssh <build_id>@<domain>
+
+You can configure your ssh keys in your profile settings in the top-right menu when clicking on your username.
+
+Provided you have the :ref:`correct access rights <odoosh-gettingstarted-settings-collaborators>` on the project,
+you'll be granted ssh access to the build.
+
+.. Note::
+  Long running ssh connections are not guaranteed. Idle connections will be
+  disconnected in order to free up resources.
+
+
 Submodule
 ---------
 

odoo_sh/getting_started/create.rst

@@ -77,7 +77,7 @@ You can start using Odoo.sh. Your first build is about to be created. You will s
 Import your database
 ====================
 
-You can import your database in your Odoo.sh project as long as this is an Odoo 10.0 or 11.0 database.
+You can import your database in your Odoo.sh project as long as this is an Odoo 10.0, 11.0 or 12.0 database.
 
 Push your modules in production
 -------------------------------

odoo_sh/getting_started/settings.rst

@@ -25,6 +25,8 @@ This defines the address that will be used to access your production database.
 Addresses of your staging and development builds are derived from this name and assigned automatically.
 However, when you change your project name, only future builds will use the new name.
 
+.. _odoosh-gettingstarted-settings-collaborators:
+
 Collaborators
 =============