Skip to content

Commit 850e534

Browse files
authored
Merge pull request #4272 from dotnet/publish-3638
Merge master into live
2 parents 11f44e9 + 6c9ffd7 commit 850e534

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

xml/Microsoft.Extensions.Caching.Distributed/IDistributedCache.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
<Parameter Name="key" Type="System.String" />
134134
</Parameters>
135135
<Docs>
136-
<param name="key">A string identifying the requested calue.</param>
136+
<param name="key">A string identifying the requested value.</param>
137137
<summary>Refreshes a value in the cache based on its key, resetting its sliding expiration timeout (if any).</summary>
138138
<remarks>To be added.</remarks>
139139
</Docs>

xml/System.Diagnostics/FileVersionInfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
6161
6262
## Examples
63-
The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the file description and version number in a text box. This code assumes `textBox1` has been instantiated.
63+
The following example calls <xref:System.Diagnostics.FileVersionInfo.GetVersionInfo%2A> to get the <xref:System.Diagnostics.FileVersionInfo> for the Notepad. Then it prints the file description and version number to the console.
6464
6565
[!code-cpp[Classic FileVersionInfo Example#1](~/samples/snippets/cpp/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/CPP/source.cpp#1)]
6666
[!code-csharp[Classic FileVersionInfo Example#1](~/samples/snippets/csharp/VS_Snippets_CLR_Classic/classic FileVersionInfo Example/CS/source.cs#1)]

xml/System.IO/Path.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ For more information on file path formats on Windows, see [File path formats on
13491349
<Docs>
13501350
<param name="path">A relative path to concatenate to <paramref name="basePath" />.</param>
13511351
<param name="basePath">The beginning of a fully qualified path.</param>
1352-
<summary>Returns an absolute path from a fully qualified base path and a relative path.</summary>
1352+
<summary>Returns an absolute path from a relative path and a fully qualified base path.</summary>
13531353
<returns>The absolute path.</returns>
13541354
<remarks>
13551355
<format type="text/markdown"><![CDATA[

xml/System.Reflection/MetadataLoadContext.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ If a core assembly cannot be found or if the core assembly is missing types, thi
121121
122122
* <xref:System.Reflection.MethodInfo.ReturnType?displayProperty=nameWithType>
123123
* <xref:System.Reflection.MethodBase.GetParameters%2A?displayProperty=nameWithType>
124-
* <xref:System.Type.BaseType?displayProperty-nameWithType>
124+
* <xref:System.Type.BaseType?displayProperty=nameWithType>
125125
* <xref:System.Type.GetInterfaces%2A?displayProperty=nameWithType>
126126
127127
* APIs that need to compare types to well-known core types will not throw an exception, and the comparison will evaluate to `false`. For example, if you do not specify a core assembly, <xref:System.Type.IsPrimitive> will return `false` for everything, even types named <xref:System.Int32>. Similarly, <xref:System.Type.GetTypeCode%2A?displayProperty=nameWithType> will return <xref:System.TypeCode.Object> for everything.

xml/System.Web.UI.WebControls/LinqDataSourceView.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,7 @@ For more information, see the <xref:System.Web.UI.WebControls.LinqDataSource.Ord
21042104
## Remarks
21052105
The `SaveViewState` method is primarily used by control developers.
21062106
2107-
View state is the accumulation of the values of the properties for a server control. These values are automatically added to the <xref:System.Web.UI.Control.ViewState> property of the server control, which is an instance of the <xref>:System.Web.UI.StateBag> class. The <xref:System.Web.UI.Control.ViewState> value for the server control is then persisted to a string object after the save-state stage of the server control life cycle.
2107+
View state is the accumulation of the values of the properties for a server control. These values are automatically added to the <xref:System.Web.UI.Control.ViewState> property of the server control, which is an instance of the <xref:System.Web.UI.StateBag> class. The <xref:System.Web.UI.Control.ViewState> value for the server control is then persisted to a string object after the save-state stage of the server control life cycle.
21082108
21092109
When view state is saved, the string object that was persisted after the save-state stage of the server control life cycle is rendered to the browser as an HTML hidden element. When you create custom server controls, you can improve efficiency by overriding the `SaveViewState` method and modifying the `ViewState` property for your server control. For more information, see [ASP.NET State Management Overview](https://docs.microsoft.com/previous-versions/aspnet/75x4ha6s(v=vs.100)).
21102110

xml/System/Array.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787

8888
The <xref:System.Array> class is the base class for language implementations that support arrays. However, only the system and compilers can derive explicitly from the <xref:System.Array> class. Users should employ the array constructs provided by the language.
8989

90-
An element is a value in an <xref:System.Array>. The length of an <xref:System.Array> is the total number of elements it can contain. The lower bound of an <xref:System.Array> is the index of its first element. An <xref:System.Array> can have any lower bound, but it has a lower bound of zero by default. A different lower bound can be defined when creating an instance of the <xref:System.Array> class using <xref:System.Array.CreateInstance%2A>.A multidimensional <xref:System.Array> can have different bounds for each dimension. An array can have a maximum of 32 dimensions.
90+
An element is a value in an <xref:System.Array>. The length of an <xref:System.Array> is the total number of elements it can contain. The lower bound of an <xref:System.Array> is the index of its first element. An <xref:System.Array> can have any lower bound, but it has a lower bound of zero by default. A different lower bound can be defined when creating an instance of the <xref:System.Array> class using <xref:System.Array.CreateInstance%2A>. A multidimensional <xref:System.Array> can have different bounds for each dimension. An array can have a maximum of 32 dimensions.
9191

9292
Unlike the classes in the <xref:System.Collections> namespaces, <xref:System.Array> has a fixed capacity. To increase the capacity, you must create a new <xref:System.Array> object with the required capacity, copy the elements from the old <xref:System.Array> object to the new one, and delete the old <xref:System.Array>.
9393

0 commit comments

Comments
 (0)