From 20077c1223341bcc20a9f017250fefe1f21f8e39 Mon Sep 17 00:00:00 2001
From: Next Turn <45985406+NextTurn@users.noreply.github.com>
Date: Wed, 22 Jul 2020 13:47:53 -0700
Subject: [PATCH 1/3] Distinguish ModifyAccessRule/ModifyAuditRule params from
 returns (#4006)

---
 xml/System.DirectoryServices/ActiveDirectorySecurity.xml | 4 ++--
 xml/System.Security.AccessControl/ObjectSecurity.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xml/System.DirectoryServices/ActiveDirectorySecurity.xml b/xml/System.DirectoryServices/ActiveDirectorySecurity.xml
index cab34b01673..0be2c6eae01 100644
--- a/xml/System.DirectoryServices/ActiveDirectorySecurity.xml
+++ b/xml/System.DirectoryServices/ActiveDirectorySecurity.xml
@@ -391,7 +391,7 @@
         <param name="modification">The type of access control modification to perform.</param>
         <param name="rule">The access rule to modify.</param>
         <param name="modified">
-          <see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</param>
+          <see langword="true" /> if actually modified; otherwise, <see langword="false" />.</param>
         <summary>Applies the specified modification to the specified <see cref="T:System.Security.AccessControl.AccessRule" />.</summary>
         <returns>
           <see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</returns>
@@ -424,7 +424,7 @@
         <param name="modification">The modification to apply.</param>
         <param name="rule">The audit rule to modify.</param>
         <param name="modified">
-          <see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</param>
+          <see langword="true" /> if actually modified; otherwise, <see langword="false" />.</param>
         <summary>Applies the specified modification to the specified <see cref="T:System.Security.AccessControl.AuditRule" />.</summary>
         <returns>
           <see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</returns>
diff --git a/xml/System.Security.AccessControl/ObjectSecurity.xml b/xml/System.Security.AccessControl/ObjectSecurity.xml
index b3e52dc343e..d2ba3279831 100644
--- a/xml/System.Security.AccessControl/ObjectSecurity.xml
+++ b/xml/System.Security.AccessControl/ObjectSecurity.xml
@@ -873,7 +873,7 @@
         <param name="modification">The modification to apply to the DACL.</param>
         <param name="rule">The access rule to modify.</param>
         <param name="modified">
-          <see langword="true" /> if the DACL is successfully modified; otherwise, <see langword="false" />.</param>
+          <see langword="true" /> if the DACL is actually modified; otherwise, <see langword="false" />.</param>
         <summary>Applies the specified modification to the Discretionary Access Control List (DACL) associated with this <see cref="T:System.Security.AccessControl.ObjectSecurity" /> object.</summary>
         <returns>
           <see langword="true" /> if the DACL is successfully modified; otherwise, <see langword="false" />.</returns>
@@ -921,7 +921,7 @@
         <param name="modification">The modification to apply to the SACL.</param>
         <param name="rule">The audit rule to modify.</param>
         <param name="modified">
-          <see langword="true" /> if the SACL is successfully modified; otherwise, <see langword="false" />.</param>
+          <see langword="true" /> if the SACL is actually modified; otherwise, <see langword="false" />.</param>
         <summary>Applies the specified modification to the System Access Control List (SACL) associated with this <see cref="T:System.Security.AccessControl.ObjectSecurity" /> object.</summary>
         <returns>
           <see langword="true" /> if the SACL is successfully modified; otherwise, <see langword="false" />.</returns>

From a19b9d9de0c49f1b0e3c038bb48f7dd30f296b7d Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahson_ahmedk@yahoo.com>
Date: Wed, 22 Jul 2020 14:42:41 -0700
Subject: [PATCH 2/3] Highlight that the link to unsafe-escaping shows why it
 is unsafe. (#4561)

---
 xml/System.Text.Encodings.Web/JavaScriptEncoder.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/System.Text.Encodings.Web/JavaScriptEncoder.xml b/xml/System.Text.Encodings.Web/JavaScriptEncoder.xml
index 7a9fae08106..83b88b465ce 100644
--- a/xml/System.Text.Encodings.Web/JavaScriptEncoder.xml
+++ b/xml/System.Text.Encodings.Web/JavaScriptEncoder.xml
@@ -192,7 +192,7 @@ Unlike the <xref:System.Text.Encodings.Web.JavaScriptEncoder.Default> encoding (
 
 Unlike the <xref:System.Text.Encodings.Web.JavaScriptEncoder.Default> encoder, this encoder instance allows some other characters (such as '+') to go through unescaped and therefore must be used cautiously.
 
-For more information, see [Serialize all characters](/dotnet/standard/serialization/system-text-json-how-to#serialize-all-characters).
+For more information about why this could be **unsafe**, see [Serialize all characters](/dotnet/standard/serialization/system-text-json-how-to#serialize-all-characters).
 
           ]]></format>
         </remarks>

From 5a14a34d1656153f3ceda71e16e62ca4dca6f944 Mon Sep 17 00:00:00 2001
From: Jan Kotas <jkotas@microsoft.com>
Date: Wed, 22 Jul 2020 15:56:31 -0700
Subject: [PATCH 3/3] Clarify Buffer.MemoryCopy behavior for overlapping
 buffers (#4462)

Use the same wording as documentation for memmove C API.

Fixes https://github.com/dotnet/runtime/issues/6419#issuecomment-236417880
---
 xml/System/Buffer.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xml/System/Buffer.xml b/xml/System/Buffer.xml
index b6dd5b38f02..51a27cdf2f9 100644
--- a/xml/System/Buffer.xml
+++ b/xml/System/Buffer.xml
@@ -383,8 +383,8 @@
           <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
- This method copies `sourceBytesToCopy` bytes from the address specified by `source` to the address specified by `destination`. If the buffers overlap and the difference between `destination` minus `source` is less than `sourceBytesToCopy`, the source block is copied to the destination block in reverse order.  
-  
+ This method copies `sourceBytesToCopy` bytes from the address specified by `source` to the address specified by `destination`. If some regions of the source area and the destination overlap, the function ensures that the original source bytes in the overlapping region are copied before being overwritten.
+
  ]]></format>
         </remarks>
         <exception cref="T:System.ArgumentOutOfRangeException">
@@ -448,7 +448,7 @@
           <format type="text/markdown"><![CDATA[  
   
 ## Remarks  
- This method copies `sourceBytesToCopy` bytes from the address specified by `source` to the address specified by `destination`. If the buffers overlap and the difference between `destination` minus `source` is less than `sourceBytesToCopy`, the source block is copied to the destination block in reverse order.  
+ This method copies `sourceBytesToCopy` bytes from the address specified by `source` to the address specified by `destination`. If some regions of the source area and the destination overlap, the function ensures that the original source bytes in the overlapping region are copied before being overwritten.
   
  ]]></format>
         </remarks>