From 3c0d6e5d0400e84436a4e41e2d14456583e09bec Mon Sep 17 00:00:00 2001
From: Chriztian Steinmeier <greystate@users.noreply.github.com>
Date: Sun, 3 Oct 2021 19:00:58 +0200
Subject: [PATCH 1/2] Clarify the use of placeholders

Since the placeholder is only replaced if it's at the beginning of the query, I've added a note about it.

Also made the spelling of XPath consistent and fixed a nesting error in the HTML.
---
 .../src/views/prevalueeditors/treesource.html | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index f56a6c8656ad..4a52fa4ab0ed 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -27,7 +27,7 @@
             </button>
             <div class="mt2" ng-show="model.value.type == 'content'">
                 <umb-icon icon="icon-search" class="icon"></umb-icon>
-                <button type="button" class="btn-link" ng-click="showSearch = true">Query for root node with xpath</button>
+                <button type="button" class="btn-link" ng-click="showSearch = true">Query for root node with XPath</button>
             </div>
         </div>
 
@@ -36,23 +36,25 @@
             <input type="text"
                    ng-model="model.value.query"
                    class="umb-property-editor umb-textstring"
-                   placeholder="Enter xpath query">
+                   placeholder="Enter XPath query">
 
             <ul class="unstyled list-icons mt3">
                 <li style="max-width: 600px">
                     <umb-icon icon="icon-help-alt" class="icon"></umb-icon>
-                    <button type="button" class="btn-link" ng-click="showHelp = !showHelp">{{showHelp ? 'Hide' : 'Show'}} xpath query help</button>
+                    <button type="button" class="btn-link" ng-click="showHelp = !showHelp">{{showHelp ? 'Hide' : 'Show'}} XPath query help</button>
 
                     <div class="small" ng-show="showHelp">
                         <p>
-                            Use Xpath query to set a root node on the tree, either based on a search from the root of the content tree, or by using a context-aware placeholder.
+                            Use an XPath query to set a root node on the tree, either based on a search from the root of the content tree, or by using a context-aware placeholder.
                         </p>
 
                         <p>
                             Placeholders finds the nearest published ID and runs its query from there, so for instance:
-
-                            <pre>$parent/newsArticle</pre>
-
+                        </p>
+                        
+                        <pre>$parent/newsArticle</pre>
+                        
+                        <p>
                             Will try to get the parent if available, but will then fall back to the nearest ancestor and query for all news articles there.
                         </p>
 
@@ -63,6 +65,9 @@
                             <code>$root</code>: root of the content tree<br/>
                             <code>$site</code>: Ancestor node at level 1 <br/>
                         </p>
+                        <p>
+                            Note: The placeholder can only be used at the beginning of the query.
+                        </p>
                     </div>
                 </li>
                 <li>

From 762686fc9407dccda48e0f872722457788c794fe Mon Sep 17 00:00:00 2001
From: Chriztian Steinmeier <chriztian@steinmeier.dk>
Date: Sat, 16 Oct 2021 00:10:44 +0200
Subject: [PATCH 2/2] Rephrase a couple of sentences

---
 .../src/views/prevalueeditors/treesource.html        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
index 4a52fa4ab0ed..0ab66c964efb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
+++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html
@@ -49,21 +49,21 @@
                         </p>
 
                         <p>
-                            Placeholders finds the nearest published ID and runs its query from there, so for instance:
+                            A placeholder finds the nearest published ID and runs its query from there, so for instance:
                         </p>
                         
                         <pre>$parent/newsArticle</pre>
                         
                         <p>
-                            Will try to get the parent if available, but will then fall back to the nearest ancestor and query for all news articles there.
+                            Will try to get the parent if available, but will then fall back to the nearest ancestor and query for all news article children there.
                         </p>
 
                         <p>
                             Available placeholders: <br/>
-                            <code>$current</code>: current page or closest found ancestor<br/>
-                            <code>$parent</code>: parent page or closest found ancestor<br/>
-                            <code>$root</code>: root of the content tree<br/>
-                            <code>$site</code>: Ancestor node at level 1 <br/>
+                            <code>$current</code>: Current page or closest found ancestor<br/>
+                            <code>$parent</code>: Parent page or closest found ancestor<br/>
+                            <code>$root</code>: Root of the content tree<br/>
+                            <code>$site</code>: Ancestor node at level 1<br/>
                         </p>
                         <p>
                             Note: The placeholder can only be used at the beginning of the query.