Skip to content
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.

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

more doc fixes #45

Merged
merged 1 commit into from
Aug 30, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/configuration/http_conn_man/http_conn_man.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ HTTP connection manager
.. _config_http_conn_man_codec_type:

codec_type
*(required, string)* Supplies the type codec that the connection manager should use. Possible
*(required, string)* Supplies the type of codec that the connection manager should use. Possible
values are:

http1
Expand Down Expand Up @@ -111,8 +111,8 @@ idle_timeout_s

use_remote_address
*(optional, boolean)* If set to true, the connection manager will use the real remote address
of the client connection when determining internal versus external and manipulating various
headers. If set to false or absent, the connection manager will use the
of the client connection when determining internal versus external origin and manipulating
various headers. If set to false or absent, the connection manager will use the
:ref:`config_http_conn_man_headers_x-forwarded-for` HTTP header. See the documentation for
:ref:`config_http_conn_man_headers_x-forwarded-for`,
:ref:`config_http_conn_man_headers_x-envoy-internal`, and
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/http_conn_man/route_config/route.rst
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ key
default
*(required, integer)* An integer between 0-100. Every time the route is considered for a match,
a random number between 0-99 is selected. If the number is <= the value found in the *key*
(checked first) or if the key is not present this default value, the route is a match (assuming
(checked first) or, if the key is not present, the default value, the route is a match (assuming
everything also about the route matches).

.. _config_http_conn_man_route_table_route_retry:
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/http_conn_man/route_config/vhost.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ name

domains
*(required, array)* A list of domains (host/authority header) that will be matched to this
virtual host. Currently, wildcard matching is not supported of the form "\*.foo.com", however
virtual host. Currently, wildcard matching of the form "\*.foo.com" is not supported, however
a special entry "\*" is allowed which will match any host/authority header. Only a single virtual
host in the entire route configuration can match on "\*".

Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/network_filters/mongo_proxy_filter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ parse it as JSON and look for the following structure:
}

callingFunction
*(required, string)* the function that made the query. If available, the fucntion will be used
*(required, string)* the function that made the query. If available, the function will be used
in :ref:`callsite <config_network_filters_mongo_proxy_callsite_stats>` query statistics.

Per command statistics
Expand Down
2 changes: 1 addition & 1 deletion docs/install/sandboxes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ as is described in the image above.

**Step 1: Install Docker**

Ensure that you have a recent versions of ``docker`, ``docker-compose`` and
Ensure that you have a recent versions of ``docker, docker-compose`` and
``docker-machine`` installed.

A simple way to achieve this is via the `Docker Toolbox <https://www.docker.com/products/docker-toolbox>`_.
Expand Down