Merge branch 'filtering' of github.com:hashicorp/consul into filtering

api/api.go

@@ -619,7 +619,6 @@ func (r *request) setQueryOptions(q *QueryOptions) {
 		r.params.Set("near", q.Near)
 	}
 	if q.Filter != "" {
-		fmt.Printf("filter set to %q\n", q.Filter)
 		r.params.Set("filter", q.Filter)
 	}
 	if len(q.NodeMeta) > 0 {

website/source/api/catalog.html.md

@@ -55,7 +55,7 @@ The table below shows this endpoint's support for
   provided, it will be defaulted to the value of the `Service.Service` property.
   Only one service with a given `ID` may be present per node. The service
   `Tags`, `Address`, `Meta`, and `Port` fields are all optional. For more
-  infomation about these fields and the implications of setting them,
+  information about these fields and the implications of setting them,
   see the [Service - Agent API](https://www.consul.io/api/agent/service.html) page
   as registering services differs between using this or the Services Agent endpoint.
 

website/source/api/features/filtering.html.md

@@ -114,7 +114,7 @@ will not be expanded.
 ## Filter Utilization
 
 Generally, only the main object is filtered. When filtering for
-an item within an array, that is not at the top level, the entire array that contains the item
+an item within an array that is not at the top level, the entire array that contains the item
 will be returned. This is usually the outermost object of a response,
 but in some cases such the [`/catalog/node/:node`](api/catalog.html#list-services-for-node)
 endpoint the filtering is performed on a object embedded within the results.
@@ -455,4 +455,4 @@ curl -G localhost:8500/v1/health/node/node-1 --data-urlencode 'filter=ServiceNam
         "ModifyIndex": 18
     }
 ]
-```
+```