Merge branch 'MicrosoftDocs:master' into update

Author: thispsj

.openpublishing.redirection.json

@@ -665,6 +665,11 @@
       "redirect_url": "/cpp/build/reference/search-paths-in-rules",
       "redirect_document_id": false
     },
+    {
+      "source_path": "docs/build/setting-the-path-and-environment-variables-for-command-line-builds.md",
+      "redirect_url": "/cpp/build/building-on-the-command-line",
+      "redirect_document_id": false
+    },
     {
       "source_path": "docs/build/special-characters-in-a-makefile.md",
       "redirect_url": "/cpp/build/reference/special-characters-in-a-makefile",

docs/atl/active-template-library-atl-concepts.md

@@ -28,7 +28,7 @@ Describes the implementation and creation of collections and enumerators in ATL.
 [Composite Control Fundamentals](atl-composite-control-fundamentals.md)<br/>
 Provides step-by-step instructions for creating a composite control. A composite control is a type of ActiveX control that can contain other ActiveX controls or Windows controls.
 
-[ATL Control Containment FAQ](atl-control-containment-faq.md)<br/>
+[ATL Control Containment FAQ](atl-control-containment-faq.yml)<br/>
 Covers the fundamental questions related to hosting controls with ATL.
 
 [ATL COM Property Pages](atl-com-property-pages.md)<br/>