From fd433a16ce4fe15f1040e2a96eab4c6102243701 Mon Sep 17 00:00:00 2001
From: Yonel Ceruto <yonelceruto@gmail.com>
Date: Thu, 5 Jul 2018 08:32:11 -0400
Subject: [PATCH 1/4] Document Twig test "rootform"

---
 reference/forms/twig_reference.rst | 24 ++++++++++++++++++++++++
 reference/twig_reference.rst       | 13 +++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst
index 581061f75ae..7687bc778e9 100644
--- a/reference/forms/twig_reference.rst
+++ b/reference/forms/twig_reference.rst
@@ -217,6 +217,30 @@ array).
 
     <option {% if choice is selectedchoice(value) %} selected="selected"{% endif %} ...>
 
+.. _form-twig-rootform:
+
+rootform
+~~~~~~~~
+
+This test will check for sure if the current ``form`` does not have a parent form view.
+It would avoid collision and odd behavior when your form has defined a ``parent`` field.
+
+Wrong example if your form has a field named ``parent``:
+
+.. code-block:: jinja
+
+    {% if form.parent is null %}
+        {{ form_errors(form) }}
+    {% endif %}
+
+Correct example, this will check for the parent form view rather than its ``parent`` field:
+
+.. code-block:: jinja
+
+    {% if form is rootform %}
+        {{ form_errors(form) }}
+    {% endif %}
+
 .. _`twig-reference-form-variables`:
 
 More about Form Variables
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
index 8876ad70653..92f04a1486c 100644
--- a/reference/twig_reference.rst
+++ b/reference/twig_reference.rst
@@ -750,6 +750,19 @@ selectedchoice
 Checks if ``selectedValue`` was checked for the provided choice field. Using
 this test is the most effective way.
 
+rootform
+~~~~~~~~
+
+.. code-block:: twig
+
+    {% if form is rootform %}
+
+``form``
+    **type**: ``FormView``
+
+Checks for sure if the current ``form`` does not have a parent form view. Using
+this test is the safest way if your form contains a ``parent`` field.
+
 Global Variables
 ----------------
 

From 740803eb251c4084a49c68160e2ffef8e9aae166 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 5 Jul 2018 16:48:58 +0200
Subject: [PATCH 2/4] Reword

---
 reference/twig_reference.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
index 92f04a1486c..e7bf76e0931 100644
--- a/reference/twig_reference.rst
+++ b/reference/twig_reference.rst
@@ -760,8 +760,9 @@ rootform
 ``form``
     **type**: ``FormView``
 
-Checks for sure if the current ``form`` does not have a parent form view. Using
-this test is the safest way if your form contains a ``parent`` field.
+Checks if the given ``form`` does not have a parent form view. This is the only
+safe way of testing it because checking if the form contains a field called
+``parent`` is not reliable.
 
 Global Variables
 ----------------

From 423bfae89b81cead319273ea1b9c1aef3430e127 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 5 Jul 2018 16:55:47 +0200
Subject: [PATCH 3/4] Minor reword

---
 reference/forms/twig_reference.rst | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst
index 7687bc778e9..5e9cf79a208 100644
--- a/reference/forms/twig_reference.rst
+++ b/reference/forms/twig_reference.rst
@@ -222,20 +222,18 @@ array).
 rootform
 ~~~~~~~~
 
-This test will check for sure if the current ``form`` does not have a parent form view.
-It would avoid collision and odd behavior when your form has defined a ``parent`` field.
+This test will check if the current ``form`` does not have a parent form view.
 
-Wrong example if your form has a field named ``parent``:
+.. code-block:: twig
 
-.. code-block:: jinja
+    {# DON'T DO THIS: this code will fail when the form doesn't have a parent
+       but it defines a normal form field called 'parent' #}
 
     {% if form.parent is null %}
         {{ form_errors(form) }}
     {% endif %}
 
-Correct example, this will check for the parent form view rather than its ``parent`` field:
-
-.. code-block:: jinja
+    {# DO THIS: this code will always work, regardless of the form field names #}
 
     {% if form is rootform %}
         {{ form_errors(form) }}

From cf355c957567b777cb2653a2fa99672baa8757d8 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Fri, 6 Jul 2018 09:01:07 +0200
Subject: [PATCH 4/4] Reworded the code comments

---
 reference/forms/twig_reference.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/reference/forms/twig_reference.rst b/reference/forms/twig_reference.rst
index 5e9cf79a208..312ca2fb7a7 100644
--- a/reference/forms/twig_reference.rst
+++ b/reference/forms/twig_reference.rst
@@ -226,14 +226,14 @@ This test will check if the current ``form`` does not have a parent form view.
 
 .. code-block:: twig
 
-    {# DON'T DO THIS: this code will fail when the form doesn't have a parent
-       but it defines a normal form field called 'parent' #}
+    {# DON'T DO THIS: this simple check can't differentiate between a form having
+       a parent form view and a form defining a normal form field called 'parent' #}
 
     {% if form.parent is null %}
         {{ form_errors(form) }}
     {% endif %}
 
-    {# DO THIS: this code will always work, regardless of the form field names #}
+   {# DO THIS: this check is always reliable, even if the form defines a field called 'parent' #}
 
     {% if form is rootform %}
         {{ form_errors(form) }}