summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorBilly Donahue <billydonahue@google.com>2015-08-30 16:13:33 (GMT)
committerBilly Donahue <billydonahue@google.com>2015-08-30 16:13:33 (GMT)
commitb55ac7f36ff032d5519cf55b84ca930ff9f80b97 (patch)
tree07bc48991cf56c33d1af2f75a113f2ce3becb538 /README.md
parent3f4e79b99985d1db699e24ce6e7b07896ece1b64 (diff)
downloadgoogletest-b55ac7f36ff032d5519cf55b84ca930ff9f80b97.zip
googletest-b55ac7f36ff032d5519cf55b84ca930ff9f80b97.tar.gz
googletest-b55ac7f36ff032d5519cf55b84ca930ff9f80b97.tar.bz2
readme merging
Diffstat (limited to 'README.md')
-rw-r--r--README.md8
1 files changed, 2 insertions, 6 deletions
diff --git a/README.md b/README.md
index a75279a..7c07a8a 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,7 @@ you can also use it with [any C++ testing framework](googlemock/ForDummies.md#Us
If you are new to the project, we suggest that you read the user
documentation in the following order:
- * Learn the [basics](googletest/docs/Primer) of
+ * Learn the [basics](googletest/docs/Primer.md) of
Google Test, if you choose to use Google Mock with it (recommended).
* Read [Google Mock for Dummies](googlemock/docs/ForDummies.md).
* Read the instructions on how to [build Google Mock](googlemock/README.md).
@@ -109,11 +109,7 @@ posting a question on the
### Regenerating Source Files ###
Some of Google Test's source files are generated from templates (not
-in the C++ sense) using a script. A template file is named FOO.pump,
-where FOO is the name of the file it will generate. For example, the
-file include/gtest/internal/gtest-type-util.h.pump is used to generate
-gtest-type-util.h in the same directory.
-
+in the C++ sense) using a script.
You don't need to worry about regenerating the source files
unless you need to modify them. You would then modify the
corresponding `.pump` files and run the '[pump.py](googletest/scripts/pump.py)'