Skip to content

Commit 69e0a4b

Browse files
authored
Merge pull request #3801 from dotnet/master
Update live with current master
2 parents bafaf23 + eba2673 commit 69e0a4b

File tree

20 files changed

+104
-81
lines changed

20 files changed

+104
-81
lines changed

xml/System.IO/Path.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1513,7 +1513,7 @@ For more information on file paths on Windows, see [File path formats on Windows
15131513

15141514
-or-
15151515

1516-
<see cref="P:System.String.Empty" /> if <paramref name="path" /> does not contain root directory information.
1516+
<see cref="F:System.String.Empty" /> if <paramref name="path" /> does not contain root directory information.
15171517

15181518
-or-
15191519

xml/System.IdentityModel.Protocols.WSTrust/KeyTypes.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ReturnType>System.String</ReturnType>
3535
</ReturnValue>
3636
<Docs>
37-
<summary>A URI that represents the asymmetric key type; http://schemas.System.com/idfx/keytype/asymmetric.</summary>
37+
<summary>A URI that represents the asymmetric key type; <c>http://schemas.System.com/idfx/keytype/asymmetric</c>.</summary>
3838
<remarks>To be added.</remarks>
3939
</Docs>
4040
</Member>
@@ -54,7 +54,7 @@
5454
<ReturnType>System.String</ReturnType>
5555
</ReturnValue>
5656
<Docs>
57-
<summary>A URI that represents the bearer key type; http://schemas.System.com/idfx/keytype/bearer.</summary>
57+
<summary>A URI that represents the bearer key type; <c>http://schemas.System.com/idfx/keytype/bearer</c>.</summary>
5858
<remarks>To be added.</remarks>
5959
</Docs>
6060
</Member>
@@ -74,7 +74,7 @@
7474
<ReturnType>System.String</ReturnType>
7575
</ReturnValue>
7676
<Docs>
77-
<summary>A URI that represents the symmetric key type; http://schemas.System.com/idfx/keytype/symmetric.</summary>
77+
<summary>A URI that represents the symmetric key type; <c>http://schemas.System.com/idfx/keytype/symmetric</c>.</summary>
7878
<remarks>To be added.</remarks>
7979
</Docs>
8080
</Member>

xml/System.IdentityModel.Protocols.WSTrust/RequestTypes.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<ReturnType>System.String</ReturnType>
4242
</ReturnValue>
4343
<Docs>
44-
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Cancel request; http://schemas.System.com/idfx/requesttype/cancel.</summary>
44+
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Cancel request; <c>http://schemas.System.com/idfx/requesttype/cancel</c>.</summary>
4545
<remarks>To be added.</remarks>
4646
</Docs>
4747
</Member>
@@ -61,7 +61,7 @@
6161
<ReturnType>System.String</ReturnType>
6262
</ReturnValue>
6363
<Docs>
64-
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust GetMetadata request; http://schemas.System.com/idfx/requesttype/getMetadata.</summary>
64+
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust GetMetadata request; <c>http://schemas.System.com/idfx/requesttype/getMetadata</c>.</summary>
6565
<remarks>To be added.</remarks>
6666
</Docs>
6767
</Member>
@@ -81,7 +81,7 @@
8181
<ReturnType>System.String</ReturnType>
8282
</ReturnValue>
8383
<Docs>
84-
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Issue request; http://schemas.System.com/idfx/requesttype/issue.</summary>
84+
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Issue request; <c>http://schemas.System.com/idfx/requesttype/issue</c>.</summary>
8585
<remarks>To be added.</remarks>
8686
</Docs>
8787
</Member>
@@ -101,7 +101,7 @@
101101
<ReturnType>System.String</ReturnType>
102102
</ReturnValue>
103103
<Docs>
104-
<summary>A string constant that represents a protocol-agnostic WS-Trust IssueCard request; http://schemas.System.com/idfx/requesttype/issueCard.</summary>
104+
<summary>A string constant that represents a protocol-agnostic WS-Trust IssueCard request; <c>http://schemas.System.com/idfx/requesttype/issueCard</c>.</summary>
105105
<remarks>To be added.</remarks>
106106
</Docs>
107107
</Member>
@@ -121,7 +121,7 @@
121121
<ReturnType>System.String</ReturnType>
122122
</ReturnValue>
123123
<Docs>
124-
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Renew request; http://schemas.System.com/idfx/requesttype/renew.</summary>
124+
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Renew request; <c>http://schemas.System.com/idfx/requesttype/renew</c>.</summary>
125125
<remarks>To be added.</remarks>
126126
</Docs>
127127
</Member>
@@ -141,7 +141,7 @@
141141
<ReturnType>System.String</ReturnType>
142142
</ReturnValue>
143143
<Docs>
144-
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Validate request; http://schemas.System.com/idfx/requesttype/validate.</summary>
144+
<summary>A string constant that represents a protocol-agnostic URI for a WS-Trust Validate request; <c>http://schemas.System.com/idfx/requesttype/validate</c>.</summary>
145145
<remarks>To be added.</remarks>
146146
</Docs>
147147
</Member>

xml/System.IdentityModel.Tokens/AuthenticationMethods.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<ReturnType>System.String</ReturnType>
4242
</ReturnValue>
4343
<Docs>
44-
<summary>Authentication by using a hardware token, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/hardwaretoken.</summary>
44+
<summary>Authentication by using a hardware token, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/hardwaretoken</c>.</summary>
4545
<remarks>To be added.</remarks>
4646
</Docs>
4747
</Member>
@@ -61,7 +61,7 @@
6161
<ReturnType>System.String</ReturnType>
6262
</ReturnValue>
6363
<Docs>
64-
<summary>Authentication by using the Kerberos protocol, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/kerberos.</summary>
64+
<summary>Authentication by using the Kerberos protocol, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/kerberos</c>.</summary>
6565
<remarks>To be added.</remarks>
6666
</Docs>
6767
</Member>
@@ -81,7 +81,7 @@
8181
<ReturnType>System.String</ReturnType>
8282
</ReturnValue>
8383
<Docs>
84-
<summary>The namespace for the well-known authentication methods, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/.</summary>
84+
<summary>The namespace for the well-known authentication methods, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/</c>.</summary>
8585
<remarks>To be added.</remarks>
8686
</Docs>
8787
</Member>
@@ -101,7 +101,7 @@
101101
<ReturnType>System.String</ReturnType>
102102
</ReturnValue>
103103
<Docs>
104-
<summary>Authentication by using a password, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/password.</summary>
104+
<summary>Authentication by using a password, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/password</c>.</summary>
105105
<remarks>To be added.</remarks>
106106
</Docs>
107107
</Member>
@@ -121,7 +121,7 @@
121121
<ReturnType>System.String</ReturnType>
122122
</ReturnValue>
123123
<Docs>
124-
<summary>Authentication by using a key authenticated by a PGP web of trust, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/pgp.</summary>
124+
<summary>Authentication by using a key authenticated by a PGP web of trust, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/pgp</c>.</summary>
125125
<remarks>To be added.</remarks>
126126
</Docs>
127127
</Member>
@@ -141,7 +141,7 @@
141141
<ReturnType>System.String</ReturnType>
142142
</ReturnValue>
143143
<Docs>
144-
<summary>Authentication by using the Secure Remote Password protocol, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/secureremotepassword.</summary>
144+
<summary>Authentication by using the Secure Remote Password protocol, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/secureremotepassword</c>.</summary>
145145
<remarks>To be added.</remarks>
146146
</Docs>
147147
</Member>
@@ -161,7 +161,7 @@
161161
<ReturnType>System.String</ReturnType>
162162
</ReturnValue>
163163
<Docs>
164-
<summary>Authentication by using an XML digital signature, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/signature.</summary>
164+
<summary>Authentication by using an XML digital signature, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/signature</c>.</summary>
165165
<remarks>To be added.</remarks>
166166
</Docs>
167167
</Member>
@@ -181,7 +181,7 @@
181181
<ReturnType>System.String</ReturnType>
182182
</ReturnValue>
183183
<Docs>
184-
<summary>Authentication by using a smartcard, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/smartcard.</summary>
184+
<summary>Authentication by using a smartcard, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/smartcard</c>.</summary>
185185
<remarks>To be added.</remarks>
186186
</Docs>
187187
</Member>
@@ -201,7 +201,7 @@
201201
<ReturnType>System.String</ReturnType>
202202
</ReturnValue>
203203
<Docs>
204-
<summary>Authentication by using a smartcard PKI, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/smartcardpki.</summary>
204+
<summary>Authentication by using a smartcard PKI, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/smartcardpki</c>.</summary>
205205
<remarks>To be added.</remarks>
206206
</Docs>
207207
</Member>
@@ -221,7 +221,7 @@
221221
<ReturnType>System.String</ReturnType>
222222
</ReturnValue>
223223
<Docs>
224-
<summary>Authentication on a key authenticated using an SPKI PKI, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/spki.</summary>
224+
<summary>Authentication on a key authenticated using an SPKI PKI, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/spki</c>.</summary>
225225
<remarks>To be added.</remarks>
226226
</Docs>
227227
</Member>
@@ -241,7 +241,7 @@
241241
<ReturnType>System.String</ReturnType>
242242
</ReturnValue>
243243
<Docs>
244-
<summary>Authentication by using either the SSL or TLS protocol with certificate-based client authentication, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/tlsclient.</summary>
244+
<summary>Authentication by using either the SSL or TLS protocol with certificate-based client authentication, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/tlsclient</c>.</summary>
245245
<remarks>To be added.</remarks>
246246
</Docs>
247247
</Member>
@@ -261,7 +261,7 @@
261261
<ReturnType>System.String</ReturnType>
262262
</ReturnValue>
263263
<Docs>
264-
<summary>Authentication by using an unspecified method, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/unspecified.</summary>
264+
<summary>Authentication by using an unspecified method, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/unspecified</c>.</summary>
265265
<remarks>To be added.</remarks>
266266
</Docs>
267267
</Member>
@@ -281,7 +281,7 @@
281281
<ReturnType>System.String</ReturnType>
282282
</ReturnValue>
283283
<Docs>
284-
<summary>Windows authentication, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/windows.</summary>
284+
<summary>Windows authentication, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/windows</c>.</summary>
285285
<remarks>To be added.</remarks>
286286
</Docs>
287287
</Member>
@@ -301,7 +301,7 @@
301301
<ReturnType>System.String</ReturnType>
302302
</ReturnValue>
303303
<Docs>
304-
<summary>Authentication on a key authenticated using an X.509 PKI, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/x509.</summary>
304+
<summary>Authentication on a key authenticated using an X.509 PKI, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/x509</c>.</summary>
305305
<remarks>To be added.</remarks>
306306
</Docs>
307307
</Member>
@@ -321,7 +321,7 @@
321321
<ReturnType>System.String</ReturnType>
322322
</ReturnValue>
323323
<Docs>
324-
<summary>Authentication on a key authenticated using an XKMS trust service, http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/xkms.</summary>
324+
<summary>Authentication on a key authenticated using an XKMS trust service, <c>http://schemas.microsoft.com/ws/2008/06/identity/authenticationmethod/xkms</c>.</summary>
325325
<remarks>To be added.</remarks>
326326
</Docs>
327327
</Member>

xml/System.Reflection.Metadata.Ecma335/SignatureTypeEncoder.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@
819819
</ReturnValue>
820820
<Parameters />
821821
<Docs>
822-
<summary>Encodes a void pointer (<code>void*</code>).</summary>
822+
<summary>Encodes a void pointer (<c>void*</c>).</summary>
823823
<remarks>To be added.</remarks>
824824
</Docs>
825825
</Member>

xml/System.Security.Cryptography/DSACng.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@
178178
<remarks>To be added.</remarks>
179179
<exception cref="T:System.ArgumentNullException">
180180
<paramref name="rgbHash" /> is <see langword="null" />.</exception>
181-
<exception cref="T:System.Security.Cryptography.CryptographicException">
182-
This instance represents only a public key.
181+
<exception cref="T:System.Security.Cryptography.CryptographicException">This instance represents only a public key.
183182

184183
-or-
185184

xml/System.Security.Cryptography/ECDiffieHellmanCng.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,7 @@ Because key sizes do not uniquely identify elliptic curves, the use of the prope
10711071
]]></format>
10721072
</remarks>
10731073
<exception cref="T:System.Security.Cryptography.CryptographicException">
1074-
<paramref name="value" /> is not permitted by <see cref="P:System.Security.Cryptography.ECDiffieHellmanCng.LegalKeySizes" />.</exception>
1074+
<paramref name="value" /> is not permitted by <see cref="P:System.Security.Cryptography.AsymmetricAlgorithm.LegalKeySizes" />.</exception>
10751075
<altmember cref="M:System.Security.Cryptography.ECDiffieHellmanCng.GenerateKey(System.Security.Cryptography.ECCurve)" />
10761076
</Docs>
10771077
</Member>

xml/System.Threading.Channels/ChannelReader`1.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Each <xref:System.Collections.Generic.IAsyncEnumerator%601.MoveNextAsync> call t
177177
<para>A <see cref="T:System.Threading.Tasks.ValueTask`1" /> that will complete with a <see langword="true" /> result when data is available to read
178178
or with a <see langword="false" /> result when no further data will ever be available to be read due to the channel completing successfully.</para>
179179
<para>If the channel completes with an exception, the task will also complete with an exception.</para>
180-
.</returns>
180+
</returns>
181181
<remarks>To be added.</remarks>
182182
</Docs>
183183
</Member>

xml/System.Windows.Controls/PasswordBox.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,9 +1039,7 @@ PasswordBox with CaretBrush set to red
10391039
</ReturnValue>
10401040
<Docs>
10411041
<summary>Gets or sets the masking character for the <see cref="T:System.Windows.Controls.PasswordBox" />.</summary>
1042-
<value>A masking character to echo when the user enters text into the <see cref="T:System.Windows.Controls.PasswordBox" />.
1043-
1044-
The default value is a bullet character (**●**).</value>
1042+
<value>A masking character to echo when the user enters text into the <see cref="T:System.Windows.Controls.PasswordBox" />. The default value is a bullet character (●).</value>
10451043
<remarks>
10461044
<format type="text/markdown"><![CDATA[
10471045

xml/System.Windows.Controls/Slider.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@
562562
</ReturnValue>
563563
<Docs>
564564
<summary>Gets or sets the amount of time in milliseconds between increase or decrease commands when a user clicks the <see cref="T:System.Windows.Controls.Primitives.RepeatButton" /> of a <see cref="T:System.Windows.Controls.Slider" />.</summary>
565-
<value>A time in milliseconds between commands that change the <see cref="P:System.Windows.Controls.Primitives.RangeBase.Value" /> of a <see cref="T:System.Windows.Controls.Slider" />. The default is the system key repeat rate. For more information, see [SystemParametersInfo](https://msdn.microsoft.com/library/default.asp?url=/library/sysinfo/base/systemparametersinfo.asp) (SPI_GETKEYBOARDSPEED).</value>
565+
<value>A time in milliseconds between commands that change the <see cref="P:System.Windows.Controls.Primitives.RangeBase.Value" /> of a <see cref="T:System.Windows.Controls.Slider" />. The default is the system key repeat rate. For more information, see <see href="/windows/win32/api/winuser/nf-winuser-systemparametersinfoa">SystemParametersInfo</see> (SPI_GETKEYBOARDSPEED).</value>
566566
<remarks>
567567
<format type="text/markdown"><![CDATA[
568568

0 commit comments

Comments
 (0)