Skip to content

Commit 98802e6

Browse files
authored
Merge pull request #3614 from dotnet/master
Update live with current master
2 parents 0cb8bc0 + 4e7b1f3 commit 98802e6

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.ghal.rules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"pullrequest": {
2626
"opened": {
2727
"processor-default": {
28-
"milestone-set": "November 2019"
28+
"milestone-set": "December 2019"
2929
}
3030
}
3131
}

xml/System.Security.Cryptography/ECDiffieHellmanOpenSsl.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ If key is loaded via the <xref:System.Security.Cryptography.ECDiffieHellmanOpenS
7575
<param name="keySize">The size of the key to generate, when a key is needed.</param>
7676
<summary>Initializes a new instance of the <see cref="T:System.Security.Cryptography.ECDiffieHellmanOpenSsl" /> class defaulting to the NIST prime curve of the specified size.</summary>
7777
<remarks>
78-
<format type="text/markdown">
79-
<![CDATA[
78+
<format type="text/markdown"><![CDATA[
8079
8180
## Remarks
8281

xml/System.Threading.Tasks.Sources/ValueTaskSourceOnCompletedFlags.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ This value is passed from a <xref:System.Threading.Tasks.ValueTask> to the <xref
116116
<Docs>
117117
<summary>
118118
<see langword="OnCompleted" /> should capture the current scheduling context (the <see cref="T:System.Threading.SynchronizationContext" />)
119-
and use it when queueing the continuation for execution. If this glag is not set, the implementation
119+
and use it when queueing the continuation for execution. If this flag is not set, the implementation
120120
may choose to execute the continuation in an arbitrary location.</summary>
121121
</Docs>
122122
</Member>

xml/System/Boolean.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
106106
<a name="Converting"></a>
107107
## Converting to and from Boolean values
108-
The <xref:System.Boolean> structure implements the <xref:System.IConvertible> interface. As a result, you can use the <xref:System.Convert> class to perform conversions between a <xref:System.Boolean> value and any other primitive type in the .NET Framework, or you can call the <xref:System.Boolean> structure's explicit implementations. However, conversions between a <xref:System.Boolean> and the following types are not supported, so the corresponding conversion methods throw an <xref:System.InvalidCastException> exception:
108+
The <xref:System.Boolean> structure implements the <xref:System.IConvertible> interface. As a result, you can use the <xref:System.Convert> class to perform conversions between a <xref:System.Boolean> value and any other primitive type in .NET, or you can call the <xref:System.Boolean> structure's explicit implementations. However, conversions between a <xref:System.Boolean> and the following types are not supported, so the corresponding conversion methods throw an <xref:System.InvalidCastException> exception:
109109
110110
- Conversion between <xref:System.Boolean> and <xref:System.Char> (the <xref:System.Convert.ToBoolean%28System.Char%29?displayProperty=nameWithType> and <xref:System.Convert.ToChar%28System.Boolean%29?displayProperty=nameWithType> methods)
111111

0 commit comments

Comments
 (0)