[MERGE] Forward-port of 12.0 in 13.0

contributing/documentation.rst

@@ -9,4 +9,5 @@ Contributing to the documentation
 
    documentation/introduction_guide
    documentation/rst_cheat_sheet
-   documentation/guidelines
+   documentation/rst_guidelines
+   documentation/content_guidelines

contributing/documentation/content_guidelines.rst

@@ -0,0 +1,181 @@
+:banner: banners/contributing.png
+
+==================
+Content guidelines
+==================
+
+To give the community the best documentation possible, we listed here a few guidelines, tips and
+tricks that will make your content shine at its brightest! While we encourage you to adopt your own
+writing style, some rules still apply to give the reader more clarity and comprehension.
+
+.. note::
+   We strongly recommend contributors to carefully read the other documents in this *Contribution*
+   section of the documentation. Good knowledge of the ins and outs of **RST writing** is required
+   to write and submit your contribution. Note that it also affects your writing style itself.
+
+   - :doc:`introduction_guide`
+   - :doc:`rst_cheat_sheet`
+   - :doc:`rst_guidelines`
+
+.. _contributing/writing-style:
+
+Writing style
+=============
+
+**Writing for documentation** isn't the same as writing for a blog or another medium. Readers are
+more likely to skim read until they've found the information they are looking for. Keep in mind that
+the user documentation is a place to inform and describe, not to convince and promote.
+
+.. _contributing/consistency:
+
+Consistency
+-----------
+
+*Consistency is key to everything.*
+
+Make sure that your writing style remains **consistent**. If you modify an existing text, try to
+match the existing tone and presentation, or rewrite it to match your own style.
+
+.. _contributing/grammatical-tenses:
+
+Grammatical tenses
+------------------
+
+In English, descriptions and instructions require the use of a **Present Tense**, while a *future
+tense* is appropriate only when a specific event is to happen ulteriorly. This logic might be
+different in other languages.
+
+- | Good example (present):
+  | *Screenshots are automatically resized to fit the content block's width.*
+- | Bad example (future):
+  | *When you take a screenshot, remember that it will be automatically resized to fit the content
+     block's width.*
+
+.. _contributing/paragraphing:
+
+Paragraphing
+------------
+
+A paragraph comprises several sentences that are linked by a shared idea. They usually are two to
+six lines long.
+
+In English, a new idea implies a new paragraph, rather than having a *line break* as it is common to
+do in some other languages. *Line breaks* are useful for layout purposes but shouldn't be used as a
+grammatical way of separating ideas.
+
+.. seealso::
+   - :ref:`RST cheat sheet: Break the line but not the paragraph <contributing/line-break>`
+
+.. _contributing/titles:
+
+Titles
+------
+
+To write a good title :
+
+- **Be concise.**
+- **Avoid sentences**, questions, and titles starting with "how to."
+- **Don't use pronouns** in your titles, especially 2nd person (*your*)
+
+.. _contributing/document-structure:
+
+Document's structure
+====================
+
+Use different **headings levels** to organize your text by sections and sub-sections. Your headings
+are also displayed in a dynamic *navigation bar* on the side.
+
++---------------------------------------------------------------------------------------+
+| | **H1: Page Title**                                                                  |
+| | Your *page title* gives your reader a quick and clear understanding of what your    |
+|   content is about. It is also referenced in the section's *table of contents*.       |
+|                                                                                       |
+| The *content* in this section describes the upcoming content from a **business point  |
+| of view**, and shouldn't put the emphasis on Odoo, as this is documentation and not   |
+| marketing.                                                                            |
+|                                                                                       |
+| Start first with a **Lead Paragraph**, which helps the reader make sure that they've  |
+| found the right page, then explain the **business aspects of this topic** in the      |
+| following paragraphs.                                                                 |
++-----+---------------------------------------------------------------------------------+
+|     | | **H2: Section Title (configuration)**                                         |
+|     | | This first H2 section is about the configuration of the feature, or the       |
+|     |   prerequisites to achieve a specific goal. To add a path, make sure you        |
+|     |   use the ``:menuselection:`` specialized directive (see link below).           |
+|     |                                                                                 |
+|     | | Example:                                                                      |
+|     | | To do so, go to ``:menuselection:`App name --> Menu --> Sub-menu```, and      |
+|     |   enable the XYZ feature.                                                       |
++-----+---------------------------------------------------------------------------------+
+|     | | **H2: Section Title (main sections)**                                         |
+|     | | Create as many main sections as you have actions or features to distinguish.  |
+|     |   The title can start with a verb, but try to avoid using "Create ...".         |
++-----+-----+---------------------------------------------------------------------------+
+|     |     | | **H3: Subsection**                                                      |
+|     |     | | Subsections are perfect for assessing very specific points. The title   |
+|     |     |   can be in the form of a question, if appropriate.                       |
++-----+-----+---------------------------------------------------------------------------+
+|     | **H2: Next Section**                                                            |
++-----+---------------------------------------------------------------------------------+
+
+.. seealso::
+   - :ref:`RST cheat sheet: headings <contributing/headings>`
+   - :ref:`RST cheat sheet: specialized directives <contributing/specialized-directives>`
+
+.. _contributing/content-images:
+
+Images
+======
+
+Adding a few images to illustrate your text helps the readers to understand and memorize your
+content. However, avoid adding too many images: it isn't necessary to illustrate all steps and
+features, and it may overload your page.
+
+.. important::
+   Don't forget to :ref:`compress your PNG files with pngquant <contributing/pngquant>`.
+
+.. _contributing/screenshots:
+
+Screenshots
+-----------
+
+Screenshots are automatically resized to fit the content block's width. This implies that
+screenshots can't be too wide, else they would appear very small on-screen. Therefore, we recommend
+to avoid to take screenshots of a full screen display of the app, unless it is relevant to do so.
+
+A few tips to improve your screenshots:
+
+#. **Zoom** in your browser. We recommend a 110% zoom for better results.
+#. **Resize** your browser's width, either by *resizing the window* itself or by opening the
+   *browser's developer tools* (press the ``F12`` key) and resizing the width.
+#. **Select** the relevant area, rather than keeping the full window.
+#. If necessary, you can **edit** the screenshot to remove unnecessary fields and to narrow even
+   more Odoo's display.
+
+.. image:: media/screenshot-tips.gif
+   :align: center
+   :alt: Three tips to take good screenshots for the Odoo documentation.
+
+.. note::
+   Resizing the window's width is the most important step to do as Odoo's responsive design
+   automatically resizes all fields to match the window's width.
+
+.. _contributing/alt-tags:
+
+ALT tags
+--------
+
+An **ALT tag** is a *text alternative* to an image. This text is displayed if the browser fails to
+render the image. It is also helpful for users who are visually impaired. Finally, it helps
+search engines, such as Google, to understand what the image is about and index it correctly, which
+improves the :abbr:`SEO (Search Engine Optimization)` significantly.
+
+Good ALT tags are:
+
+- **Short** (one line maximum)
+- **Not a repetition** of a previous sentence or title
+- A **good description** of the action happening on the image
+- Easily **understandable** if read aloud
+
+.. seealso::
+   - :ref:`RST cheat sheet: image directive <contributing/image>`

contributing/documentation/introduction_guide.rst

@@ -32,13 +32,15 @@ If you need to learn about a specific markup, head over to :doc:`our cheat sheet
 documentation of Odoo.
 
 .. important::
-   We kindly ask you to observe a set of :doc:`guidelines <guidelines>` as you write :abbr:`RST
-   (reStructuredText)`. This ensures that you stay consistent with the rest of the documentation and
-   facilitates the approval of your content changes as they are reviewed by a redactor at Odoo.
+   We kindly ask you to observe a set of :doc:`content <content_guidelines>` and :doc:`RST
+   <rst_guidelines>` guidelines as you write documentation. This ensures that you stay consistent
+   with the rest of the documentation and facilitates the approval of your content changes as they
+   are reviewed by a redactor at Odoo.
 
 .. seealso::
    - :doc:`rst_cheat_sheet`
-   - :doc:`guidelines`
+   - :doc:`rst_guidelines`
+   - :doc:`content_guidelines`
 
 .. _contributing/getting-started:
 
@@ -81,7 +83,8 @@ Use the GitHub interface
 
    .. image:: media/fork-repository.png
 
-#. Make the appropriate changes while taking care of following the :doc:`guidelines <guidelines>`.
+#. Make the appropriate changes while taking care of following the :doc:`guidelines
+   <rst_guidelines>`.
 
 #. Click on the **Preview changes** button to review your contribution in a more human-readable
    format. Be aware that the preview is not able to handle all markups correctly. Notes and tips,
@@ -307,7 +310,7 @@ Perform your changes
 
 You can now perform any change you want to the documentation files. These changes must be compliant
 with :abbr:`RST (reStructuredText)` syntax (see :doc:`rst_cheat_sheet`) and with our
-:doc:`guidelines <guidelines>`.
+:doc:`guidelines <rst_guidelines>`.
 
 .. important::
    If your changes include the addition of a new image, for instance :file:`my_image.png`, proceed

contributing/documentation/rst_guidelines.rst

@@ -1,8 +1,8 @@
 :banner: banners/contributing.png
 
-==========
-Guidelines
-==========
+==============
+RST guidelines
+==============
 
 .. _contributing/relative-links:
 

odoo_sh/advanced/submodules.rst

@@ -37,6 +37,10 @@ Adding a submodule
 With Odoo.sh (simple)
 ---------------------
 
+.. warning::
+   For now it is not possible to add **private** repositories with this method. You can nevertheless
+   do so :ref:`with Git <odoosh-advanced-submodules-withgit>`.
+
 On Odoo.sh, in the branches view of your project, choose the branch in which you want to add a submodule.
 
 In the upper right corner, click on the *Submodule* button, and then on *Run*.
@@ -58,9 +62,6 @@ On Github, you can get the repository URL with the *Clone or download* button of
 .. image:: ./media/advanced-submodules-github-sshurl.png
   :align: center
 
-For now it is not possible to add **private** repositories with this method.
-You can nevertheless do so :ref:`with Git <odoosh-advanced-submodules-withgit>`.
-
 .. _odoosh-advanced-submodules-withgit:
 
 With Git (advanced)

redirects.txt

@@ -26,7 +26,7 @@
 
 # Redirections introduced in 11.0 :
 
-
+contributing/documentation/guidelines.rst contributing/documentation/rst_guidelines.rst  # guidelines --> rst_guidelines
 
 # Redirections introduced in 12.0 :
 
@@ -143,4 +143,4 @@ helpdesk/invoice_time.rst helpdesk/timesheet_and_invoice/invoice_time.rst
 helpdesk/reinvoice_from_project.rst helpdesk/timesheet_and_invoice/reinvoice_from_project.rst    # (#565)
 
 planning/duplicate_a_planning.rst planning/overview/duplicate_a_planning.rst    # (#567)
-planning/send_planned_shifts.rst planning/overview/send_planned_shifts.rst      # (#567)
+planning/send_planned_shifts.rst planning/overview/send_planned_shifts.rst      # (#567)