This commit is contained in:
Javier Eguiluz
2022-12-08 14:41:37 +01:00
parent 8bc359dd9b
commit 9e02e5b876
4 changed files with 10 additions and 10 deletions

View File

@@ -195,7 +195,7 @@ b. You may Distribute or Publicly Perform an Adaptation only under the terms of:
(i) this License; (ii) a later version of this License with the same License
Elements as this License; (iii) a Creative Commons jurisdiction license (either
this or a later license version) that contains the same License Elements as this
License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons
License (e.g. Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons
Compatible License. If you license the Adaptation under one of the licenses
mentioned in (iv), you must comply with the terms of that license. If you
license the Adaptation under the terms of any of the licenses mentioned in (i),
@@ -221,7 +221,7 @@ Collections, You must, unless a request has been made pursuant to Section 4(a),
keep intact all copyright notices for the Work and provide, reasonable to the
medium or means You are utilizing: (i) the name of the Original Author (or
pseudonym, if applicable) if supplied, and/or if the Original Author and/or
Licensor designate another party or parties (e.g., a sponsor institute,
Licensor designate another party or parties (e.g. a sponsor institute,
publishing entity, journal) for attribution ("Attribution Parties") in
Licensor's copyright notice, terms of service or by other reasonable means, the
name of such party or parties; (ii) the title of the Work if supplied; (iii) to
@@ -229,7 +229,7 @@ the extent reasonably practicable, the URI, if any, that Licensor specifies to
be associated with the Work, unless such URI does not refer to the copyright
notice or licensing information for the Work; and (iv) , consistent with Section
3(b), in the case of an Adaptation, a credit identifying the use of the Work in
the Adaptation (e.g., "French translation of the Work by Original Author," or
the Adaptation (e.g. "French translation of the Work by Original Author," or
"Screenplay based on original Work by Original Author"). The credit required by
this Section 4(c) may be implemented in any reasonable manner; provided,
however, that in the case of a Adaptation or Collection, at a minimum such

View File

@@ -81,7 +81,7 @@ Configuration
Use Environment Variables for Infrastructure Configuration
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The values of these options change from one machine to another (e.g., from your
The values of these options change from one machine to another (e.g. from your
development machine to the production server), but they don't modify the
application behavior.
@@ -271,7 +271,7 @@ Templates
Use Snake Case for Template Names and Variables
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Use lowercase snake_case for template names, directories, and variables (e.g.,
Use lowercase snake_case for template names, directories, and variables (e.g.
``user_profile`` instead of ``userProfile`` and ``product/edit_form.html.twig``
instead of ``Product/EditForm.html.twig``).
@@ -280,7 +280,7 @@ Prefix Template Fragments with an Underscore
Template fragments, also called *"partial templates"*, allow to
:ref:`reuse template contents <templates-reuse-contents>`. Prefix their names
with an underscore to better differentiate them from complete templates (e.g.,
with an underscore to better differentiate them from complete templates (e.g.
``_user_metadata.html.twig`` or ``_caution_message.html.twig``).
Forms
@@ -361,7 +361,7 @@ Define a Single Firewall
~~~~~~~~~~~~~~~~~~~~~~~~
Unless you have two legitimately different authentication systems and users
(e.g., form login for the main site and a token system for your API only), it's
(e.g. form login for the main site and a token system for your API only), it's
recommended to have only one firewall to keep things simple.
Additionally, you should use the ``anonymous`` key under your firewall. If you

View File

@@ -152,7 +152,7 @@ score for Impact is capped at 6. Each area is scored between 0 and 4.*
on an end-users system, or the server that it runs on? (0-4)
* Availability: Is the availability of a service or application affected? Is
it reduced availability or total loss of availability of a service /
application? Availability includes networked services (e.g., databases) or
application? Availability includes networked services (e.g. databases) or
resources such as consumption of network bandwidth, processor cycles, or
disk space. (0-4)

View File

@@ -724,10 +724,10 @@ configure the ``providers`` option:
.. tip::
If you use Lokalise as provider and a locale format following the `ISO 639-1`_ (e.g., "en" or "fr"),
If you use Lokalise as provider and a locale format following the `ISO 639-1`_ (e.g. "en" or "fr"),
you have to set the `Custom Language Name setting`_ in Lokalise for each of your locales,
in order to override the default value (which follow the `ISO 639-1`_ succeeded by a sub-code
in capital letters that specifies the national variety (e.g., "GB" or "US" according to `ISO 3166-1 alpha-2`_)).
in capital letters that specifies the national variety (e.g. "GB" or "US" according to `ISO 3166-1 alpha-2`_)).
Pushing and Pulling Translations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~