docs: misc fixes

README.md

@@ -1,6 +1,21 @@
-Envoy
-=========
+# Envoy
 
 C++ L7 proxy and communication bus
 
 https://lyft.github.io/envoy
+
+## Contact
+
+* [envoy-announce](https://groups.google.com/forum/#!forum/envoy-announce): Low frequency mailing
+  list where we will email announcements only
+* [envoy-users](https://groups.google.com/forum/#!forum/envoy-users): General user discussion
+* [#lyft-envoy](http://webchat.freenode.net/?channels=lyft-envoy): IRC
+* [lyft/envoy](https://gitter.im/lyft/envoy): Gitter
+
+## Reporting security vulnerabilities
+
+If you've found a vulnerability or a potential vulnerability in Envoy please let us know at
+security@lyft.com. We'll send a confirmation email to acknowledge your report, and we'll send an
+additional email when we've identified the issue positively or negatively.
+
+

docs/configuration/cluster_manager/cluster.rst

@@ -21,6 +21,7 @@ Cluster
     "ssl_context": "{...}",
     "features": "...",
     "http_codec_options": "...",
+    "alt_stat_name": "..."
   }
 
 name
@@ -140,6 +141,11 @@ http_codec_options
   an HTTP/2 mesh, if it's desired to disable HTTP/2 header compression the *no_compression*
   option should be specified both here as well as in the HTTP connection manager.
 
+alt_stat_name
+  *(optional, string)* If an alternate stat name is specified, some :ref:`statistics
+  <config_cluster_manager_cluster_stats>` will be duplicated between the standard statistics and a
+  tree specified by this parameter (e.g., *cluster.<alt_stat_name>.*).
+
 .. toctree::
   :hidden:
 

docs/intro/getting_help.rst

@@ -14,7 +14,7 @@ Google Groups
 IRC
 ---
 
-* `#envoy <http://webchat.freenode.net/?channels=envoy>`_
+* `#lyft-envoy <http://webchat.freenode.net/?channels=lyft-envoy>`_
 * `lyft/envoy on Gitter <https://gitter.im/lyft/envoy>`_
 
 Feel free to drop into either Gitter or the IRC channel for any reason, even

source/common/upstream/upstream_impl.h

@@ -147,7 +147,7 @@ class ClusterImplBase : public Cluster,
   void setHealthChecker(HealthCheckerPtr&& health_checker);
 
   // Upstream::Cluster
-  const std::string& altStatName() const { return alt_stat_name_; }
+  const std::string& altStatName() const override { return alt_stat_name_; }
   std::chrono::milliseconds connectTimeout() const override { return connect_timeout_; }
   uint64_t features() const override { return features_; }
   uint64_t httpCodecOptions() const override { return http_codec_options_; }