aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-29 19:31:16 -0400
committerGitHub <noreply@github.com>2017-08-29 19:31:16 -0400
commit298cd5e9c4230d35b7420f0ceec144c6e2cff57c (patch)
treed44f4063de6b05a8a308ceb2fb167efa9bb837b8
parentb46755be30f940687e43b82800f1f052f628388c (diff)
parentbb8399e1baf9d984894a54ba1e6e9e4d20c11a35 (diff)
downloadgoogletest-298cd5e9c4230d35b7420f0ceec144c6e2cff57c.tar.gz
googletest-298cd5e9c4230d35b7420f0ceec144c6e2cff57c.tar.bz2
googletest-298cd5e9c4230d35b7420f0ceec144c6e2cff57c.zip
Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105
fix typos mentioned in issue 1105
-rw-r--r--googlemock/docs/CookBook.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md
index 6ea7f3a9..753c6dd3 100644
--- a/googlemock/docs/CookBook.md
+++ b/googlemock/docs/CookBook.md
@@ -148,7 +148,7 @@ Note that the mock class doesn't define `AppendPacket()`, unlike the
real class. That's fine as long as the test doesn't need to call it.
Next, you need a way to say that you want to use
-`ConcretePacketStream` in production code, and use `MockPacketStream`
+`ConcretePacketStream` in production code and to use `MockPacketStream`
in tests. Since the functions are not virtual and the two classes are
unrelated, you must specify your choice at _compile time_ (as opposed
to run time).
@@ -706,7 +706,7 @@ type `m` accepts):
1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
-The code won't compile if any of these conditions isn't met.
+The code won't compile if any of these conditions aren't met.
Here's one example: