From 50587d7d6d133cc1584f27a9042e54a24b9e5f13 Mon Sep 17 00:00:00 2001 From: Joseph Musser Date: Thu, 14 Feb 2019 12:27:55 -0500 Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cmust=20comprised=20of=E2=80=9D?= =?UTF-8?q?=20(#7519)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix missing word * Replace ‘comprise’ with simpler wording --- .../DataProtection/src/KeyManagement/IKeyEscrowSink.cs | 2 +- src/DataProtection/DataProtection/src/Secret.cs | 2 +- src/Identity/Extensions.Core/src/PasswordOptions.cs | 4 ++-- .../Client/src/HubConnectionBuilderHttpExtensions.cs | 8 ++++---- .../csharp/Http.Connections.Client/src/HttpConnection.cs | 4 ++-- .../Http.Connections.Client/src/HttpConnectionOptions.cs | 2 +- .../common/Http.Connections.Common/src/HttpTransports.cs | 2 +- .../src/HttpConnectionDispatcherOptions.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs b/src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs index 64b94e844e..7ef5db38f3 100644 --- a/src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs +++ b/src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.DataProtection.KeyManagement /// Stores the given key material to the escrow service. /// /// The id of the key being persisted to escrow. - /// The unencrypted XML element that comprises the key material. + /// The unencrypted key material in XML form. void Store(Guid keyId, XElement element); } } diff --git a/src/DataProtection/DataProtection/src/Secret.cs b/src/DataProtection/DataProtection/src/Secret.cs index 05c1c212bd..ac3f71dc55 100644 --- a/src/DataProtection/DataProtection/src/Secret.cs +++ b/src/DataProtection/DataProtection/src/Secret.cs @@ -164,7 +164,7 @@ namespace Microsoft.AspNetCore.DataProtection } /// - /// Returns a Secret comprised entirely of random bytes retrieved from + /// Returns a Secret made entirely of random bytes retrieved from /// a cryptographically secure RNG. /// public static Secret Random(int numBytes) diff --git a/src/Identity/Extensions.Core/src/PasswordOptions.cs b/src/Identity/Extensions.Core/src/PasswordOptions.cs index d532ea4fab..7651105b98 100644 --- a/src/Identity/Extensions.Core/src/PasswordOptions.cs +++ b/src/Identity/Extensions.Core/src/PasswordOptions.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Identity public int RequiredLength { get; set; } = 6; /// - /// 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. /// public int RequiredUniqueChars { get; set; } = 1; @@ -42,4 +42,4 @@ namespace Microsoft.AspNetCore.Identity /// True if passwords must contain a digit. public bool RequireDigit { get; set; } = true; } -} \ No newline at end of file +} diff --git a/src/SignalR/clients/csharp/Client/src/HubConnectionBuilderHttpExtensions.cs b/src/SignalR/clients/csharp/Client/src/HubConnectionBuilderHttpExtensions.cs index bd0f6e531a..c79542cb49 100644 --- a/src/SignalR/clients/csharp/Client/src/HubConnectionBuilderHttpExtensions.cs +++ b/src/SignalR/clients/csharp/Client/src/HubConnectionBuilderHttpExtensions.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.SignalR.Client /// /// The to configure. /// The URL the will use. - /// A bitmask comprised of one or more that specify what transports the client should use. + /// A bitmask combining one or more values that specify what transports the client should use. /// The same instance of the for chaining. public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, string url, HttpTransportType transports) { @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.SignalR.Client /// /// The to configure. /// The URL the will use. - /// A bitmask comprised of one or more that specify what transports the client should use. + /// A bitmask combining one or more values that specify what transports the client should use. /// The delegate that configures the . /// The same instance of the for chaining. public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, string url, HttpTransportType transports, Action configureHttpConnection) @@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.SignalR.Client /// /// The to configure. /// The URL the will use. - /// A bitmask comprised of one or more that specify what transports the client should use. + /// A bitmask combining one or more values that specify what transports the client should use. /// The same instance of the for chaining. public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, Uri url, HttpTransportType transports) { @@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.SignalR.Client /// /// The to configure. /// The URL the will use. - /// A bitmask comprised of one or more that specify what transports the client should use. + /// A bitmask combining one or more values that specify what transports the client should use. /// The delegate that configures the . /// The same instance of the for chaining. public static IHubConnectionBuilder WithUrl(this IHubConnectionBuilder hubConnectionBuilder, Uri url, HttpTransportType transports, Action configureHttpConnection) diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs index 79312f4bd5..232c8c5c3b 100644 --- a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs +++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client /// Initializes a new instance of the class. /// /// The URL to connect to. - /// A bitmask comprised of one or more that specify what transports the client should use. + /// A bitmask combining one or more values that specify what transports the client should use. 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 class. /// /// The URL to connect to. - /// A bitmask comprised of one or more that specify what transports the client should use. + /// A bitmask combining one or more values that specify what transports the client should use. /// The logger factory. public HttpConnection(Uri url, HttpTransportType transports, ILoggerFactory loggerFactory) : this(CreateHttpOptions(url, transports), loggerFactory) diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionOptions.cs b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionOptions.cs index 197e3681a9..e5507a3a04 100644 --- a/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionOptions.cs +++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionOptions.cs @@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Client public Uri Url { get; set; } /// - /// Gets or sets a bitmask comprised of one or more that specify what transports the client should use to send HTTP requests. + /// Gets or sets a bitmask combining one or more values that specify what transports the client should use to send HTTP requests. /// public HttpTransportType Transports { get; set; } diff --git a/src/SignalR/common/Http.Connections.Common/src/HttpTransports.cs b/src/SignalR/common/Http.Connections.Common/src/HttpTransports.cs index de2ce47683..a633f2fc1d 100644 --- a/src/SignalR/common/Http.Connections.Common/src/HttpTransports.cs +++ b/src/SignalR/common/Http.Connections.Common/src/HttpTransports.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Http.Connections public static class HttpTransports { /// - /// A bitmask comprised of all available values. + /// A bitmask combining all available values. /// public static readonly HttpTransportType All = HttpTransportType.WebSockets | HttpTransportType.ServerSentEvents | HttpTransportType.LongPolling; } diff --git a/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs b/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs index 3acc25f91d..eff4ae76e4 100644 --- a/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs +++ b/src/SignalR/common/Http.Connections/src/HttpConnectionDispatcherOptions.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNetCore.Http.Connections public IList AuthorizationData { get; } /// - /// Gets or sets a bitmask comprised of one or more that specify what transports the server should use to receive HTTP requests. + /// Gets or sets a bitmask combining one or more values that specify what transports the server should use to receive HTTP requests. /// public HttpTransportType Transports { get; set; }