Merge branch 'forked-m' into user/v-mhoffman/readmes-content

captainbrosset · captainbrosset · commit c1b2aac053c7 · 2022-09-15T09:15:13.000+02:00
diff --git a/microsoft-edge/toc.yml b/microsoft-edge/toc.yml
@@ -1025,15 +1025,15 @@
               href: webview2/code-samples-links.md
               displayName: 
 
-            - name: Win32 sample app (WebView2APISample)
+            - name: Win32 sample app
               href: webview2/samples/webview2apissample.md
               displayName: WebView2APISample, SampleApps, Win32 sample app # repo dir names, top-of-page title
 
             - name: Win32 sample app with Visual Composition
               href: webview2/samples/webview2samplewincomp.md
               displayName: WebView2SampleWinComp, Win32 sample app with Visual Composition  # repo dir name, top-of-page title
 
-            - name: WebView2Browser (Win32 C++/JS)
+            - name: Win32 sample WebView2Browser
               href: webview2/samples/webview2browser.md
               displayName: WebView2Browser  # repo dir name
 
diff --git a/microsoft-edge/webview2/code-samples-links.md b/microsoft-edge/webview2/code-samples-links.md
@@ -14,7 +14,7 @@ Sample apps that use WebView2 are available in the [WebView2Samples repo](https:
 
 | Article | Sample | Notes |
 |---|---|---|
-| [Win32 sample app (WebView2APISample)](samples/webview2apissample.md) | [WebView2APISample](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WebView2APISample) | Main sample; extensive. |
+| [Win32 sample app](samples/webview2apissample.md) | [WebView2APISample](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WebView2APISample) | Main sample; extensive. |
 | [Win32 sample app with Visual Composition](samples/webview2samplewincomp.md) | [WebView2SampleWinComp](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WebView2SampleWinComp) | Windows Runtime Composition APIs leverage the Windows UI in Win32 app. |
 | [WebView2Browser (Win32 C++/JS)](samples/webview2browser.md) | [WebView2Browser repo](https://github.com/MicrosoftEdge/WebView2Browser) | Uses multiple WebView2 instances.  A major sample; has its own repo. |
 | [WinUI 2 (UWP) sample app](samples/webview2_sample_uwp.md) | [webview2_sample_uwp](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/webview2_sample_uwp) | &nbsp; |
diff --git a/microsoft-edge/webview2/get-started/win32.md b/microsoft-edge/webview2/get-started/win32.md
@@ -35,7 +35,7 @@ The completed tutorial project is available in the **WebView2Samples** repo:
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install Visual Studio
+## Step 1 - Install Visual Studio
 
 This tutorial requires Microsoft Visual Studio, not Microsoft Visual Studio Code.
 
@@ -45,7 +45,7 @@ Then return to this page and continue below.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 2 - Install a preview channel of Microsoft Edge
 
 1. If it's not installed already, install a preview channel of Microsoft Edge.  To do that, in a new window or tab, see [Install a preview channel of Microsoft Edge](../how-to/machine-setup.md#install-a-preview-channel-of-microsoft-edge) in _Set up your Dev environment for WebView2_.
 
diff --git a/microsoft-edge/webview2/how-to/hostobject.md b/microsoft-edge/webview2/how-to/hostobject.md
@@ -39,7 +39,7 @@ Scenarios that may benefit from using host objects in script:
 
   * JavaScript is sandboxed, limiting its ability on the native side. For example, if you need to access a file on the native side, you must use the native file system. If you have a native object exposed to JavaScript via `AddHostObjectToScript`, you can use it to manipulate files on the native file system.
 
-This article uses the [Win32 sample app (WebView2APISample)](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WebView2APISample) to demonstrate some practical applications of `AddHostObjectToScript`. For more information about how to embed web content into native applications, see [Embed web content into native applications](/microsoft-edge/webview2/how-to/communicate-btwn-web-native).
+This article uses the [Win32 sample app](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WebView2APISample) to demonstrate some practical applications of `AddHostObjectToScript`. For more information about how to embed web content into native applications, see [Embed web content into native applications](/microsoft-edge/webview2/how-to/communicate-btwn-web-native).
 
 
 #### Preview of the major steps in this article
diff --git a/microsoft-edge/webview2/how-to/machine-setup.md b/microsoft-edge/webview2/how-to/machine-setup.md
@@ -20,7 +20,7 @@ This article covers general-purpose setup of your development environment for We
 
    The WebView2 samples are designed for Microsoft **Visual Studio**, not Microsoft **Visual Studio Code**.
 
-   If you are installing Visual Studio, you can accept the defaults for now; you can click **Install**, and decline installing the Workloads at this time.  Visual Studio will prompt you later, when you open a particular `.sln` file, to install the platform-appropriate workloads.
+   If you are installing Visual Studio, you can accept the defaults for now; you can click **Install**, and then decline installing the Workloads at this time.  Visual Studio will prompt you later, when you open a particular `.sln` file, to install the platform-appropriate workloads.
 
 
 <!-- ====================================================================== -->
diff --git a/microsoft-edge/webview2/how-to/webresourcerequested.md b/microsoft-edge/webview2/how-to/webresourcerequested.md
@@ -296,7 +296,7 @@ The `NavigateWithWebResourceRequest` method allows your host app to navigate the
 <!-- ====================================================================== -->
 ### Example: Constructing a custom request and navigating using that request
 
-<!-- This is an existing example in the Win32 sample app (WebView2APISample). -->
+<!-- This is an existing example in the Win32 sample app. -->
 
 <!-- CreateWebResourceRequest and NavigateWithWebResourceRequest -->
 
diff --git a/microsoft-edge/webview2/samples/webview2_sample_uwp.md b/microsoft-edge/webview2/samples/webview2_sample_uwp.md
@@ -31,15 +31,15 @@ See also [README file for webview2_sample_uwp](https://github.com/MicrosoftEdge/
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install Visual Studio
+## Step 1 - Install Visual Studio
 
 Microsoft Visual Studio is required.  Microsoft Visual Studio Code is not supported for this sample.
 
 1. If Visual Studio (minimum required version) is not already installed, in a separate window or tab, see [Install Visual Studio](../how-to/machine-setup.md#install-visual-studio) in _Set up your Dev environment for WebView2_.  Follow the steps in that section, and then return to this page and continue the steps below.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 2 - Install a preview channel of Microsoft Edge
 
 1. If a preview channel of Microsoft Edge (Beta, Dev, or Canary) is not already installed, in a separate window or tab, see [Install a preview channel of Microsoft Edge](../how-to/machine-setup.md#install-a-preview-channel-of-microsoft-edge) in _Set up your Dev environment for WebView2_.  Follow the steps in that section, and then return to this page and continue the steps below.
 
diff --git a/microsoft-edge/webview2/samples/webview2apissample.md b/microsoft-edge/webview2/samples/webview2apissample.md
@@ -1,5 +1,5 @@
 ---
-title: Win32 sample app (WebView2APISample)
+title: Win32 sample app
 description: This WebView2 sample demonstrates how to use the WebView2 control and WebView2 APIs to add features to a Win32 C++ app.
 author: MSEdgeTeam
 ms.author: msedgedevrel
@@ -8,7 +8,7 @@ ms.prod: microsoft-edge
 ms.technology: webview
 ms.date: 07/29/2022
 ---
-# Win32 sample app (WebView2APISample)
+# Win32 sample app
 
 This sample, **WebView2APISample**, demonstrates how to use the WebView2 control and WebView2 APIs to add features to a Win32 C++ app.
 
@@ -42,15 +42,15 @@ For details of events and API handlers in WebView2, see [WebView2 API Reference]
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 1 - Install a preview channel of Microsoft Edge
 
 Next, make sure a preview channel of Microsoft Edge in installed, on a supported OS.  Currently we recommend the latest version of the Canary channel.
 
 1. If a preview channel of Microsoft Edge (Beta, Dev, or Canary) is not already installed, in a separate window or tab, see [Install a preview channel of Microsoft Edge](../how-to/machine-setup.md#install-a-preview-channel-of-microsoft-edge) in _Set up your Dev environment for WebView2_.  Follow the steps in that section, and then return to this page and continue the steps below.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install Visual Studio 2019
+## Step 2 - Install Visual Studio 2019
 
 Microsoft Visual Studio is required.  Microsoft Visual Studio Code is not supported for this sample.  This repo sample is a Visual Studio 2019 project.
 
diff --git a/microsoft-edge/webview2/samples/webview2browser.md b/microsoft-edge/webview2/samples/webview2browser.md
@@ -1,5 +1,5 @@
 ---
-title: WebView2Browser (Win32 C++/JS)
+title: Win32 sample WebView2Browser
 description: "A web browser built with the Microsoft Edge WebView2 control."
 author: MSEdgeTeam
 ms.author: msedgedevrel
@@ -8,9 +8,13 @@ ms.prod: microsoft-edge
 ms.technology: webview
 ms.date: 07/18/2022
 ---
-# WebView2Browser (Win32 C++/JS)
+# Win32 sample WebView2Browser
 
-<!-- copied from https://github.com/MicrosoftEdge/WebView2Browser#readme -->
+<!-- copied from:
+https://github.com/MicrosoftEdge/WebView2Browser#readme
+aka
+https://github.com/MicrosoftEdge/WebView2Browser/blob/main/README.md
+-->
 
 This sample, **WebView2Browser**, is a web browser built with the [Microsoft Edge WebView2](https://aka.ms/webview2) control.
 
diff --git a/microsoft-edge/webview2/samples/webview2samplewincomp.md b/microsoft-edge/webview2/samples/webview2samplewincomp.md
@@ -28,15 +28,15 @@ See also [Readme file for WebView2SampleWinComp](https://github.com/MicrosoftEdg
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 1 - Install a preview channel of Microsoft Edge
 
 We recommend the latest version of the Edge Canary channel.
 
 1. If a preview channel of Microsoft Edge (Beta, Dev, or Canary) is not already installed, in a separate window or tab, see [Install a preview channel of Microsoft Edge](../how-to/machine-setup.md#install-a-preview-channel-of-microsoft-edge) in _Set up your Dev environment for WebView2_.  Follow the steps in that section, and then return to this page and continue the steps below.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install Visual Studio with C++ support
+## Step 2 - Install Visual Studio with C++ support
 
 Microsoft Visual Studio is required.  Microsoft Visual Studio Code is not supported for this sample.
 
diff --git a/microsoft-edge/webview2/samples/webview2wpfbrowser.md b/microsoft-edge/webview2/samples/webview2wpfbrowser.md
@@ -36,13 +36,13 @@ For more information about events and API Handlers in WebView2, see [WebView2 AP
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 1 - Install a preview channel of Microsoft Edge
 
 1. If a preview channel of Microsoft Edge (Beta, Dev, or Canary) is not already installed, in a separate window or tab, see [Install a preview channel of Microsoft Edge](../how-to/machine-setup.md#install-a-preview-channel-of-microsoft-edge) in _Set up your Dev environment for WebView2_.  Follow the steps in that section, and then return to this page and continue the steps below.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install Visual Studio 2019 with .NET support
+## Step 2 - Install Visual Studio 2019 with .NET support
 
 Microsoft Visual Studio is required.  Microsoft Visual Studio Code is not supported for this sample.
 
diff --git a/microsoft-edge/webview2/samples/wv2cdpextensionwpfsample.md b/microsoft-edge/webview2/samples/wv2cdpextensionwpfsample.md
@@ -38,7 +38,7 @@ If this is your first time using WebView2, we recommend first following the [Get
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 1 - Install a preview channel of Microsoft Edge
 
 <!-- readme said "Prerequisites: Microsoft Edge (Chromium) installed on a supported OS. Currently we recommend the latest version of the Edge Canary channel." -->
 
@@ -48,7 +48,7 @@ We recommend the latest version of the Canary channel.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install Visual Studio with .NET support
+## Step 2 - Install Visual Studio with .NET support
 
 <!-- readme said "Prerequisites: Visual Studio with .NET support installed." -->
 Microsoft Visual Studio (with .NET support) is required.  Microsoft Visual Studio Code is not supported for this sample.
diff --git a/microsoft-edge/webview2/samples/wv2deploymentvsinstallersample.md b/microsoft-edge/webview2/samples/wv2deploymentvsinstallersample.md
@@ -18,7 +18,7 @@ This sample, **WV2DeploymentVSInstallerSample**, demonstrates how to deploy a We
 *  Repo directory: [WV2DeploymentVSInstallerSample](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WV2DeploymentVSInstallerSample)
 *  Solution file: not provided in the repo.  You create a solution file in the steps below.
 
-To demonstrate how to deploy the Evergreen WebView2 Runtime with your app, this article describes how to use the [Microsoft Visual Studio Installer Project](https://marketplace.visualstudio.com/items?itemName=visualstudioclient.MicrosoftVisualStudio2017InstallerProjects) extension for Visual Studio.  You create a project of type **Setup Project**, to create an installer for the [Win32 sample app (WebView2APISample)](./webview2apissample.md) (**WebView2APISample**).  That installer that you create chain-installs the Evergreen WebView2 Runtime.
+To demonstrate how to deploy the Evergreen WebView2 Runtime with your app, this article describes how to use the [Microsoft Visual Studio Installer Project](https://marketplace.visualstudio.com/items?itemName=visualstudioclient.MicrosoftVisualStudio2017InstallerProjects) extension for Visual Studio.  You create a project of type **Setup Project**, to create an installer for the [Win32 sample app](./webview2apissample.md) (**WebView2APISample**).  That installer that you create chain-installs the Evergreen WebView2 Runtime.
 
 <!-- todo: screenshot representing the success state -->
 
@@ -33,21 +33,21 @@ For information about these different approaches, see [Deploying the Evergreen W
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Build and run WebView2APISample
+## Step 1 - Build and run WebView2APISample
 
 <!-- todo: is this required before using this sample? -->
 
 To become familiar with the app that this sample distributes, and to make sure your environment is set up for general Win32 WebView2 app development, build and run the Win32 sample app (**WebView2APISample**) before using this deployment sample.
 
-1. Do the steps in [Win32 sample app (WebView2APISample)](./webview2apissample.md) (**WebView2APISample**) and then continue below.
+1. Do the steps in [Win32 sample app](./webview2apissample.md) (**WebView2APISample**) and then continue below.
 
 Prerequisite: As stated in the above page, Microsoft Visual Studio is required, including C++ support.  Microsoft Visual Studio Code is not supported for this **WV2DeploymentVSInstallerSample** sample.
 
 The above page helps you clone or download the WebView2Samples repo, and install Visual Studio with C++ support, if not done yet.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install Visual Studio Installer Projects
+## Step 2 - Install Visual Studio Installer Projects
 
 If not done yet, install Visual Studio Installer Projects:
 
diff --git a/microsoft-edge/webview2/samples/wv2deploymentwixburnbundlesample.md b/microsoft-edge/webview2/samples/wv2deploymentwixburnbundlesample.md
@@ -17,7 +17,7 @@ This sample, **WV2DeploymentWiXBurnBundleSample**, demonstrates how to use a WiX
 *  Repo directory: [WV2DeploymentWiXBurnBundleSample](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WV2DeploymentWiXBurnBundleSample)
 *  Project file: **WV2DeploymentWiXBurnBundleSample.wixproj**
 
-This sample creates a [WiX](https://wixtoolset.org/) installer for the [Win32 sample app (WebView2APISample)](webview2apissample.md).  This sample uses [WiX Burn Bundle](https://wixtoolset.org/documentation/manual/v3/bundle/) to chain-install the Evergreen WebView2 Runtime.
+This sample creates a [WiX](https://wixtoolset.org/) installer for the [Win32 sample app](webview2apissample.md).  This sample uses [WiX Burn Bundle](https://wixtoolset.org/documentation/manual/v3/bundle/) to chain-install the Evergreen WebView2 Runtime.
 
 <!-- todo: screenshot representing the success state -->
 
@@ -31,7 +31,7 @@ For an overview of the approaches, see [Deploying the Evergreen WebView2 Runtime
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install Visual Studio
+## Step 1 - Install Visual Studio
 
 Microsoft Visual Studio is required.  Microsoft Visual Studio Code is not supported for this sample.
 
@@ -43,7 +43,7 @@ Then return to this page and continue the steps below.
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install WiX Toolset build tools
+## Step 2 - Install WiX Toolset build tools
 
 If not done yet, install WiX Toolset:
 
@@ -90,7 +90,7 @@ Also install the WiX Visual Studio component, per the next section.
 
 
 <!-- ====================================================================== -->
-## Step 3 - Prerequisite: Install WiX Toolset Visual Studio Extension
+## Step 3 - Install WiX Toolset Visual Studio Extension
 
 If not done yet, install WiX Toolset Visual Studio 2019 Extension:
 
diff --git a/microsoft-edge/webview2/samples/wv2deploymentwixcustomactionsample.md b/microsoft-edge/webview2/samples/wv2deploymentwixcustomactionsample.md
@@ -27,7 +27,7 @@ This sample demonstrates several different deployment approaches:
 
 
 <!-- ====================================================================== -->
-## Step 1 - Prerequisite: Install Visual Studio 2019 with C++ support
+## Step 1 - Install Visual Studio 2019 with C++ support
 
 <!-- readme says "Prereqs: Visual Studio 2019 with C++ support installed." -->
 
@@ -37,13 +37,13 @@ Microsoft Visual Studio is required.  Microsoft Visual Studio Code is not suppor
 
 
 <!-- ====================================================================== -->
-## Step 2 - Prerequisite: Install a preview channel of Microsoft Edge
+## Step 2 - Install a preview channel of Microsoft Edge
 
 1. **Preview channel of Microsoft Edge** - If a preview channel of Microsoft Edge (Beta, Dev, or Canary) is not already installed, in a separate window or tab, see [Install a preview channel of Microsoft Edge](../how-to/machine-setup.md#install-a-preview-channel-of-microsoft-edge) in _Set up your Dev environment for WebView2_.  Follow the steps in that section, and then return to this page and continue the steps below.
 
 
 <!-- ====================================================================== -->
-## Step 3 - Prerequisite: Install WiX Toolset build tools
+## Step 3 - Install WiX Toolset build tools
 
 If not done yet, install WiX Toolset:
 
@@ -81,7 +81,7 @@ Also install the WiX Visual Studio component, per the next section.
 
 
 <!-- ====================================================================== -->
-## Step 4 - Prerequisite: Install WiX Toolset Visual Studio Extension
+## Step 4 - Install WiX Toolset Visual Studio Extension
 
 If not done yet, install WiX Toolset Visual Studio 2019 Extension:
 
@@ -192,7 +192,7 @@ If you plan to package either the Bootstrapper (Approach 2) or the Standalone In
 <!-- ====================================================================== -->
 ## See also
 
-* [Win32 sample app (WebView2APISample)](./webview2apissample.md)
+* [Win32 sample app](./webview2apissample.md)
 * [Deploying the Evergreen WebView2 Runtime](/microsoft-edge/webview2/concepts/distribution.md#deploying-the-evergreen-webview2-runtime) in _Distribute your app and the WebView2 Runtime_.
 * [Readme for WV2DeploymentWiXCustomActionSample](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps/WV2DeploymentWiXCustomActionSample#readme).
 * [WiX Toolset](https://wixtoolset.org/)
