aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/Documentation.md
diff options
context:
space:
mode:
authorgpetit <gaspard.petit@eidosmontreal.com>2017-08-14 13:45:45 -0400
committergpetit <gaspard.petit@eidosmontreal.com>2017-08-14 13:45:45 -0400
commit0c3c811164535eb5e539d83befba9caba48a9dfd (patch)
tree0bc15116e1259078b02e6608bc10d838711759b5 /googlemock/docs/Documentation.md
parent8f04622cc1507a3954490a03a1dfcff9e340359e (diff)
parent673c975a963f356b19fea90cb57b69192253da2a (diff)
downloadgoogletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.gz
googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.tar.bz2
googletest-0c3c811164535eb5e539d83befba9caba48a9dfd.zip
Merge remote-tracking branch 'origin/master' into user_logger_instead_of_printf
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.