From 5d4716fed0294a8cf46244f971800449364bd50c Mon Sep 17 00:00:00 2001 From: Bill Gallagher Date: Tue, 30 Aug 2016 13:01:33 -0400 Subject: [PATCH] more doc fixes --- docs/configuration/http_conn_man/http_conn_man.rst | 6 +++--- docs/configuration/http_conn_man/route_config/route.rst | 2 +- docs/configuration/http_conn_man/route_config/vhost.rst | 2 +- docs/configuration/network_filters/mongo_proxy_filter.rst | 2 +- docs/install/sandboxes.rst | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/configuration/http_conn_man/http_conn_man.rst b/docs/configuration/http_conn_man/http_conn_man.rst index 5ae115a5dcd1..1445494868d3 100644 --- a/docs/configuration/http_conn_man/http_conn_man.rst +++ b/docs/configuration/http_conn_man/http_conn_man.rst @@ -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 @@ -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 diff --git a/docs/configuration/http_conn_man/route_config/route.rst b/docs/configuration/http_conn_man/route_config/route.rst index 7db47e782efc..c7e820328385 100644 --- a/docs/configuration/http_conn_man/route_config/route.rst +++ b/docs/configuration/http_conn_man/route_config/route.rst @@ -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: diff --git a/docs/configuration/http_conn_man/route_config/vhost.rst b/docs/configuration/http_conn_man/route_config/vhost.rst index 275298889748..84ff8cd6efdc 100644 --- a/docs/configuration/http_conn_man/route_config/vhost.rst +++ b/docs/configuration/http_conn_man/route_config/vhost.rst @@ -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 "\*". diff --git a/docs/configuration/network_filters/mongo_proxy_filter.rst b/docs/configuration/network_filters/mongo_proxy_filter.rst index d8f9bfb745f7..9308d922282b 100644 --- a/docs/configuration/network_filters/mongo_proxy_filter.rst +++ b/docs/configuration/network_filters/mongo_proxy_filter.rst @@ -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 ` query statistics. Per command statistics diff --git a/docs/install/sandboxes.rst b/docs/install/sandboxes.rst index 71a2b2327bb1..ade45e0bc21c 100644 --- a/docs/install/sandboxes.rst +++ b/docs/install/sandboxes.rst @@ -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 `_.