aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/Documentation.md
diff options
context:
space:
mode:
authorJosh Bodily <joshbodily@gmail.com>2017-08-16 10:56:43 -0600
committerGitHub <noreply@github.com>2017-08-16 10:56:43 -0600
commit960de7151241c2140b32c171298444cc07de1325 (patch)
treed7c7f675e630f92c2dfbc7fea3405dce8e63e72e /googlemock/docs/Documentation.md
parent713b0778709ba8ba2f8e437f0bbba16d57de7137 (diff)
parent5ed471caec6f341018707e74e0dc41201fb59edd (diff)
downloadgoogletest-960de7151241c2140b32c171298444cc07de1325.tar.gz
googletest-960de7151241c2140b32c171298444cc07de1325.tar.bz2
googletest-960de7151241c2140b32c171298444cc07de1325.zip
Merge branch 'master' into josh/fix_scoped_class2
Diffstat (limited to 'googlemock/docs/Documentation.md')
-rw-r--r--googlemock/docs/Documentation.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/googlemock/docs/Documentation.md b/googlemock/docs/Documentation.md
index 444151ee..a0311871 100644
--- a/googlemock/docs/Documentation.md
+++ b/googlemock/docs/Documentation.md
@@ -1,5 +1,8 @@
-This page lists all documentation wiki pages for Google Mock **(the SVN trunk version)**
-- **if you use a released version of Google Mock, please read the documentation for that specific version instead.**
+This page lists all documentation markdown files for Google Mock **(the
+current git version)**
+-- **if you use a former version of Google Mock, please read the
+documentation for that specific version instead (e.g. by checking out
+the respective git branch/tag).**
* [ForDummies](ForDummies.md) -- start here if you are new to Google Mock.
* [CheatSheet](CheatSheet.md) -- a quick reference.
@@ -9,4 +12,4 @@ This page lists all documentation wiki pages for Google Mock **(the SVN trunk ve
To contribute code to Google Mock, read:
* [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
- * [Pump Manual](../googletest/docs/PumpManual.md) -- how we generate some of Google Mock's source files.
+ * [Pump Manual](../../googletest/docs/PumpManual.md) -- how we generate some of Google Mock's source files.