Skip to content

Commit bb220f0

Browse files
authored
Merge pull request #3790 from dotnet/master
Update live with current master
2 parents 901b95c + e2e9976 commit bb220f0

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

xml/System.Collections/IComparer.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@ The following example uses the <xref:System.Collections.IComparer> interface to
102102
<param name="x">The first object to compare.</param>
103103
<param name="y">The second object to compare.</param>
104104
<summary>Compares two objects and returns a value indicating whether one is less than, equal to, or greater than the other.</summary>
105-
<returns>A signed integer that indicates the relative values of <paramref name="x" /> and <paramref name="y" />:<br /> - If less than 0, <paramref name="x" /> is less than <paramref name="y" />.<br /> - If 0, <paramref name="x" /> equals <paramref name="y" />.<br /> - If greater than 0, <paramref name="x" /> is greater than <paramref name="y" />.
106-
107-
.</returns>
105+
<returns>A signed integer that indicates the relative values of <paramref name="x" /> and <paramref name="y" />:<br /> - If less than 0, <paramref name="x" /> is less than <paramref name="y" />.<br /> - If 0, <paramref name="x" /> equals <paramref name="y" />.<br /> - If greater than 0, <paramref name="x" /> is greater than <paramref name="y" />.</returns>
108106
<remarks>
109107
<format type="text/markdown"><![CDATA[
110108

xml/System.Diagnostics/DiagnosticSource.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Interfaces />
2222
<Docs>
2323
<summary>An abstract class that allows code to be instrumented for production-time logging of rich data payloads for consumption within the process that was instrumented.</summary>
24-
<remarks>For more information, see [DiagnosticSource User's Guide](https://github.com/dotnet/corefx/blob/master/src/System.Diagnostics.DiagnosticSource/src/DiagnosticSourceUsersGuide.md).</remarks>
24+
<remarks>For more information, see [DiagnosticSource User's Guide](https://github.com/dotnet/runtime/blob/master/src/libraries/System.Diagnostics.DiagnosticSource/src/DiagnosticSourceUsersGuide.md).</remarks>
2525
</Docs>
2626
<Members>
2727
<Member MemberName=".ctor">

xml/System.Windows.Controls/ItemsControl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1066,7 +1066,7 @@ ListBox that contains multiple types of objects
10661066
<Docs>
10671067
<summary>Gets or sets a value that indicates whether <see cref="T:System.Windows.Controls.TextSearch" /> is enabled on the <see cref="T:System.Windows.Controls.ItemsControl" /> instance.</summary>
10681068
<value>
1069-
<see langword="true" /> if <see cref="T:System.Windows.Controls.TextSearch" /> is enabled; otherwise, <see langword="true" />. The default is <see langword="false" />.</value>
1069+
<see langword="true" /> if <see cref="T:System.Windows.Controls.TextSearch" /> is enabled; otherwise, <see langword="false" />. The default is <see langword="false" />.</value>
10701070
<remarks>
10711071
<format type="text/markdown"><![CDATA[
10721072

xml/System/DateTime.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6924,9 +6924,13 @@ The following example demonstrates the <xref:System.DateTime.Parse%28System.Stri
69246924
## Remarks
69256925
A single tick represents one hundred nanoseconds or one ten-millionth of a second. There are 10,000 ticks in a millisecond, or 10 million ticks in a second.
69266926

6927-
The value of this property represents the number of 100-nanosecond intervals that have elapsed since 12:00:00 midnight, January 1, 0001 (0:00:00 UTC on January 1, 0001, in the Gregorian calendar), which represents <xref:System.DateTime.MinValue?displayProperty=nameWithType>. It does not include the number of ticks that are attributable to leap seconds.
6928-
6929-
6927+
The value of this property represents the number of 100-nanosecond intervals that have elapsed since 12:00:00 midnight, January 1, 0001 in the Gregorian calendar, which represents <xref:System.DateTime.MinValue>. It does not include the number of ticks that are attributable to leap seconds.
6928+
If the DateTime object has its `Kind` property set to `Local`, its ticks represent the time elapsed time since 12:00:00 midnight, January 1, 0001 in the local time as specified by the current time zone setting.
6929+
If the `DateTime` object has its `Kind` property set to `Utc`, its ticks represent the time elapsed time since 12:00:00 midnight, January 1, 0001 in the Coordinated Universal Time.
6930+
If the `DateTime` object has its `Kind` property set to `Unspecified`, its ticks represent the time elapsed time since 12:00:00 midnight, January 1, 0001 in the unknown time zone.
6931+
6932+
In general, the ticks represent the time according to the time zone specified by the `Kind` property.
6933+
69306934

69316935
## Examples
69326936

0 commit comments

Comments
 (0)