Skip to content

Merge main into live #9957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 25, 2024
Merged

Merge main into live #9957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae5538
Clarify that X509Certificate2.RawData only contains public data. (#9872)
jeffhandley May 24, 2024
c915d9d
Fix the summary of Control.DefaultPadding in Control.xml (#9852)
zxcv1050135042 May 24, 2024
f6f4306
Update Binding.xml (#9904)
rhires May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions xml/System.Security.Cryptography.X509Certificates/X509Certificate2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3228,8 +3228,8 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
<ReturnType>System.Byte[]</ReturnType>
</ReturnValue>
<Docs>
<summary>Gets the raw data of a certificate.</summary>
<value>The raw data of the certificate as a byte array.</value>
<summary>Gets the raw X.509 public data of a certificate.</summary>
<value>The raw X.509 public data of a certificate.</value>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down Expand Up @@ -3279,8 +3279,8 @@ The Subject Alternative Name extension or Subject Name could not be decoded.</ex
<ReturnType>System.ReadOnlyMemory&lt;System.Byte&gt;</ReturnType>
</ReturnValue>
<Docs>
<summary>Gets the raw data of a certificate.</summary>
<value>To be added.</value>
<summary>Gets the raw X.509 public data of a certificate.</summary>
<value>The raw X.509 public data of a certificate.</value>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down
4 changes: 2 additions & 2 deletions xml/System.Windows.Data/Binding.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,12 @@
<ReturnType>System.Object</ReturnType>
</ReturnValue>
<Docs>
<summary>Used as a returned value to instruct the binding engine not to perform any action.</summary>
<summary>Used as a returned value to instruct the binding engine to not perform any action.</summary>
<remarks>
<format type="text/markdown"><![CDATA[

## Remarks
A binding source property or a converter can return <xref:System.Windows.Data.Binding.DoNothing?displayProperty=nameWithType> to instruct the binding engine not to perform any action. For example, to instruct the binding engine not to transfer a value to the binding target, not to move to the next <xref:System.Windows.Data.Binding> in a <xref:System.Windows.Data.PriorityBinding>, or not to use the `FallBackValue` or default value.
A binding source property or a converter can return <xref:System.Windows.Data.Binding.DoNothing?displayProperty=nameWithType> to instruct the binding engine to not perform any action. For example, return this field to instruct the binding engine to not transfer a value to the binding target, not move to the next <xref:System.Windows.Data.Binding> in a <xref:System.Windows.Data.PriorityBinding>, or not use the `FallBackValue` or default value.

]]></format>
</remarks>
Expand Down
4 changes: 2 additions & 2 deletions xml/System.Windows.Forms/Control.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4284,8 +4284,8 @@ The following table lists Windows Forms controls and which event (<xref:System.W
<ReturnType>System.Windows.Forms.Padding</ReturnType>
</ReturnValue>
<Docs>
<summary>Gets the internal spacing, in pixels, of the contents of a control.</summary>
<value>A <see cref="T:System.Windows.Forms.Padding" /> that represents the internal spacing of the contents of a control.</value>
<summary>Gets the default internal spacing, in pixels, of the contents of a control.</summary>
<value>The default internal spacing of the contents of a control.</value>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down