Skip to content

Commit 3a6ec7a

Browse files
committed
Merge branch 'master' into publish-28182
2 parents 9506e50 + 5a14a34 commit 3a6ec7a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

xml/System.DirectoryServices/ActiveDirectorySecurity.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@
391391
<param name="modification">The type of access control modification to perform.</param>
392392
<param name="rule">The access rule to modify.</param>
393393
<param name="modified">
394-
<see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</param>
394+
<see langword="true" /> if actually modified; otherwise, <see langword="false" />.</param>
395395
<summary>Applies the specified modification to the specified <see cref="T:System.Security.AccessControl.AccessRule" />.</summary>
396396
<returns>
397397
<see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</returns>
@@ -424,7 +424,7 @@
424424
<param name="modification">The modification to apply.</param>
425425
<param name="rule">The audit rule to modify.</param>
426426
<param name="modified">
427-
<see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</param>
427+
<see langword="true" /> if actually modified; otherwise, <see langword="false" />.</param>
428428
<summary>Applies the specified modification to the specified <see cref="T:System.Security.AccessControl.AuditRule" />.</summary>
429429
<returns>
430430
<see langword="true" /> if successfully modified; otherwise, <see langword="false" />.</returns>

xml/System.Security.AccessControl/ObjectSecurity.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@
873873
<param name="modification">The modification to apply to the DACL.</param>
874874
<param name="rule">The access rule to modify.</param>
875875
<param name="modified">
876-
<see langword="true" /> if the DACL is successfully modified; otherwise, <see langword="false" />.</param>
876+
<see langword="true" /> if the DACL is actually modified; otherwise, <see langword="false" />.</param>
877877
<summary>Applies the specified modification to the Discretionary Access Control List (DACL) associated with this <see cref="T:System.Security.AccessControl.ObjectSecurity" /> object.</summary>
878878
<returns>
879879
<see langword="true" /> if the DACL is successfully modified; otherwise, <see langword="false" />.</returns>
@@ -921,7 +921,7 @@
921921
<param name="modification">The modification to apply to the SACL.</param>
922922
<param name="rule">The audit rule to modify.</param>
923923
<param name="modified">
924-
<see langword="true" /> if the SACL is successfully modified; otherwise, <see langword="false" />.</param>
924+
<see langword="true" /> if the SACL is actually modified; otherwise, <see langword="false" />.</param>
925925
<summary>Applies the specified modification to the System Access Control List (SACL) associated with this <see cref="T:System.Security.AccessControl.ObjectSecurity" /> object.</summary>
926926
<returns>
927927
<see langword="true" /> if the SACL is successfully modified; otherwise, <see langword="false" />.</returns>

xml/System.Text.Encodings.Web/JavaScriptEncoder.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ Unlike the <xref:System.Text.Encodings.Web.JavaScriptEncoder.Default> encoding (
192192
193193
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.
194194
195-
For more information, see [Serialize all characters](/dotnet/standard/serialization/system-text-json-how-to#serialize-all-characters).
195+
For more information about why this could be **unsafe**, see [Serialize all characters](/dotnet/standard/serialization/system-text-json-how-to#serialize-all-characters).
196196
197197
]]></format>
198198
</remarks>

xml/System/Buffer.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@
383383
<format type="text/markdown"><![CDATA[
384384
385385
## Remarks
386-
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.
387-
386+
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.
387+
388388
]]></format>
389389
</remarks>
390390
<exception cref="T:System.ArgumentOutOfRangeException">
@@ -448,7 +448,7 @@
448448
<format type="text/markdown"><![CDATA[
449449
450450
## Remarks
451-
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.
451+
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.
452452
453453
]]></format>
454454
</remarks>

0 commit comments

Comments
 (0)