Merge branch 'live' into patch-5

Author: AFTOwen

powerapps-docs/maker/canvas-apps/functions/function-encode-decode.md

@@ -18,14 +18,14 @@ search.app:
 Encodes and decodes strings.
 
 ## Description
-The **EncodeUrl** function encodes a URL string, replacing non-alphanumeric characters with % and a hexadecimal number.  
+The **EncodeUrl** function encodes a URL string, replacing certain non-alphanumeric characters with % and a hexadecimal number.  
 
-The **PlainText** function removes HTML and XML tags, converting tags such as these to an appropriate symbol:
+The **PlainText** function removes HTML and XML tags, converting certain tags such as these to an appropriate symbol:
 
 * ** **
 * **"**
 
-The return value from these functions is the encoded or decoded string.   
+The return value from these functions is the encoded or decoded string. This function doesn't remove all HTML and XML tags. 
 
 ## Syntax
 **EncodeUrl**( *String* )

powerapps-docs/maker/canvas-apps/working-with-variables.md

@@ -100,7 +100,7 @@ Let's rebuild our adding machine by using a global variable:
 
 3. To update the running total whenever a user selects the **Add** button, set its **[OnSelect](controls/properties-core.md)** property to this formula:
 
-    **Set( RunningTotal, RunningTotal + Text1 )**
+    **Set( RunningTotal, RunningTotal + TextInput1 )**
 
     The first time a user selects the **Add** button and **[Set](functions/function-set.md)** is called, **RunningTotal** is created with a default value of *blank*.  In the addition, it will be treated as a zero.
 
@@ -163,7 +163,7 @@ Let's rebuild our adding machine by using a context variable:
 
 3. To update the running total whenever a user selects the **Add** button, set its **[OnSelect](controls/properties-core.md)** property to this formula:
 
-    **UpdateContext( { RunningTotal: RunningTotal + Text1 } )**
+    **UpdateContext( { RunningTotal: RunningTotal + TextInput1 } )**
 
     The first time a user selects the **Add** button and **[UpdateContext](functions/function-updatecontext.md)** is called, **RunningTotal** is created with a default value of *blank*.  In the addition, it will be treated as a zero.