Windows Store branding scrub (#590)

* Eradicate Windows Store where possible

* Remove unused tokens

* Fix link issue

* trivial change

Author: Colin Robertson

docs/build/building-on-the-command-line.md

@@ -72,7 +72,7 @@ Additional command files are available to set up specific build architectures, d
 >   
 > The vcvarsall.bat file also varies from version to version. If the current version of Visual C++ is installed on a computer that also has an earlier version of Visual C++, do not run vcvarsall.bat or another command file from different versions in the same command prompt window.  
  
-The simplest way to specify a particular build architecture in an existing command window is to use the vcvarsall.bat file. You can use vcvarsall.bat to set environment variables to configure the command line for native 32-bit or 64-bit compilation, or for cross-compilation to x86, x64, or ARM processors; to target Windows Store, Universal Windows Platform, or Windows Desktop platforms; to specify which Windows SDK to use; and to specify the platform toolset version. If no arguments are provided, vcvarsall.bat configures the environment variables for using the current 32-bit native compiler for x86 Windows Desktop targets. However, you can use it to configure any of the native or cross compiler tools. If you specify a compiler configuration that is not installed or is not available on your build computer architecture, an error message is displayed. This table shows the supported architecture arguments:  
+The simplest way to specify a particular build architecture in an existing command window is to use the vcvarsall.bat file. You can use vcvarsall.bat to set environment variables to configure the command line for native 32-bit or 64-bit compilation, or for cross-compilation to x86, x64, or ARM processors; to target Microsoft Store, Universal Windows Platform, or Windows Desktop platforms; to specify which Windows SDK to use; and to specify the platform toolset version. If no arguments are provided, vcvarsall.bat configures the environment variables for using the current 32-bit native compiler for x86 Windows Desktop targets. However, you can use it to configure any of the native or cross compiler tools. If you specify a compiler configuration that is not installed or is not available on your build computer architecture, an error message is displayed. This table shows the supported architecture arguments:  
 
 |Vcvarsall.bat architecture argument|Compiler|Host computer architecture|Build output architecture|  
 |----------------------------|--------------|----------------------------------|-------------------------------|  

docs/build/configuring-programs-for-windows-xp.md

@@ -35,7 +35,7 @@ Because Visual Studio supports multiple platform toolsets, you can target operat
 
  These libraries are supported by the platform toolsets installed by Visual Studio, depending on the target:  
 
-|Library|Default platform toolset targeting Windows desktop apps|Default platform toolset targeting [!INCLUDE[win8_appname_long](../build/includes/win8_appname_long_md.md)] apps|Windows XP platform toolset targeting [!INCLUDE[winxp](../build/includes/winxp_md.md)], [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)]|  
+|Library|Default platform toolset targeting Windows desktop apps|Default platform toolset targeting UWP apps|Windows XP platform toolset targeting [!INCLUDE[winxp](../build/includes/winxp_md.md)], [!INCLUDE[WinXPSvr](../build/includes/winxpsvr_md.md)]|  
 |-------------|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|  
 |CRT|X|X|X|  
 |C++ Standard Library|X|X|X|  

docs/build/includes/win8_appname_long_md.md

@@ -182,7 +182,7 @@
 ### [/ALIGN (Section Alignment)](align-section-alignment.md)
 ### [/ALLOWBIND (Prevent DLL Binding)](allowbind-prevent-dll-binding.md)
 ### [/ALLOWISOLATION (Manifest Lookup)](allowisolation-manifest-lookup.md)
-### [/APPCONTAINER (Windows Store App)](appcontainer-windows-store-app.md)
+### [/APPCONTAINER (UWP/Microsoft Store App)](appcontainer-windows-store-app.md)
 ### [/ASSEMBLYDEBUG (Add DebuggableAttribute)](assemblydebug-add-debuggableattribute.md)
 ### [/ASSEMBLYLINKRESOURCE (Link to .NET Framework Resource)](assemblylinkresource-link-to-dotnet-framework-resource.md)
 ### [/ASSEMBLYMODULE (Add a MSIL Module to the Assembly)](assemblymodule-add-a-msil-module-to-the-assembly.md)

docs/build/reference/TOC.md

@@ -1,5 +1,5 @@
 ---
-title: "-APPCONTAINER (Windows Store App) | Microsoft Docs"
+title: "/APPCONTAINER (UWP/Microsoft Store App) | Microsoft Docs"
 ms.custom: ""
 ms.date: "11/04/2016"
 ms.reviewer: ""
@@ -15,7 +15,7 @@ ms.author: "corob"
 manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
-# /APPCONTAINER (Windows Store App)
+# /APPCONTAINER (Microsoft Store App)
 Specifies whether the linker creates an executable image that must be run in an app container.  
 
 ## Syntax  
@@ -27,7 +27,7 @@ Specifies whether the linker creates an executable image that must be run in an
 ## Remarks  
  By default, /APPCONTAINER is off.  
 
- This option modifies an executable to indicate whether the app must be run in the appcontainer process-isolation environment. Specify /APPCONTAINER for an app that must run in the appcontainer environment—for example, a [!INCLUDE[win8_appstore_long](../../build/reference/includes/win8_appstore_long_md.md)] app. (The option is set automatically in Visual Studio when you create a [!INCLUDE[win8_appstore_long](../../build/reference/includes/win8_appstore_long_md.md)] app from a template.) For a desktop app, specify /APPCONTAINER:NO or just omit the option.  
+ This option modifies an executable to indicate whether the app must be run in the appcontainer process-isolation environment. Specify /APPCONTAINER for an app that must run in the appcontainer environment—for example, a Universal Windows Platform (UWP) or Windows Phone 8.x app. (The option is set automatically in Visual Studio when you create a Universal Windows app from a template.) For a desktop app, specify /APPCONTAINER:NO or just omit the option.  
 
  The /APPCONTAINER option was introduced in [!INCLUDE[win8](../../build/reference/includes/win8_md.md)].  
 

docs/build/reference/appcontainer-windows-store-app.md

@@ -18,15 +18,15 @@ manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # /APPCONTAINER
-Marks an executable that must run in an app container—for example, a [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] or Universal Windows app.  
+Marks an executable that must run in an app container—for example, a Microsoft Store or Universal Windows app.  
 
 ```  
   
 /APPCONTAINER[:NO]  
 ```  
 
 ## Remarks  
- An executable that has the **/APPCONTAINER** option set can only be run in an app container, which is the process-isolation environment introduced in Windows 8. For [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] and Universal Windows apps, this option must be set.  
+ An executable that has the **/APPCONTAINER** option set can only be run in an app container, which is the process-isolation environment introduced in Windows 8. For Microsoft Store and Universal Windows apps, this option must be set.  
 
 ## See Also  
  [EDITBIN Options](../../build/reference/editbin-options.md)   

docs/build/reference/appcontainer.md

@@ -29,7 +29,7 @@ ms.workload: ["cplusplus"]
 ## Remarks  
  By default, an object file can hold up to 65,536 (2^16) addressable sections. This is the case no matter which target platform is specified. **/bigobj** increases that address capacity to 4,294,967,296 (2^32).  
 
- Most modules will never generate an .obj file that contains more than 65,536 sections. However, machine generated code, or code that makes heavy use of template libraries may require .obj files that can hold more sections. **/bigobj** is enabled by default on Windows Store projects because the machine-generated XAML code includes a large number of headers. If you disable this option on a Windows Store app project you are likely to encounter compiler error C1128.  
+ Most modules will never generate an .obj file that contains more than 65,536 sections. However, machine generated code, or code that makes heavy use of template libraries may require .obj files that can hold more sections. **/bigobj** is enabled by default on Universal Windows Platform (UWP) projects because the machine-generated XAML code includes a large number of headers. If you disable this option on a UWP app project you are likely to encounter compiler error C1128.  
 
  Linkers that shipped prior to Visual C++ 2005 cannot read .obj files that were produced with **/bigobj**.  
 

docs/build/reference/bigobj-increase-number-of-sections-in-dot-obj-file.md

@@ -28,7 +28,7 @@ You can use EDITBIN to modify object files, executable files, and dynamic-link l
 |------------|-------------|  
 |[/ALLOWBIND](../../build/reference/allowbind.md)|Specifies whether a DLL can be bound.|  
 |[/ALLOWISOLATION](../../build/reference/allowisolation.md)|Specifies DLL or executable file manifest lookup behavior.|  
-|[/APPCONTAINER](../../build/reference/appcontainer.md)|Specifies whether the app must run within an AppContainer—for example, a [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] app.|  
+|[/APPCONTAINER](../../build/reference/appcontainer.md)|Specifies whether the app must run within an AppContainer—for example, a UWP app.|  
 |[/BIND](../../build/reference/bind.md)|Sets the addresses for the entry points in the specified objects to speed load time.|  
 |[/DYNAMICBASE](../../build/reference/dynamicbase.md)|Specifies whether the DLL or executable image can be randomly rebased at load-time by using address space layout randomization (ASLR).|  
 |[/ERRORREPORT](../../build/reference/errorreport-editbin-exe.md)|Reports internal errors to Microsoft.|  

docs/build/reference/editbin-options.md

@@ -32,7 +32,7 @@ Specifies the execution environment that's required by the executable image.
  You can specify any of the following subsystems:  
 
  BOOT_APPLICATION  
- An application that runs in the Windows boot environment. For more information about boot applications, see[About the BCD WMI Provider](http://msdn.microsoft.com/library/aa362639.aspx).  
+ An application that runs in the Windows boot environment. For more information about boot applications, see [About the BCD WMI Provider](http://msdn.microsoft.com/library/aa362639.aspx).  
 
  CONSOLE  
  A Windows character-mode application. The operating system provides a console for console applications.  
@@ -47,7 +47,7 @@ Specifies the execution environment that's required by the executable image.
  An app that runs in the POSIX subsystem in Windows.  
 
  WINDOWS  
- An app that runs in the Windows graphical environment. This includes both desktop apps and Windows Store apps.  
+ An app that runs in the Windows graphical environment. This includes both desktop apps and Universal Windows Platform (UWP) apps.  
 
  WINDOWSCE  
  The WINDOWSCE subsystem indicates that the app is intended to run on a device that has a version of the Windows CE kernel. Versions of the kernel include PocketPC, Windows Mobile, Windows Phone 7, Windows CE V1.0-6.0R3, and Windows Embedded Compact 7.  

docs/build/reference/includes/win8_appstore_long_md.md

@@ -25,7 +25,7 @@ Enables generation of a Windows Runtime Metadata (.winmd) file.
 
 ## Remarks  
  /WINMD  
- The default setting for [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] apps. The linker generates both the binary executable file and the .winmd metadata file.  
+ The default setting for Universal Windows Platform apps. The linker generates both the binary executable file and the .winmd metadata file.  
 
  /WINMD:NO  
  The linker generates only the binary executable file, but not a .winmd file.  

docs/build/reference/subsystem.md

@@ -18,7 +18,7 @@ manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # /ZW (Windows Runtime Compilation)
-Compiles source code to support [!INCLUDE[cppwrt](../../build/reference/includes/cppwrt_md.md)] ([!INCLUDE[cppwrt_short](../../build/reference/includes/cppwrt_short_md.md)]) for the creation of [!INCLUDE[win8_appname_long](../../build/includes/win8_appname_long_md.md)] apps.  
+Compiles source code to support [!INCLUDE[cppwrt](../../build/reference/includes/cppwrt_md.md)] ([!INCLUDE[cppwrt_short](../../build/reference/includes/cppwrt_short_md.md)]) for the creation of Universal Windows Platform (UWP) apps.  
 
  When you use **/ZW** to compile, always specify **/EHsc** as well.  
 

docs/build/reference/winmd-generate-windows-metadata.md

@@ -16,12 +16,12 @@ manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Walkthrough: Compiling a C++/CX Program on the Command Line
-You can create Visual C++ programs that target the Windows Runtime and build them on the command line. Visual C++ supports Visual C++ component extensions (C++/CX), which has additional types and operators to target the Windows Runtime programming model. You can use C++/CX to build apps for Windows Phone 8.1, Windows Store, and Windows desktop. For more information, see [A Tour of C++/CX](http://msdn.microsoft.com/magazine/dn166929.aspx) and [Component Extensions for Runtime Platforms](../windows/component-extensions-for-runtime-platforms.md).  
+You can create Visual C++ programs that target the Windows Runtime and build them on the command line. Visual C++ supports Visual C++ component extensions (C++/CX), which has additional types and operators to target the Windows Runtime programming model. You can use C++/CX to build apps for Universal Windows Platform (UWP), Windows Phone 8.1, and Windows desktop. For more information, see [A Tour of C++/CX](http://msdn.microsoft.com/magazine/dn166929.aspx) and [Component Extensions for Runtime Platforms](../windows/component-extensions-for-runtime-platforms.md).  
 
  In this walkthrough, you use a text editor to create a basic C++/CX program, and then compile it on the command line. (You can use your own C++/CX program instead of typing the one that's shown, or you can use a C++/CX code sample from another help article. This technique is useful for building and testing small modules that contain no UI elements.)  
 
 > [!NOTE]
->  You can also use the Visual Studio IDE to compile C++/CX programs. Because the IDE includes design, debugging, emulation, and deployment support that isn't available on the command line, we recommend that you use the IDE to build Windows Store apps. For more information, see [Create a basic C++ Store app](http://msdn.microsoft.com/library/windows/apps/dn263168).  
+>  You can also use the Visual Studio IDE to compile C++/CX programs. Because the IDE includes design, debugging, emulation, and deployment support that isn't available on the command line, we recommend that you use the IDE to build Universal Windows Platform (UWP) apps. For more information, see [Create a UWP app in C++](/windows/uwp/get-started/create-a-basic-windows-10-app-in-cpp).  
   
 ## Prerequisites  
  You must understand the fundamentals of the C++ language.  

docs/build/reference/zw-windows-runtime-compilation.md

@@ -17,7 +17,7 @@ manager: "ghogen"
 ms.workload: ["cplusplus"]
 ---
 # Walkthrough: Compiling a Native C++ Program on the Command Line
-Visual C++ includes a command-line C++ compiler that you can use to create everything from basic console apps to Universal Windows apps, Windows Store apps, and .NET components.  
+Visual C++ includes a command-line C++ compiler that you can use to create everything from basic console apps to Universal Windows Platform apps, Desktop apps, device drivers, and .NET components.  
 
  In this walkthrough, you create a basic, "Hello, World"-style C++ program by using a text editor, and then compile it on the command line. If you'd like to try the Visual Studio IDE instead of using the command line, see [Walkthrough: Working with Projects and Solutions (C++)](../ide/walkthrough-working-with-projects-and-solutions-cpp.md) or [Using the Visual Studio IDE for C++ Desktop Development](../ide/using-the-visual-studio-ide-for-cpp-desktop-development.md).  
 

docs/build/walkthrough-compiling-a-cpp-cx-program-on-the-command-line.md

@@ -1,7 +1,7 @@
 # [C Run-Time Library Reference](c-run-time-library-reference.md)
 # [CRT Library Features](crt-library-features.md)
 ## [Compatibility](compatibility.md)
-### [Windows Store Apps, the Windows Runtime, and the C Run-Time](windows-store-apps-the-windows-runtime-and-the-c-run-time.md)
+### [UWP Apps, the Windows Runtime, and the C Run-Time](windows-store-apps-the-windows-runtime-and-the-c-run-time.md)
 ### [ANSI C Compliance](ansi-c-compliance.md)
 ### [UNIX](unix.md)
 ### [Windows Platforms (CRT)](windows-platforms-crt.md)

docs/build/walkthrough-compiling-a-native-cpp-program-on-the-command-line.md

@@ -27,7 +27,7 @@ Gets a character string from the console. More secure versions of these function
 >  These functions are obsolete. Beginning in Visual Studio 2015, they are not available in the CRT. The secure versions of these functions,  _cgets_s and _cgetws_s, are still available. For information on these alternative functions, see [_cgets_s, _cgetws_s](../c-runtime-library/reference/cgets-s-cgetws-s.md).  
   
 > [!IMPORTANT]
->  This API cannot be used in applications that execute in the Windows Runtime. For more information, see [CRT functions not supported with /ZW](http://msdn.microsoft.com/library/windows/apps/jj606124.aspx).  
+>  This API cannot be used in applications that execute in the Windows Runtime. For more information, see [CRT functions not supported in Universal Windows Platform apps](../cppcx/crt-functions-not-supported-in-universal-windows-platform-apps.md).  
   
 ## Syntax  
 

docs/c-runtime-library/TOC.md

@@ -32,7 +32,7 @@ The Universal C Run-Time Library (UCRT) supports most of the C standard library
 
 |Title|Description|  
 |-----------|-----------------|  
-|[Windows Store Apps, the Windows Runtime, and the C Run-Time](../c-runtime-library/windows-store-apps-the-windows-runtime-and-the-c-run-time.md)|Describes when UCRT routines are not compatible with Universal Windows apps or Windows Store apps.|  
+|[UWP Apps, the Windows Runtime, and the C Run-Time](../c-runtime-library/windows-store-apps-the-windows-runtime-and-the-c-run-time.md)|Describes when UCRT routines are not compatible with Universal Windows apps or Microsoft Store apps.|  
 |[ANSI C Compliance](../c-runtime-library/ansi-c-compliance.md)|Describes standard-compliant naming in the UCRT.|  
 |[UNIX](../c-runtime-library/unix.md)|Provides guidelines for porting programs to UNIX.|  
 |[Windows Platforms (CRT)](../c-runtime-library/windows-platforms-crt.md)|Lists the operating systems that are the CRT supports.|  

docs/c-runtime-library/cgets-cgetws.md

@@ -21,7 +21,7 @@ ms.workload: ["cplusplus"]
 The `_environ` variable is a pointer to an array of pointers to the multibyte-character strings that constitute the process environment. This global variable has been deprecated for the more secure functional versions [getenv_s, _wgetenv_s](../c-runtime-library/reference/getenv-s-wgetenv-s.md) and [_putenv_s, _wputenv_s](../c-runtime-library/reference/putenv-s-wputenv-s.md), which should be used in place of the global variable. `_environ` is declared in Stdlib.h.  
 
 > [!IMPORTANT]
->  This API cannot be used in applications that execute in the Windows Runtime. For more information, see [CRT functions not supported with /ZW](http://msdn.microsoft.com/library/windows/apps/jj606124.aspx).  
+>  This API cannot be used in applications that execute in the Windows Runtime. For more information, see [CRT functions not supported in Universal Windows Platform apps](../cppcx/crt-functions-not-supported-in-universal-windows-platform-apps.md).  
   
 ## Syntax  
 

docs/c-runtime-library/compatibility.md

@@ -27,7 +27,7 @@ Gets a line from the `stdin` stream. More secure versions of these functions are
 >  These functions are obsolete. Beginning in Visual Studio 2015, they are not available in the CRT. The secure versions of these functions,  gets_s and _getws_s, are still available. For information on these alternative functions, see [gets_s, _getws_s](../c-runtime-library/reference/gets-s-getws-s.md).  
   
 > [!IMPORTANT]
->  This API cannot be used in applications that execute in the Windows Runtime. For more information, see [CRT functions not supported with /ZW](http://msdn.microsoft.com/library/windows/apps/jj606124.aspx).  
+>  This API cannot be used in applications that execute in the Windows Runtime. For more information, see [CRT functions not supported in Universal Windows Platform apps](../cppcx/crt-functions-not-supported-in-universal-windows-platform-apps.md).  
   
 ## Syntax