Skip to content

content fix, prepare for markdig migration #2587

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

Closed
wants to merge 4 commits into from
Closed

content fix, prepare for markdig migration #2587

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c71b73
content fix for markdig migration
daxianji007 Jun 12, 2019
6ca4fd6
fix space
daxianji007 Jun 12, 2019
5b1730a
Update xml/System.Data.OleDb/OleDbLiteral.xml
daxianji007 Jun 17, 2019
26ec45c
Update xml/System.Data.OleDb/OleDbLiteral.xml
daxianji007 Jun 17, 2019
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
4 changes: 2 additions & 2 deletions xml/System.Data.OleDb/OleDbLiteral.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
</ReturnValue>
<MemberValue>10</MemberValue>
<Docs>
<summary>The character used in a LIKE clause to escape the character returned for the DBLITERAL_LIKE_UNDERSCORE literal. For example, if an underscore (\_) is used to match exactly one character and this is a backslash (\\), the characters "abc\\\_ _" match all character values that are five characters long and start with "abc\_". Some SQL dialects support a clause (the ESCAPE clause) that can be used to override this value. Maps to DBLITERAL_ESCAPE_UNDERSCORE_PREFIX.</summary>
<summary>The character used in a LIKE clause to escape the character returned for the DBLITERAL_LIKE_UNDERSCORE literal. For example, if an underscore (\_) is used to match exactly one character and this is a backslash (\\), the characters "abc\\\_" match all character values that are five characters long and start with "abc\_". Some SQL dialects support a clause (the ESCAPE clause) that can be used to override this value. Maps to DBLITERAL_ESCAPE_UNDERSCORE_PREFIX.</summary>
</Docs>
</Member>
<Member MemberName="Escape_Underscore_Suffix">
Expand All @@ -344,7 +344,7 @@
</ReturnValue>
<MemberValue>30</MemberValue>
<Docs>
<summary>The character used in a LIKE clause to escape the character returned for the DBLITERAL_LIKE_UNDERSCORE literal. For example, if an underscore (\_) is used to match exactly one character and this is a backslash (\\), the characters "abc\\\_ _" match all character values that are five characters long and start with "abc\_". Some SQL dialects support a clause (the ESCAPE clause) that can be used to override this value. Maps to DBLITERAL_ESCAPE_UNDERSCORE_SUFFIX.</summary>
<summary>The character used in a LIKE clause to escape the character returned for the DBLITERAL_LIKE_UNDERSCORE literal. For example, if an underscore (\_) is used to match exactly one character and this is a backslash (\\), the characters "abc\\\_" match all character values that are five characters long and start with "abc\_". Some SQL dialects support a clause (the ESCAPE clause) that can be used to override this value. Maps to DBLITERAL_ESCAPE_UNDERSCORE_SUFFIX.</summary>
</Docs>
</Member>
<Member MemberName="Hierarchy_Name">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Reflection/MetadataLoadContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ Note that the behavior of this method matches the behavior of the <xref:System.R
<remarks>
<format type="text/markdown"><![CDATA[
## Remarks
Note that the behavior of this method matches the behavior of <xref:System.Runtime.Loader.AssemblyLoadContext.LoadFromAssemblyName%2A?displayProperty=nameWithType> resolve event but does not match the behavior of <xxref:System.Reflection.Assembly.ReflectionOnlyLoad%2A?displayProperty=nameWithType>. (The latter gives up without raising its resolve event.)
Note that the behavior of this method matches the behavior of <xref:System.Runtime.Loader.AssemblyLoadContext.LoadFromAssemblyName%2A?displayProperty=nameWithType> resolve event but does not match the behavior of <xref:System.Reflection.Assembly.ReflectionOnlyLoad%2A?displayProperty=nameWithType>. (The latter gives up without raising its resolve event.)
]]></format>
</remarks>
<exception cref="T:System.IO.FileNotFoundException">The resolver returns <see langword="null" />.</exception>
Expand Down
16 changes: 8 additions & 8 deletions xml/System.Threading.Tasks/TaskFactory`1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@
<Docs>
<param name="tasks">The array of tasks from which to continue.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when all tasks in the <paramref name="tasks" /> array have completed.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<summary>Creates a continuation task that will be started upon the completion of a set of provided Tasks.</summary>
<returns>The new continuation task.</returns>
<remarks>
Expand Down Expand Up @@ -661,7 +661,7 @@
<param name="tasks">The array of tasks from which to continue.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when all tasks in the <paramref name="tasks" /> array have completed.</param>
<param name="cancellationToken">The cancellation token that will be assigned to the new continuation task.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<param name="scheduler">The scheduler that is used to schedule the created continuation task.</param>
<summary>Creates a continuation task that will be started upon the completion of a set of provided Tasks.</summary>
<returns>The new continuation task.</returns>
Expand Down Expand Up @@ -871,7 +871,7 @@
<typeparam name="TAntecedentResult">The type of the result of the antecedent <paramref name="tasks" />.</typeparam>
<param name="tasks">The array of tasks from which to continue.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when all tasks in the <paramref name="tasks" /> array have completed.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<summary>Creates a continuation task that will be started upon the completion of a set of provided tasks.</summary>
<returns>The new continuation task.</returns>
<remarks>
Expand Down Expand Up @@ -940,7 +940,7 @@
<param name="tasks">The array of tasks from which to continue.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when all tasks in the <paramref name="tasks" /> array have completed.</param>
<param name="cancellationToken">The cancellation token that will be assigned to the new continuation task.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<param name="scheduler">The scheduler that is used to schedule the created continuation task.</param>
<summary>Creates a continuation task that will be started upon the completion of a set of provided tasks.</summary>
<returns>The new continuation task.</returns>
Expand Down Expand Up @@ -1154,7 +1154,7 @@
<Docs>
<param name="tasks">The array of tasks from which to continue when one task completes.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when one task in the <paramref name="tasks" /> array completes.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<summary>Creates a continuation task that will be started upon the completion of any task in the provided set.</summary>
<returns>The new continuation task.</returns>
<remarks>
Expand Down Expand Up @@ -1223,7 +1223,7 @@
<param name="tasks">The array of tasks from which to continue when one task completes.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when one task in the <paramref name="tasks" /> array completes.</param>
<param name="cancellationToken">The cancellation token that will be assigned to the new continuation task.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<param name="scheduler">The task scheduler that is used to schedule the created continuation task.</param>
<summary>Creates a continuation task that will be started upon the completion of any task in the provided set.</summary>
<returns>The new continuation task.</returns>
Expand Down Expand Up @@ -1445,7 +1445,7 @@
<typeparam name="TAntecedentResult">The type of the result of the antecedent <paramref name="tasks" />.</typeparam>
<param name="tasks">The array of tasks from which to continue when one task completes.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when one task in the <paramref name="tasks" /> array completes.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<summary>Creates a continuation task that will be started upon the completion of any task in the provided set.</summary>
<returns>The new continuation <see cref="T:System.Threading.Tasks.Task`1" />.</returns>
<remarks>
Expand Down Expand Up @@ -1518,7 +1518,7 @@
<param name="tasks">The array of tasks from which to continue when one task completes.</param>
<param name="continuationFunction">The function delegate to execute asynchronously when one task in the <paramref name="tasks" /> array completes.</param>
<param name="cancellationToken">The cancellation token that will be assigned to the new continuation task.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn*" /> and <see langword="OnlyOn*" /> values are not valid.</param>
<param name="continuationOptions">One of the enumeration values that controls the behavior of the created continuation task. The <see langword="NotOn" /> and <see langword="OnlyOn" /> values are not valid.</param>
<param name="scheduler">The <see cref="T:System.Threading.Tasks.TaskScheduler" /> that is used to schedule the created continuation <see cref="T:System.Threading.Tasks.Task`1" />.</param>
<summary>Creates a continuation task that will be started upon the completion of any task in the provided set.</summary>
<returns>The new continuation <see cref="T:System.Threading.Tasks.Task`1" />.</returns>
Expand Down
2 changes: 1 addition & 1 deletion xml/System/DateTime.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5223,7 +5223,7 @@ This method overload converts the date and time in `s` and sets the <xref:System
|-----|-----|-----|
|`s` contains no time zone information.|None.|<xref:System.DateTimeKind.Unspecified?displayProperty=nameWithType>|
|`s` contains time zone information.|To the time in the local time zone|<xref:System.DateTimeKind.Local?displayProperty=nameWithType>|
|`s` contains time zone information, and `styles includes the <xref:System.Globalization.DateTimeStyles.AdjustToUniversal?displayProperty=nameWithType> flag.|To Coordinated Universal Time (UTC)|<xref:System.DateTimeKind.Utc?displayProperty=nameWithType>|
|`s` contains time zone information, and `styles` includes the <xref:System.Globalization.DateTimeStyles.AdjustToUniversal?displayProperty=nameWithType> flag.|To Coordinated Universal Time (UTC)|<xref:System.DateTimeKind.Utc?displayProperty=nameWithType>|
|`s` contains the Z or GMT time zone designator, and `styles` includes the <xref:System.Globalization.DateTimeStyles.RoundtripKind?displayProperty=nameWithType>.|None.|<xref:System.DateTimeKind.Utc>|

## Example
Expand Down
2 changes: 1 addition & 1 deletion xml/System/Decimal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4695,7 +4695,7 @@
|<xref:System.Globalization.NumberStyles.AllowThousands>|The *,* element.|
|<xref:System.Globalization.NumberStyles.AllowCurrencySymbol>|The *$* element.|
|<xref:System.Globalization.NumberStyles.Currency>|All. The `s` parameter cannot represent a hexadecimal number or a number in exponential notation.|
|<xref:System.Globalization.NumberStyles.Float>|The *ws* element at the beginning or end of `s`, *sign* at the beginning of `s`, and the *.*symbol. The `s` parameter can also use exponential notation.|
|<xref:System.Globalization.NumberStyles.Float>|The *ws* element at the beginning or end of `s`, *sign* at the beginning of `s`, and the *.* symbol. The `s` parameter can also use exponential notation.|
|<xref:System.Globalization.NumberStyles.Number>|The `ws`, `sign`, *,*, and *.* elements.|
|<xref:System.Globalization.NumberStyles.Any>|All styles, except `s` cannot represent a hexadecimal number.|

Expand Down
1 change: 1 addition & 0 deletions xml/System/String.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5791,6 +5791,7 @@ This method uses the [composite formatting feature](~/docs/standard/base-types/c
[!INCLUDE[provider-string-format](~/includes/provider-string-format.md)]

<a name="culture-sensitive-formatting" />

## Example: Culture-sensitive formatting
This example uses the <xref:System.String.Format%28System.IFormatProvider%2CSystem.String%2CSystem.Object%5B%5D%29> method to display the string representation of some date and time values and numeric values by using several different cultures.

Expand Down
8 changes: 4 additions & 4 deletions xml/System/Uri.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ Uri uri2 = new Uri("file:///C:/test/path/file.txt") // Explicit file path.
<para>In the <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Windows Store apps</see> or the <see href="https://docs.microsoft.com/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library">Portable Class Library</see>, catch the base class exception, <see cref="T:System.FormatException" />, instead.</para>
</block>
<paramref name="uriString" /> is empty.

-or-

The scheme specified in <paramref name="uriString" /> is not correctly formed. See <see cref="M:System.Uri.CheckSchemeName(System.String)" />.
Expand Down Expand Up @@ -591,7 +591,7 @@ Uri uri2 = new Uri("file:///C:/test/path/file.txt") // Explicit file path.
<para>In the <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Windows Store apps</see> or the <see href="https://docs.microsoft.com/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library">Portable Class Library</see>, catch the base class exception, <see cref="T:System.FormatException" />, instead.</para>
</block>
<paramref name="uriString" /> contains a relative URI and <paramref name="uriKind" /> is <see cref="F:System.UriKind.Absolute" />.

or

<paramref name="uriString" /> contains an absolute URI and <paramref name="uriKind" /> is <see cref="F:System.UriKind.Relative" />.
Expand Down Expand Up @@ -718,7 +718,7 @@ Uri uri2 = new Uri("file:///C:/test/path/file.txt") // Explicit file path.
<para>In the <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Windows Store apps</see> or the <see href="https://docs.microsoft.com/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library">Portable Class Library</see>, catch the base class exception, <see cref="T:System.FormatException" />, instead.</para>
</block>
The URI formed by combining <paramref name="baseUri" /> and <paramref name="relativeUri" /> is empty or contains only spaces.

-or-

The scheme specified in the URI formed by combining <paramref name="baseUri" /> and <paramref name="relativeUri" /> is not valid.
Expand Down Expand Up @@ -838,7 +838,7 @@ Uri uri2 = new Uri("file:///C:/test/path/file.txt") // Explicit file path.
<para>In the <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Windows Store apps</see> or the <see href="https://docs.microsoft.com/dotnet/standard/cross-platform/cross-platform-development-with-the-portable-class-library">Portable Class Library</see>, catch the base class exception, <see cref="T:System.FormatException" />, instead.</para>
</block>
The URI formed by combining <paramref name="baseUri" /> and <paramref name="relativeUri" /> is empty or contains only spaces.

-or-

The scheme specified in the URI formed by combining <paramref name="baseUri" /> and <paramref name="relativeUri" /> is not valid.
Expand Down