Merge branch '3.4' into 4.2

javiereguiluz · javiereguiluz · commit 2f97fffe4aa1 · 2019-03-25T10:33:02.000+01:00
* 3.4:
  Fixed a syntax issue
  grammar typo
  Fixing minor error
diff --git a/reference/forms/types/entity.rst b/reference/forms/types/entity.rst
@@ -216,9 +216,9 @@ loading all entities.
 
 .. caution::
 
-    The entity used in the ``FROM`` clause of the `query_builder`_ option
-    will always be validated against the class which you have specified with
-    the form's `class`_ option. If you return another entity instead of the
+    The entity used in the ``FROM`` clause of the ``query_builder`` option
+    will always be validated against the class which you have specified at the
+    `class`_ option. If you return another entity instead of the
     one used in your ``FROM`` clause (for instance if you return an entity
     from a joined table), it will break validation.
     
diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst
@@ -13,7 +13,7 @@ in the session, so that it's used on subsequent requests.
 Creating a LocaleSubscriber
 ---------------------------
 
-Create and a :ref:`new event subscriber <events-subscriber>`. Typically, ``_locale``
+Create a :ref:`new event subscriber <events-subscriber>`. Typically, ``_locale``
 is used as a routing parameter to signify the locale, though you can determine the
 correct locale however you want::
 
