Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

googletest/docs/DevGuide.md

@@ -80,8 +80,8 @@ instructions for how to sign and return it.
 ## Coding Style ##
 
 To keep the source consistent, readable, diffable and easy to merge,
-we use a fairly rigid coding style, as defined by the [google-styleguide](http://code.google.com/p/google-styleguide/) project.  All patches will be expected
-to conform to the style outlined [here](http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml).
+we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project.  All patches will be expected
+to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html).
 
 ## Updating Generated Code ##
 

googletest/docs/Documentation.md

-This page lists all documentation wiki pages for Google Test **(the SVN trunk version)**
--- **if you use a released version of Google Test, please read the
-documentation for that specific version instead.**
+This page lists all documentation markdown files for Google Test **(the
+current git version)**
+-- **if you use a former version of Google Test, please read the
+documentation for that specific version instead (e.g. by checking out
+the respective git branch/tag).**
 
   * [Primer](Primer.md) -- start here if you are new to Google Test.
   * [Samples](Samples.md) -- learn from examples.
@@ -11,4 +13,4 @@ documentation for that specific version instead.**
 To contribute code to Google Test, read:
 
   * [DevGuide](DevGuide.md) -- read this _before_ writing your first patch.
-  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.
\ No newline at end of file
+  * [PumpManual](PumpManual.md) -- how we generate some of Google Test's source files.