huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix “must comprised of” (#7519) 

* Fix missing word

* Replace ‘comprise’ with simpler wording
This commit is contained in:
Joseph Musser 2019-02-14 12:27:55 -05:00 committed by Eilon Lipton
parent bca85b92fc
commit 50587d7d6d
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.DataProtection.KeyManagement
/// Stores the given key material to the escrow service.
/// </summary>
/// <param name="keyId">The id of the key being persisted to escrow.</param>
/// <param name="element">The unencrypted XML element that comprises the key material.</param>
/// <param name="element">The unencrypted key material in XML form.</param>
void Store(Guid keyId, XElement element);
}
}

2
src/DataProtection/DataProtection/src/Secret.cs
View File

@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.DataProtection
}
/// <summary>
/// Returns a Secret comprised entirely of random bytes retrieved from
/// Returns a Secret made entirely of random bytes retrieved from
/// a cryptographically secure RNG.
/// </summary>
public static Secret Random(int numBytes)

4
src/Identity/Extensions.Core/src/PasswordOptions.cs
View File

@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Identity
public int RequiredLength { get; set; } = 6;
/// <summary>
/// Gets or sets the minimum number of unique chars a password must comprised of. Defaults to 1.
/// Gets or sets the minimum number of unique characters which a password must contain. Defaults to 1.
/// </summary>
public int RequiredUniqueChars { get; set; } = 1;
@ -42,4 +42,4 @@ namespace Microsoft.AspNetCore.Identity
/// <value>True if passwords must contain a digit.</value>
public bool RequireDigit { get; set; } = true;
}
}
}

8
src/SignalR/clients/csharp/Client/src/HubConnectionBuilderHttpExtensions.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
/// </summary>
/// <param name="hubConnectionBuilder">The <see cref="IHubConnectionBuilder" /> to configure.</param>
/// <param name="url">The URL the <see cref="HttpConnection"/> will use.</param>
/// <param name="transports">A bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use.</param>
/// <param name="transports">A bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use.</param>
/// <returns>The same instance of the <see cref="IHubConnectionBuilder"/> for chaining.</returns>
public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, string url, HttpTransportType transports)
{
@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
/// </summary>
/// <param name="hubConnectionBuilder">The <see cref="IHubConnectionBuilder" /> to configure.</param>
/// <param name="url">The URL the <see cref="HttpConnection"/> will use.</param>
/// <param name="transports">A bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use.</param>
/// <param name="transports">A bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use.</param>
/// <param name="configureHttpConnection">The delegate that configures the <see cref="HttpConnection"/>.</param>
/// <returns>The same instance of the <see cref="IHubConnectionBuilder"/> for chaining.</returns>
public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, string url, HttpTransportType transports, Action<HttpConnectionOptions> configureHttpConnection)
@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
/// </summary>
/// <param name="hubConnectionBuilder">The <see cref="IHubConnectionBuilder" /> to configure.</param>
/// <param name="url">The URL the <see cref="HttpConnection"/> will use.</param>
/// <param name="transports">A bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use.</param>
/// <param name="transports">A bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use.</param>
/// <returns>The same instance of the <see cref="IHubConnectionBuilder"/> for chaining.</returns>
public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, Uri url, HttpTransportType transports)
{
@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.SignalR.Client
/// </summary>
/// <param name="hubConnectionBuilder">The <see cref="IHubConnectionBuilder" /> to configure.</param>
/// <param name="url">The URL the <see cref="HttpConnection"/> will use.</param>
/// <param name="transports">A bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use.</param>
/// <param name="transports">A bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use.</param>
/// <param name="configureHttpConnection">The delegate that configures the <see cref="HttpConnection"/>.</param>
/// <returns>The same instance of the <see cref="IHubConnectionBuilder"/> for chaining.</returns>
public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, Uri url, HttpTransportType transports, Action<HttpConnectionOptions> configureHttpConnection)

4
src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs
View File

@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
/// Initializes a new instance of the <see cref="HttpConnection"/> class.
/// </summary>
/// <param name="url">The URL to connect to.</param>
/// <param name="transports">A bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use.</param>
/// <param name="transports">A bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use.</param>
public HttpConnection(Uri url, HttpTransportType transports)
: this(url, transports, loggerFactory: null)
{
@ -109,7 +109,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
/// Initializes a new instance of the <see cref="HttpConnection"/> class.
/// </summary>
/// <param name="url">The URL to connect to.</param>
/// <param name="transports">A bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use.</param>
/// <param name="transports">A bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use.</param>
/// <param name="loggerFactory">The logger factory.</param>
public HttpConnection(Uri url, HttpTransportType transports, ILoggerFactory loggerFactory)
: this(CreateHttpOptions(url, transports), loggerFactory)

2
src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionOptions.cs
View File

@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client
public Uri Url { get; set; }
/// <summary>
/// Gets or sets a bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the client should use to send HTTP requests.
/// Gets or sets a bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the client should use to send HTTP requests.
/// </summary>
public HttpTransportType Transports { get; set; }

2
src/SignalR/common/Http.Connections.Common/src/HttpTransports.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Http.Connections
public static class HttpTransports
{
/// <summary>
/// A bitmask comprised of all available <see cref="HttpTransportType"/> values.
/// A bitmask combining all available <see cref="HttpTransportType"/> values.
/// </summary>
public static readonly HttpTransportType All = HttpTransportType.WebSockets | HttpTransportType.ServerSentEvents | HttpTransportType.LongPolling;
}

2
src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs
View File

@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Http.Connections
public IList<IAuthorizeData> AuthorizationData { get; }
/// <summary>
/// Gets or sets a bitmask comprised of one or more <see cref="HttpTransportType"/> that specify what transports the server should use to receive HTTP requests.
/// Gets or sets a bitmask combining one or more <see cref="HttpTransportType"/> values that specify what transports the server should use to receive HTTP requests.
/// </summary>
public HttpTransportType Transports { get; set; }