summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authorManuel Binna <mbinna@users.noreply.github.com>2016-03-16 05:49:57 (GMT)
committerManuel Binna <mbinna@users.noreply.github.com>2016-03-16 05:49:57 (GMT)
commit207147495c803086db23788cc26f6cf66b2dbe03 (patch)
treef39c6f7ff3cb717ea507c2433d67771da9546ebc /googletest
parent72416fab75f0245525cdcaa6843b672f6764ddca (diff)
downloadgoogletest-207147495c803086db23788cc26f6cf66b2dbe03.zip
googletest-207147495c803086db23788cc26f6cf66b2dbe03.tar.gz
googletest-207147495c803086db23788cc26f6cf66b2dbe03.tar.bz2
Fix whitespace in paragraphrefs/pull/741/head
Diffstat (limited to 'googletest')
-rw-r--r--googletest/docs/AdvancedGuide.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/googletest/docs/AdvancedGuide.md b/googletest/docs/AdvancedGuide.md
index 7ba8d12..93a6520 100644
--- a/googletest/docs/AdvancedGuide.md
+++ b/googletest/docs/AdvancedGuide.md
@@ -1571,15 +1571,14 @@ For technical reasons, there are some caveats:
1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot reference local non-static variables or non-static members of `this` object.
1. _statement_ in `EXPECT_FATAL_FAILURE()` cannot return a value.
-_Note:_ Google Test is designed with threads in mind. Once the
+_Note:_ Google Test is designed with threads in mind. Once the
synchronization primitives in `"gtest/internal/gtest-port.h"` have
been implemented, Google Test will become thread-safe, meaning that
-you can then use assertions in multiple threads concurrently. Before
-
-that, however, Google Test only supports single-threaded usage. Once
+you can then use assertions in multiple threads concurrently. Before
+that, however, Google Test only supports single-threaded usage. Once
thread-safe, `EXPECT_FATAL_FAILURE()` and `EXPECT_NONFATAL_FAILURE()`
will capture failures in the current thread only. If _statement_
-creates new threads, failures in these threads will be ignored. If
+creates new threads, failures in these threads will be ignored. If
you want to capture failures from all threads instead, you should use
the following macros: