honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Docs: Fixed a grammatical mistake: 'a HTTP ...' -> 'an HTTP ...' (#33744) 

Fixed a grammatical mistake: 'a HTTP ...' -> 'an HTTP ...'

Closes #33728
This commit is contained in:
Or Bin 2018-09-17 22:35:55 +03:00 committed by Nik Everett
parent d8dc042514
commit a5bad4d92c
25 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/java-rest/low-level/configuration.asciidoc
View File

@ -54,7 +54,7 @@ include-tagged::{doc-tests}/RestClientDocumentation.java[rest-client-config-basi
--------------------------------------------------
Preemptive Authentication can be disabled, which means that every request will be sent without
authorization headers to see if it is accepted and, upon receiving a HTTP 401 response, it will
authorization headers to see if it is accepted and, upon receiving an HTTP 401 response, it will
resend the exact same request with the basic authentication header. If you wish to do this, then
you can do so by disabling it via the `HttpAsyncClientBuilder`:

2
docs/plugins/plugin-script.asciidoc
View File

@ -88,7 +88,7 @@ must not be contained in the `plugins` directory for the node that you are
installing the plugin to or installation will fail.
HTTP::
To install a plugin from a HTTP URL:
To install a plugin from an HTTP URL:
+
[source,shell]
-----------------------------------

2
docs/reference/modules/http.asciidoc
View File

@ -96,7 +96,7 @@ and stack traces in response output. Note: When set to `false` and the `error_tr
parameter is specified, an error will be returned; when `error_trace` is not specified, a
simple message will be returned. Defaults to `true`
|`http.pipelining.max_events` |The maximum number of events to be queued up in memory before a HTTP connection is closed, defaults to `10000`.
|`http.pipelining.max_events` |The maximum number of events to be queued up in memory before an HTTP connection is closed, defaults to `10000`.
|`http.max_warning_header_count` |The maximum number of warning headers in
client HTTP responses, defaults to unbounded.

2
docs/reference/settings/notification-settings.asciidoc
View File

@ -60,7 +60,7 @@ The maximum period of inactivity between two data packets, before the
request is aborted.
`xpack.http.max_response_size`::
Specifies the maximum size a HTTP response is allowed to have, defaults to
Specifies the maximum size an HTTP response is allowed to have, defaults to
`10mb`, the maximum configurable value is `50mb`.
[[ssl-notification-settings]]

4
docs/reference/settings/security-settings.asciidoc
View File

@ -78,7 +78,7 @@ The roles to associate with the anonymous user. Required.
When `true`, an HTTP 403 response is returned if the anonymous user
does not have the appropriate permissions for the requested action. The
user is not prompted to provide credentials to access the requested
resource. When set to `false`, a HTTP 401 is returned and the user
resource. When set to `false`, an HTTP 401 response is returned and the user
can provide credentials with the appropriate permissions to gain
access. Defaults to `true`.
@ -1381,4 +1381,4 @@ List of IP addresses to allow for this profile.
`transport.profiles.$PROFILE.xpack.security.filter.deny`::
List of IP addresses to deny for this profile.
include::security-hash-settings.asciidoc[]
include::security-hash-settings.asciidoc[]

2
docs/reference/setup/install/windows.asciidoc
View File

@ -69,7 +69,7 @@ name, node name and roles to be set, in addition to memory and network settings:
[[msi-installer-configuration]]
image::images/msi_installer/msi_installer_configuration.png[]
A list of common plugins that can be downloaded and installed as part of the installation, with the option to configure a HTTPS proxy through which to download these plugins.
A list of common plugins that can be downloaded and installed as part of the installation, with the option to configure an HTTPS proxy through which to download these plugins.
TIP: Ensure the installation machine has access to the internet and that any corporate firewalls in place are configured to allow downloads from `artifacts.elastic.co`:

4
docs/ruby/client.asciidoc
View File

@ -84,7 +84,7 @@ client.search index: 'my-index', body: { query: { match: { title: 'test' } } }
The `elasticsearch` gem combines two separate Rubygems:
* https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-transport[`elasticsearch-transport`]
provides a HTTP Ruby client for connecting to the Elasticsearch cluster,
provides an HTTP Ruby client for connecting to the Elasticsearch cluster,
* https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-api[`elasticsearch-api`]
provides a Ruby API for the Elasticsearch RESTful API.
@ -94,7 +94,7 @@ Please see their respective documentation for configuration options and technica
Notably, the documentation and comprehensive examples for all the API methods is contained in the source,
and available online at http://rubydoc.info/gems/elasticsearch-api/Elasticsearch/API/Actions[Rubydoc].
Keep in mind, that for optimal performance, you should use a HTTP library which supports
Keep in mind, that for optimal performance, you should use an HTTP library which supports
persistent ("keep-alive") HTTP connections.

6
modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4CorsTests.java
View File

@ -46,7 +46,7 @@ import static org.hamcrest.Matchers.nullValue;
public class Netty4CorsTests extends ESTestCase {
public void testCorsEnabledWithoutAllowOrigins() {
// Set up a HTTP transport with only the CORS enabled setting
// Set up an HTTP transport with only the CORS enabled setting
Settings settings = Settings.builder()
.put(HttpTransportSettings.SETTING_CORS_ENABLED.getKey(), true)
.build();
@ -57,7 +57,7 @@ public class Netty4CorsTests extends ESTestCase {
public void testCorsEnabledWithAllowOrigins() {
final String originValue = "remote-host";
// create a http transport with CORS enabled and allow origin configured
// create an HTTP transport with CORS enabled and allow origin configured
Settings settings = Settings.builder()
.put(SETTING_CORS_ENABLED.getKey(), true)
.put(SETTING_CORS_ALLOW_ORIGIN.getKey(), originValue)
@ -72,7 +72,7 @@ public class Netty4CorsTests extends ESTestCase {
public void testCorsAllowOriginWithSameHost() {
String originValue = "remote-host";
String host = "remote-host";
// create a http transport with CORS enabled
// create an HTTP transport with CORS enabled
Settings settings = Settings.builder()
.put(SETTING_CORS_ENABLED.getKey(), true)
.build();

4
modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java
View File

@ -44,7 +44,7 @@ import java.util.Collections;
import static org.hamcrest.Matchers.is;
/**
* This test checks, if a HTTP look-alike request (starting with a HTTP method and a space)
* This test checks, if an HTTP look-alike request (starting with an HTTP method and a space)
* actually returns text response instead of just dropping the connection
*/
public class Netty4SizeHeaderFrameDecoderTests extends ESTestCase {
@ -91,7 +91,7 @@ public class Netty4SizeHeaderFrameDecoderTests extends ESTestCase {
socket.getOutputStream().flush();
try (BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8))) {
assertThat(reader.readLine(), is("This is not a HTTP port"));
assertThat(reader.readLine(), is("This is not an HTTP port"));
}
}
}

6
plugins/transport-nio/src/test/java/org/elasticsearch/http/nio/HttpReadWriteHandlerTests.java
View File

@ -218,7 +218,7 @@ public class HttpReadWriteHandlerTests extends ESTestCase {
}
public void testCorsEnabledWithoutAllowOrigins() throws IOException {
// Set up a HTTP transport with only the CORS enabled setting
// Set up an HTTP transport with only the CORS enabled setting
Settings settings = Settings.builder()
.put(HttpTransportSettings.SETTING_CORS_ENABLED.getKey(), true)
.build();
@ -233,7 +233,7 @@ public class HttpReadWriteHandlerTests extends ESTestCase {
public void testCorsEnabledWithAllowOrigins() throws IOException {
final String originValue = "remote-host";
// create a http transport with CORS enabled and allow origin configured
// create an HTTP transport with CORS enabled and allow origin configured
Settings settings = Settings.builder()
.put(SETTING_CORS_ENABLED.getKey(), true)
.put(SETTING_CORS_ALLOW_ORIGIN.getKey(), originValue)
@ -252,7 +252,7 @@ public class HttpReadWriteHandlerTests extends ESTestCase {
public void testCorsAllowOriginWithSameHost() throws IOException {
String originValue = "remote-host";
String host = "remote-host";
// create a http transport with CORS enabled
// create an HTTP transport with CORS enabled
Settings settings = Settings.builder()
.put(SETTING_CORS_ENABLED.getKey(), true)
.build();

2
qa/smoke-test-http/src/test/java/org/elasticsearch/http/DetailedErrorsDisabledIT.java
View File

@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
/**
* Tests that when disabling detailed errors, a request with the error_trace parameter returns a HTTP 400
* Tests that when disabling detailed errors, a request with the error_trace parameter returns an HTTP 400 response.
*/
@ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numDataNodes = 1)
public class DetailedErrorsDisabledIT extends HttpSmokeTestCase {

2
server/src/main/java/org/elasticsearch/http/HttpChannel.java
View File

@ -27,7 +27,7 @@ import java.net.InetSocketAddress;
public interface HttpChannel extends CloseableChannel {
/**
* Sends a http response to the channel. The listener will be executed once the send process has been
* Sends an http response to the channel. The listener will be executed once the send process has been
* completed.
*
* @param response to send to channel

2
server/src/main/java/org/elasticsearch/monitor/package-info.java
View File

@ -18,7 +18,7 @@
*/
/**
* Monitors the Elasticsearch process and the system on which it is running so that metrics can be exposed via a HTTP or transport APIs to
* Monitors the Elasticsearch process and the system on which it is running so that metrics can be exposed via an HTTP or transport APIs to
* be logged and graphed.
*/
package org.elasticsearch.monitor;

8
server/src/main/java/org/elasticsearch/transport/TcpTransport.java
View File

@ -1087,7 +1087,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
* @param bytesReference the bytes available to consume
* @return the number of bytes consumed
* @throws StreamCorruptedException if the message header format is not recognized
* @throws TcpTransport.HttpOnTransportException if the message header appears to be a HTTP message
* @throws TcpTransport.HttpOnTransportException if the message header appears to be an HTTP message
* @throws IllegalArgumentException if the message length is greater that the maximum allowed frame size.
* This is dependent on the available memory.
*/
@ -1109,7 +1109,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
* @param networkBytes the will be read
* @return the message decoded
* @throws StreamCorruptedException if the message header format is not recognized
* @throws TcpTransport.HttpOnTransportException if the message header appears to be a HTTP message
* @throws TcpTransport.HttpOnTransportException if the message header appears to be an HTTP message
* @throws IllegalArgumentException if the message length is greater that the maximum allowed frame size.
* This is dependent on the available memory.
*/
@ -1136,7 +1136,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
* @param networkBytes the will be read
* @return the length of the message
* @throws StreamCorruptedException if the message header format is not recognized
* @throws TcpTransport.HttpOnTransportException if the message header appears to be a HTTP message
* @throws TcpTransport.HttpOnTransportException if the message header appears to be an HTTP message
* @throws IllegalArgumentException if the message length is greater that the maximum allowed frame size.
* This is dependent on the available memory.
*/
@ -1151,7 +1151,7 @@ public abstract class TcpTransport extends AbstractLifecycleComponent implements
private static int readHeaderBuffer(BytesReference headerBuffer) throws IOException {
if (headerBuffer.get(0) != 'E' || headerBuffer.get(1) != 'S') {
if (appearsToBeHTTP(headerBuffer)) {
throw new TcpTransport.HttpOnTransportException("This is not a HTTP port");
throw new TcpTransport.HttpOnTransportException("This is not an HTTP port");
}
throw new StreamCorruptedException("invalid internal transport message format, got ("

6
server/src/test/java/org/elasticsearch/http/DefaultRestChannelTests.java
View File

@ -92,7 +92,7 @@ public class DefaultRestChannelTests extends ESTestCase {
// TODO: Enable these Cors tests when the Cors logic lives in :server
// public void testCorsEnabledWithoutAllowOrigins() {
// // Set up a HTTP transport with only the CORS enabled setting
// // Set up an HTTP transport with only the CORS enabled setting
// Settings settings = Settings.builder()
// .put(HttpTransportSettings.SETTING_CORS_ENABLED.getKey(), true)
// .build();
@ -103,7 +103,7 @@ public class DefaultRestChannelTests extends ESTestCase {
//
// public void testCorsEnabledWithAllowOrigins() {
// final String originValue = "remote-host";
// // create a http transport with CORS enabled and allow origin configured
// // create an HTTP transport with CORS enabled and allow origin configured
// Settings settings = Settings.builder()
// .put(SETTING_CORS_ENABLED.getKey(), true)
// .put(SETTING_CORS_ALLOW_ORIGIN.getKey(), originValue)
@ -118,7 +118,7 @@ public class DefaultRestChannelTests extends ESTestCase {
// public void testCorsAllowOriginWithSameHost() {
// String originValue = "remote-host";
// String host = "remote-host";
// // create a http transport with CORS enabled
// // create an HTTP transport with CORS enabled
// Settings settings = Settings.builder()
// .put(SETTING_CORS_ENABLED.getKey(), true)
// .build();

2
server/src/test/java/org/elasticsearch/transport/TcpTransportTests.java
View File

@ -429,7 +429,7 @@ public class TcpTransportTests extends ESTestCase {
fail("Expected exception");
} catch (Exception ex) {
assertThat(ex, instanceOf(TcpTransport.HttpOnTransportException.class));
assertEquals("This is not a HTTP port", ex.getMessage());
assertEquals("This is not an HTTP port", ex.getMessage());
}
}
}

4
test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java
View File

@ -157,7 +157,7 @@ public abstract class AbstractHttpFixture {
}
/**
* Represents a HTTP Response.
* Represents an HTTP Response.
*/
protected static class Response {
@ -203,7 +203,7 @@ public abstract class AbstractHttpFixture {
}
/**
* Represents a HTTP Request.
* Represents an HTTP Request.
*/
protected static class Request {

2
test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java
View File

@ -161,7 +161,7 @@ public abstract class ESRestTestCase extends ESTestCase {
}
/**
* Construct a HttpHost from the given host and port
* Construct an HttpHost from the given host and port
*/
protected HttpHost buildHttpHost(String host, int port) {
return new HttpHost(host, port, getProtocol());

4
x-pack/docs/en/rest-api/watcher/execute-watch.asciidoc
View File

@ -57,7 +57,7 @@ This API supports the following fields:
| `ignore_condition` | no | false | When set to `true`, the watch execution uses the
{xpack-ref}/condition-always.html[Always Condition].
This can also be specified as a HTTP parameter.
This can also be specified as an HTTP parameter.
| `alternative_input` | no | null | When present, the watch uses this object as a payload
instead of executing its own input.
@ -70,7 +70,7 @@ This API supports the following fields:
execution result is persisted to the `.watcher-history`
index for the current time. In addition, the status of the
watch is updated, possibly throttling subsequent executions.
This can also be specified as a HTTP parameter.
This can also be specified as an HTTP parameter.
| `watch` | no | null | When present, this
{xpack-ref}/how-watcher-works.html#watch-definition[watch] is used

2
x-pack/docs/en/watcher/customizing-watches.asciidoc
View File

@ -83,7 +83,7 @@ See <<input-search>> for more details.
[[loading-http-data]]
==== Loading a Payload from a remote HTTP Service with HTTP Input
Use the `http` input to issue a HTTP request and load the returned response as
Use the `http` input to issue an HTTP request and load the returned response as
the watch initial payload. This input expects the response body content type
to either be JSON or YAML.

4
x-pack/docs/en/watcher/encrypting-data.asciidoc
View File

@ -6,8 +6,8 @@ information or details about your SMTP email service. You can encrypt this
data by generating a key and adding some secure settings on each node in your
cluster.
Every `password` field that is used in your watch within a HTTP basic
authentication block - for example within a webhook, a HTTP input or when using
Every `password` field that is used in your watch within an HTTP basic
authentication block - for example within a webhook, an HTTP input or when using
the reporting email attachment - will not be stored as plain text anymore. Also
be aware, that there is no way to configure your own fields in a watch to be
encrypted.

4
x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityHttpExceptionHandler.java
View File

@ -36,10 +36,10 @@ public final class SecurityHttpExceptionHandler implements BiConsumer<HttpChanne
if (isNotSslRecordException(e)) {
if (logger.isTraceEnabled()) {
logger.trace(new ParameterizedMessage("received plaintext http traffic on a https channel, closing connection {}",
logger.trace(new ParameterizedMessage("received plaintext http traffic on an https channel, closing connection {}",
channel), e);
} else {
logger.warn("received plaintext http traffic on a https channel, closing connection {}", channel);
logger.warn("received plaintext http traffic on an https channel, closing connection {}", channel);
}
CloseableChannel.closeChannel(channel);
} else if (isCloseDuringHandshakeException(e)) {

4
x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/common/http/HttpClient.java
View File

@ -224,9 +224,9 @@ public class HttpClient extends AbstractComponent implements Closeable {
}
/**
* Creates a HTTP proxy from the system wide settings
* Creates an HTTP proxy from the system wide settings
*
* @return A http proxy instance, if no settings are configured this will be a HttpProxy.NO_PROXY instance
* @return An HTTP proxy instance, if no settings are configured this will be an HttpProxy.NO_PROXY instance
*/
private HttpProxy getProxyFromSettings() {
String proxyHost = HttpSettings.PROXY_HOST.get(settings);

2
x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/http/HttpClientTests.java
View File

@ -513,7 +513,7 @@ public class HttpClientTests extends ESTestCase {
try (Socket socket = serverSocket.accept()) {
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8));
in.readLine();
socket.getOutputStream().write("This is not a HTTP response".getBytes(StandardCharsets.UTF_8));
socket.getOutputStream().write("This is not an HTTP response".getBytes(StandardCharsets.UTF_8));
socket.getOutputStream().flush();
} catch (Exception e) {
hasExceptionHappened.set(e);

2
x-pack/qa/third-party/jira/build.gradle vendored
View File

@ -59,7 +59,7 @@ def jiraIssues(projectKey) {
return response.issues.findAll {it.key.startsWith(projectKey)}.collect {it.key}
}
/** Execute a HTTP request against the Jira server instance **/
/** Execute an HTTP request against the Jira server instance **/
def jiraHttpRequest(String endpoint, String method, int successCode) {
HttpsURLConnection connection = null;
try {