Merge branch '4.0'

javiereguiluz · javiereguiluz · commit ae790085c316 · 2018-05-02T13:28:41.000+02:00
* 4.0:
  Fix build creating placeholders for missing docs
  Fixed a RST syntax issue in versionadded directive
  Fix correct extension in comment of example
  Fix show code without new line
  Fix factory-service new syntax
  Fix spelling of TypeScript
  Adding Code of Conduct
diff --git a/contributing/code_of_conduct/concrete_example_document.rst b/contributing/code_of_conduct/concrete_example_document.rst
@@ -0,0 +1,30 @@
+Code of Conduct: Concrete Example Document
+==========================================
+
+This is a living document that serves to give concrete examples of
+unwanted behaviour. These examples have all taken place somewhere in the
+PHP community in the past, and are clear code of conduct violations
+according to the Symfony code of conduct.
+
+Concrete Examples
+-----------------
+
+* Unwelcome comments regarding a person’s lifestyle choices and practices,
+  including those related to food, health, parenting, drugs, and employment;
+* Deliberate misgendering or use of `dead names`_ (The birth name
+  of a person who has since changed their name, often a transgender person);
+* Threats of violence like "The person that created this PR should be
+  punched in the face";
+* Incitement of violence towards any individual, including encouraging a
+  person to commit suicide or to engage in self-harm (even as a joke);
+* Sustained disruption of discussion;
+* Pattern of inappropriate social contact, such as requesting/assuming
+  inappropriate levels of intimacy with others;
+* Continued one-on-one communication after requests to cease;
+* Putting down people based on their technology choices or their work.
+
+The original list is inspired and modified from `geek feminism`_ and
+confirmed by experiences from PHPWomen.
+
+.. _dead names: https://en.wiktionary.org/wiki/deadname
+.. _geek feminism: https://geekfeminism.org/about/code-of-conduct
diff --git a/contributing/code_of_conduct/enforcement_team.rst b/contributing/code_of_conduct/enforcement_team.rst
@@ -0,0 +1,5 @@
+Enforcement Team
+================
+
+We're preparing the "Enforcement Team" for the new Symfony Code of Conduct.
+Come back to this article in a few days to see the members of that team.
diff --git a/contributing/code_of_conduct/index.rst b/contributing/code_of_conduct/index.rst
@@ -0,0 +1,92 @@
+Code of Conduct
+===============
+
+Our Pledge
+----------
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnic origin, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance,
+religion, or sexual identity and orientation.
+
+Our Standards
+-------------
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+Our Responsibilities
+--------------------
+
+:doc:`Enforcement team members </contributing/code_of_conduct/enforcement_team>`
+are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Enforcement team members have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+Scope
+-----
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by enforcement team members.
+
+Enforcement
+-----------
+
+Instances of abusive, harassing, or otherwise unacceptable behavior
+:doc:`may be reported </contributing/code_of_conduct/reporting_guidelines>`
+by contacting the :doc:`enforcement team members </contributing/code_of_conduct/enforcement_team>`.
+All complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The enforcement team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Enforcement team members who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by the
+:doc:`core team </contributing/code/core_team>`.
+
+Attribution
+-----------
+
+This Code of Conduct is adapted from the `Contributor Covenant`_, version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+Related Documents
+-----------------
+
+.. toctree::
+    :maxdepth: 1
+
+    reporting_guidelines
+    enforcement_team
+    concrete_example_document
+
+.. _Contributor Covenant: https://www.contributor-covenant.org
diff --git a/contributing/code_of_conduct/reporting_guidelines.rst b/contributing/code_of_conduct/reporting_guidelines.rst
@@ -0,0 +1,6 @@
+Reporting Guidelines
+====================
+
+We're preparing the "Reporting Guidelines" to explain how can you report a
+violation of the new Symfony Code of Conduct. Come back to this article in a
+few days to see the process in detail.
diff --git a/contributing/documentation/translations.rst b/contributing/documentation/translations.rst
@@ -1,7 +1,14 @@
 Translations
 ============
 
-The official Symfony documentation is published only in English, but some
-community groups maintain `unofficial translations`_.
+The official Symfony documentation is published only in English. You can
+read about the reasons in `this blog post`_.
 
-.. _`unofficial translations`: https://symfony.com/blog/discontinuing-the-symfony-community-translations
+We have taken steps to improve the experience when using
+`Google Translate`_ to prevent code blocks from being translated.
+
+To translate any page in our documentation please copy any URL from the
+documentation and paste it into the form on the Google Translate site.
+
+.. _`this blog post`: https://symfony.com/blog/discontinuing-the-symfony-community-translations
+.. _`Google Translate`: https://translate.google.com
diff --git a/contributing/index.rst b/contributing/index.rst
@@ -4,6 +4,7 @@ Contributing
 .. toctree::
     :hidden:
 
+    code_of_conduct/index
     code/index
     documentation/index
     community/index
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -98,7 +98,7 @@ to :doc:`customize form rendering </form/form_customization>`):
 
     .. code-block:: html+php
 
-        <!-- templates/product/new.html.twig -->
+        <!-- templates/product/new.html.php -->
         <h1>Adding a new product</h1>
 
         <?php echo $view['form']->start($form) ?>
diff --git a/doctrine.rst b/doctrine.rst
@@ -109,7 +109,7 @@ need. The command will ask you some questions - answer them like done below:
     >
     (press enter again to finish)
 
-.. versionadded::
+.. versionadded:: 1.3
     The interactive behavior of the ``make:entity`` command was introduced
     in MakerBundle 1.3.
 
diff --git a/frontend.rst b/frontend.rst
@@ -51,7 +51,7 @@ Optimizing
 ..........
 
 * :doc:`Versioning (and the manifest.json file) </frontend/encore/versioning>`
-* :doc:`Using A CDN </frontend/encore/cdn>`
+* :doc:`Using a CDN </frontend/encore/cdn>`
 * :doc:`Creating a "Shared" entry for re-used modules </frontend/encore/shared-entry>`
 * :doc:`/frontend/encore/url-loader`
 
diff --git a/frontend/encore/versus-assetic.rst b/frontend/encore/versus-assetic.rst
@@ -45,7 +45,7 @@ So what are the differences between Assetic and Encore?
        images.
 
 .. [2] Assetic has outdated support for React.js only. Encore ships with modern
-       support for React.js, Vue.js, Typescript, etc.
+       support for React.js, Vue.js, TypeScript, etc.
 
 Should I Upgrade from Assetic to Encore
 ---------------------------------------
diff --git a/service_container/factories.rst b/service_container/factories.rst
@@ -105,7 +105,7 @@ Configuration of the service container then looks like this:
 
             App\Email\NewsletterManager:
                 # call a method on the specified factory service
-                factory: 'App\Email\NewsletterManagerFactory:createNewsletterManager'
+                factory: 'App\Email\NewsletterManagerFactory::createNewsletterManager'
 
     .. code-block:: xml
 
@@ -154,7 +154,7 @@ Configuration of the service container then looks like this:
         # config/services.yaml
         App\Email\NewsletterManager:
             # new syntax
-            factory: 'App\Email\NewsletterManagerFactory:createNewsletterManager'
+            factory: 'App\Email\NewsletterManagerFactory::createNewsletterManager'
             # old syntax
             factory: ['@App\Email\NewsletterManagerFactory', createNewsletterManager]
 
diff --git a/setup/flex.rst b/setup/flex.rst
@@ -74,12 +74,12 @@ SwiftmailerBundle:
     }
 
 The ``aliases`` option allows Flex to install packages using short and easy to
-remember names (``composer require mailer`` vs ``composer require
-symfony/swiftmailer-bundle``). The ``bundles`` option tells Flex in which
-environments this bundle should be enabled automatically (``all`` in this
-case). The ``env`` option makes Flex to add new environment variables to the
-application. Finally, the ``copy-from-recipe`` option allows the recipe to copy
-files and directories into your application.
+remember names (``composer require mailer`` vs
+``composer require symfony/swiftmailer-bundle``). The ``bundles`` option tells
+Flex in which environments this bundle should be enabled automatically (``all``
+in this case). The ``env`` option makes Flex to add new environment variables to
+the application. Finally, the ``copy-from-recipe`` option allows the recipe to
+copy files and directories into your application.
 
 The instructions defined in this ``manifest.json`` file are also used by
 Symfony Flex when uninstalling dependencies (e.g. ``composer remove mailer``)

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ need. The command will ask you some questions - answer them like done below:`
`109`	`109`	`>`
`110`	`110`	`(press enter again to finish)`
`111`	`111`
`112`		`-.. versionadded::`
	`112`	`+.. versionadded:: 1.3`
`113`	`113`	The interactive behavior of the ``make:entity`` command was introduced
`114`	`114`	`in MakerBundle 1.3.`
`115`	`115`