Fix docs

8 years ago · 694cc814bd
parent 18c09bf291
commit 694cc814bd
2 changed files with 5 additions and 2 deletions
--- a/doc/environment_variables.md
+++ b/doc/environment_variables.md
@ -9,7 +9,7 @@ some configuration as environment variables that can be set.
  grpc_shutdown(). Set to 1 to cause the abort, if unset or 0 it does not
  abort the process.

-* GRPC_GOOGLE_CREDENTIALS_ENV_VAR
+* GOOGLE_APPLICATION_CREDENTIALS
  The path to find the credentials to use when Google credentials are created

 * GRPC_SSL_CIPHER_SUITES
@ -17,6 +17,9 @@ some configuration as environment variables that can be set.
  Defaults to:
    ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-GCM-SHA384

+* GRPC_DEFAULT_SSL_ROOTS_FILE_PATH
+  PEM file to load SSL roots from
+
 * GRPC_POLL_STRATEGY [posix-style environments only]
  Declares which polling engines to try when starting gRPC.
  This is a comma-separated list of engines, which are tried in priority order
--- a/third_party/nanopb
+++ b/third_party/nanopb
@ -1 +1 @@
-Subproject commit f8ac463766281625ad710900479130c7fcb4d63b
+Subproject commit 68a86e96481e6bea987df8de47027847b30c325b