aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/Documentation.md
diff options
context:
space:
mode:
authorBrukerJWD <jonathan.wendeborn@bruker.com>2018-10-16 08:37:56 +0200
committerGitHub <noreply@github.com>2018-10-16 08:37:56 +0200
commit8c82ba48e433005b9e25835b4a342ef4dcc0cfc0 (patch)
treee1ae94f37108a8f506cd4d11eec0e058c2c39980 /googlemock/docs/Documentation.md
parent6bbf911a8dc0c42ad05135f26a07f4893eb83916 (diff)
parenta651a4d44e65b749467fa3dddf93819a22f0cc4a (diff)
downloadgoogletest-8c82ba48e433005b9e25835b4a342ef4dcc0cfc0.tar.gz
googletest-8c82ba48e433005b9e25835b4a342ef4dcc0cfc0.tar.bz2
googletest-8c82ba48e433005b9e25835b4a342ef4dcc0cfc0.zip
Merge branch 'master' into isnice
Diffstat (limited to 'googlemock/docs/Documentation.md')
-rw-r--r--googlemock/docs/Documentation.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/googlemock/docs/Documentation.md b/googlemock/docs/Documentation.md
index 444151ee..a42bd113 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.
@@ -8,5 +11,5 @@ 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.
+ * [CONTRIBUTING](../../CONTRIBUTING.md) -- read this _before_ writing your first patch.
+ * [Pump Manual](../../googletest/docs/PumpManual.md) -- how we generate some of Google Mock's source files.