Merge branch 'master' into mingw64-appveyour

4 files changed, 4 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index da68162d..8f89b801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ bazel-genfiles
 bazel-googletest
 bazel-out
 bazel-testlogs
+# python
+*.pyc
\ No newline at end of file
diff --git a/googletest/.gitignore b/googletest/.gitignore
deleted file mode 100644
index 4b7be4b9..00000000
--- a/googletest/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# python
-*.pyc
diff --git a/googletest/docs/FAQ.md b/googletest/docs/FAQ.md
index 36f5f7fb..76c23727 100644
--- a/googletest/docs/FAQ.md
+++ b/googletest/docs/FAQ.md
@@ -1034,7 +1034,7 @@ namespace bar {
 TEST(CoolTest, DoSomething) {
   SUCCEED();
 }
-}  // namespace foo
+}  // namespace bar
 ```
 
 However, the following code is **not allowed** and will produce a runtime error from Google Test because the test methods are using different test fixture classes with the same test case name.
@@ -1052,7 +1052,7 @@ class CoolTest : public ::testing::Test {};  // Fixture: bar::CoolTest
 TEST_F(CoolTest, DoSomething) {
   SUCCEED();
 }
-}  // namespace foo
+}  // namespace bar
 ```
 
 ## How do I build Google Testing Framework with Xcode 4? ##
diff --git a/travis.sh b/travis.sh
index 1b23a3d4..6e7f06ab 100755
--- a/travis.sh
+++ b/travis.sh
@@ -5,7 +5,6 @@ env | sort
 mkdir build || true
 cd build
 cmake -Dgtest_build_samples=ON \
-      -Dgmock_build_samples=ON \
       -Dgtest_build_tests=ON \
       -Dgmock_build_tests=ON \
       -DCMAKE_CXX_FLAGS=$CXX_FLAGS \