Merge branch 'master' into add-vcpkg

lefticus · web-flow · commit ce52a52e33ba · 2019-12-09T15:00:50.000-08:00
diff --git a/02-Use_the_Tools_Available.md b/02-Use_the_Tools_Available.md
@@ -47,7 +47,7 @@ Package management is an important topic in C++, with currently no clear winner.
  * [qpm](https://www.qpm.io/) - Package manager for Qt
  * [build2](https://build2.org/) - cargo-like package management for C++
  * [Buckaroo](https://buckaroo.pm) - Truly decentralized cross-platform dependency manager for C/C++ and more
- * [vcpkg](https://docs.microsoft.com/en-us/cpp/build/vcpkg) - A C++ package manager for Windows, Linux and MacOS
+ * [Vcpkg](https://github.com/microsoft/vcpkg) - Microsoft C++ Library Manager for Windows, Linux, and MacOS - [description](https://docs.microsoft.com/en-us/cpp/build/vcpkg)
 
 ## Continuous Integration
 
diff --git a/03-Style.md b/03-Style.md
@@ -453,5 +453,5 @@ The Rule of Zero states that you do not provide any of the functions that the co
 
 The goal is to let the compiler provide optimal versions that are automatically maintained when more member variables are added.
 
-The [original article](https://rmf.io/cxx11/rule-of-zero) provides the background, while a [follow up article](http://www.nirfriedman.com/2015/06/27/cpp-rule-of-zero/) explains techniques for implementing nearly 100% of the time.
+[This article](http://www.nirfriedman.com/2015/06/27/cpp-rule-of-zero/) provides a background and explains techniques for implementing nearly 100% of the time.
 

Original file line number	Diff line number	Diff line change
`@@ -453,5 +453,5 @@ The Rule of Zero states that you do not provide any of the functions that the co`
`453`	`453`
`454`	`454`	`The goal is to let the compiler provide optimal versions that are automatically maintained when more member variables are added.`
`455`	`455`
`456`		`-The [original article](https://rmf.io/cxx11/rule-of-zero) provides the background, while a [follow up article](http://www.nirfriedman.com/2015/06/27/cpp-rule-of-zero/) explains techniques for implementing nearly 100% of the time.`
	`456`	`+[This article](http://www.nirfriedman.com/2015/06/27/cpp-rule-of-zero/) provides a background and explains techniques for implementing nearly 100% of the time.`
`457`	`457`