[MERGE] forward port branch 11.0 up to b05e4d5f958

4 files changed, 58 insertions, 2 deletions

diff --git a/doc/cla/corporate/eficent.md b/doc/cla/corporate/eficent.md
index 284e2b7b691..70184f115c8 100644
--- a/doc/cla/corporate/eficent.md
+++ b/doc/cla/corporate/eficent.md
@@ -14,7 +14,6 @@ List of contributors:
 
 Aarón Henríquez ahenriquez@eficent.com https://github.com/aheficent
 Lois Rilo lois.rilo@eficent.com https://github.com/lreficent
-Roser Garcia roser.garcia@eficent.com https://github.com/rgarnau
 Miquel Raich miquel.raich@eficent.com https://github.com/mreficent
 Jordi Ballester jordi.ballester@eficent.com https://github.com/jbeficent
 Hector Villarreal hector.villarreal@eficent.com https://github.com/hveficent
diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst
index 5252ed5b776..f9158631282 100644
--- a/doc/howtos/themes.rst
+++ b/doc/howtos/themes.rst
@@ -686,7 +686,7 @@ The previous code will create the snippet’s content, but we still need to plac
 .. code-block:: xml
 
    <template id="place_into_bar" inherit_id="website.snippets" name="Place into bar">
-     <xpath expr="//div[@id='snippet_content']/div[@class='o_panel_body']" position="inside">
+     <xpath expr="//div[@id='snippet_structure']/div[@class='o_panel_body']" position="inside">
        <t t-snippet="theme_tutorial.snippet_testimonial"
           t-thumbnail="/theme_tutorial/static/src/img/ui/snippet_thumb.jpg"/>
      </xpath>
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst
index 4171f12c5e1..12cd5f7a9d8 100644
--- a/doc/reference/cmdline.rst
+++ b/doc/reference/cmdline.rst
@@ -221,6 +221,45 @@ database
     'verify-ca' or 'verify-full'
     Default value is 'prefer'
 
+.. _reference/cmdline/server/internationalisation:
+
+Internationalisation
+--------------------
+
+Use these options to translate Odoo to another language. See i18n section of
+the user manual. Option '-d' is mandatory. Option '-l' is mandatory in case
+of importation
+
+.. option:: --load-language <languages>
+
+    specifies the languages (separated by commas) for the translations you
+    want to be loaded
+
+.. option:: -l, --language <language>
+
+    specify the language of the translation file. Use it with --i18n-export
+    or --i18n-import
+
+.. option:: --i18n-export <filename>
+
+    export all sentences to be translated to a CSV file, a PO file or a TGZ
+    archive and exit.
+
+.. option:: --i18n-import <filename>
+
+    import a CSV or a PO file with translations and exit. The '-l' option is
+    required.
+
+.. option:: --i18n-overwrite
+
+    overwrites existing translation terms on updating a module or importing
+    a CSV or a PO file.
+
+.. option:: --modules
+
+    specify modules to export. Use in combination with --i18n-export
+
+
 built-in HTTP
 -------------
 
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index b77aa9f5612..3c782ed00a8 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -1329,11 +1329,27 @@ order.
 
     - Supported field types: *date*, *datetime*
 
+    Options:
+
+    - datepicker: extra settings for the datepicker_ widget.
+
+    .. code-block:: xml
+
+        <field name="datefield" options='{"datepicker": {"daysOfWeekDisabled": [0, 6]}}'/>
+
 - datetime (FieldDateTime)
     This is the default field type for fields of type *datetime*.
 
     - Supported field types: *date*, *datetime*
 
+    Options:
+
+    - datepicker: extra settings for the datepicker_ widget.
+
+    .. code-block:: xml
+
+        <field name="datefield" options='{"datepicker": {"daysOfWeekDisabled": [0, 6]}}'/>
+
 - monetary (FieldMonetary)
     This is the default field type for fields of type 'monetary'. It is used to
     display a currency.  If there is a currency fields given in option, it will
@@ -1814,4 +1830,6 @@ Relational fields
 .. _event delegation:
     http://api.jquery.com/delegate/
 
+.. _datepicker: https://github.com/Eonasdan/bootstrap-datetimepicker
+
 .. _deferred: http://api.jquery.com/category/deferred-object/