Merge branch 'master' into 9A681768AABE08D1EFA5CA77528236A4
diff --git a/ci/env-linux.sh b/ci/env-linux.sh
index 9086b1f..37800d6 100755
--- a/ci/env-linux.sh
+++ b/ci/env-linux.sh
@@ -37,5 +37,5 @@
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+ if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
fi
diff --git a/ci/env-osx.sh b/ci/env-osx.sh
index 31c8835..127a969 100755
--- a/ci/env-osx.sh
+++ b/ci/env-osx.sh
@@ -36,5 +36,5 @@
# TODO() - we can check if this is being sourced using $BASH_VERSION and $BASH_SOURCE[0] != ${0}.
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+ if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
fi
diff --git a/googletest/docs/primer.md b/googletest/docs/primer.md
index 02dea42..7a8ea8d 100644
--- a/googletest/docs/primer.md
+++ b/googletest/docs/primer.md
@@ -317,7 +317,7 @@
1. If necessary, write a destructor or `TearDown()` function to release any
resources you allocated in `SetUp()` . To learn when you should use the
constructor/destructor and when you should use `SetUp()/TearDown()`, read
- this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-the-set-uptear-down-function) entry.
+ this [FAQ](faq.md#should-i-use-the-constructordestructor-of-the-test-fixture-or-setupteardown) entry.
1. If needed, define subroutines for your tests to share.
When using a fixture, use `TEST_F()` instead of `TEST()` as it allows you to
