Diagram relation of WebView2 control, SDK, & Runtime

microsoft-edge/toc.yml

@@ -1107,6 +1107,14 @@
           href: webview2/concepts/overview-features-apis.md
           displayName:
 
+        - name: Architecture of the WebView2 platform
+          href: webview2/concepts/platform-architecture.md
+          displayName:
+
+        - name: Differences between Microsoft Edge and WebView2
+          href: webview2/concepts/browser-features.md
+          displayName: 
+
 # -----------------------------------------------------------------------------
 # machine setup
         - name: Set up your Dev environment for WebView2
@@ -1151,19 +1159,19 @@
 
             - name: Win32 sample app
               href: webview2/samples/webview2apissample.md
-              displayName: WebView2APISample, SampleApps, Win32 sample app # repo dir names, top-of-page title
+              displayName: WebView2APISample, SampleApps  # repo dir names
 
             - 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
+              displayName: WebView2SampleWinComp  # repo dir name
 
             - name: Win32 sample WebView2Browser
               href: webview2/samples/webview2browser.md
               displayName: WebView2Browser  # repo dir name
 
             - name: WinUI 2 (UWP) sample app
               href: webview2/samples/webview2_sample_uwp.md
-              displayName: webview2_sample_uwp, WinUI 2 (UWP) sample app  # repo dir name, top-of-page title
+              displayName: webview2_sample_uwp  # repo dir name
 
 # pending, July 26 2022
 #            - name: WinUI 3 sample app
@@ -1172,18 +1180,17 @@
 
             - name: WPF sample app
               href: webview2/samples/webview2wpfbrowser.md
-              displayName: WebView2WpfBrowser, WPF sample app  # repo dir name, top-of-page title
+              displayName: WebView2WpfBrowser  # repo dir name
 
             - name: WPF sample app with CDP
               href: webview2/samples/wv2cdpextensionwpfsample.md
-              displayName: WV2CDPExtensionWPFSample, WPF sample app with CDP  # repo dir name, top-of-page title
+              displayName: WV2CDPExtensionWPFSample, WPF sample app with CDP extension  # repo dir name, top-of-page title
 
             - name: WinForms sample app
               href: webview2/samples/webview2windowsformsbrowser.md
               displayName: WebView2WindowsFormsBrowser, WinForms sample app  # repo dir name, top-of-page title
 
 # -----------------------------------------------------------------------------
-# Deployment samples
         - name: Deployment samples
           items:
             - name: Deployment samples
@@ -1203,54 +1210,29 @@
               displayName: WV2DeploymentWiXCustomActionSample  # repo dir name
 
 # -----------------------------------------------------------------------------
-        - name: Fundamentals
-          items:
-            - name: Differences between Microsoft Edge and WebView2
-              href: webview2/concepts/browser-features.md
-              displayName: 
-
-            - name: "Main classes for WebView2: Environment, Controller, and Core"
-              href: webview2/concepts/environment-controller-core.md
-              displayName: 
+        - name: "Main classes for WebView2: Environment, Controller, and Core"
+          href: webview2/concepts/environment-controller-core.md
+          displayName: 
 
-            - name: Navigation events
-              href: webview2/concepts/navigation-events.md
-              displayName: Navigation events for WebView2 apps  # top-of-page title
+        - name: Navigation events
+          href: webview2/concepts/navigation-events.md
+          displayName: Navigation events for WebView2 apps  # top-of-page title
 
-            - name: Basic authentication
-              href: webview2/concepts/basic-authentication.md
-              displayName: auth, Basic authentication for WebView2 apps  # top-of-page title
+        - name: Basic authentication
+          href: webview2/concepts/basic-authentication.md
+          displayName: auth, Basic authentication for WebView2 apps  # top-of-page title
 
-            - name: Windowed vs. visual hosting of WebView2
-              href: webview2/concepts/windowed-vs-visual-hosting.md
-              displayName: 
+        - name: Windowed vs. visual hosting of WebView2
+          href: webview2/concepts/windowed-vs-visual-hosting.md
+          displayName: 
 
+# -----------------------------------------------------------------------------
+        - name: Customization and UI
+          items:
             - name: Custom management of network requests
               href: webview2/how-to/webresourcerequested.md
               displayName: WebResourceRequested, WebResourceResponseReceived
 
-            - name: Web and native interop
-              items:
-                - name: Interop of native-side and web-side code
-                  href: webview2/how-to/communicate-btwn-web-native.md
-                  displayName: JavaScript interop, Embed web content into native applications (JavaScript interop)  # old title
-
-                - name: Call web-side code from native-side code
-                  href: webview2/how-to/javascript.md
-                  displayName: ExecuteScriptAsync API, Use JavaScript in WebView for extended scenarios  # old title
-
-                - name: Call native-side code from web-side code
-                  href: webview2/how-to/hostobject.md
-                  displayName: AddHostObjectToScript, host objects
-
-                - name: Call native-side WinRT code from web-side code
-                  href: webview2/how-to/winrt-from-js.md
-                  displayName: AddHostObjectToScript, host objects
-
-                - name: How WinRT types and members are represented in JavaScript
-                  href: webview2/how-to/winrt-js-conversion.md
-                  displayName: 
-
             - name: Using frames
               href: webview2/concepts/frames.md
               displayName: Using frames in WebView2 apps, iframe # full title
@@ -1259,10 +1241,53 @@
               href: webview2/how-to/print.md
               displayName: Printing from WebView2 apps # full title
 
-            # updated h2: Experimental APIs, added a 2nd, new h3:
-            - name: Understand the different WebView2 SDK versions
+            - name: Working with local content in WebView2 apps
+              href: webview2/concepts/working-with-local-content.md
+              displayName: 
+
+            # - name: Customize the UI   # not needed?  flatten
+            #   items:
+            #     - name: Customize the UI of WebView2 apps
+            #       href: webview2/how-to/customize-ui.md
+            #       displayName: context menu, right-click menu
+
+            - name: Customize context menus
+              href: webview2/how-to/context-menus.md
+              displayName: right-click menu, Customize context menus in WebView2  # top-of-page title
+
+# -----------------------------------------------------------------------------
+        - name: Web and native interop
+          items:
+            - name: Interop of native-side and web-side code
+              href: webview2/how-to/communicate-btwn-web-native.md
+              displayName: JavaScript interop, Embed web content into native applications (JavaScript interop)  # old title
+
+            - name: Call web-side code from native-side code
+              href: webview2/how-to/javascript.md
+              displayName: ExecuteScriptAsync API, Use JavaScript in WebView for extended scenarios  # old title
+
+            - name: Call native-side code from web-side code
+              href: webview2/how-to/hostobject.md
+              displayName: AddHostObjectToScript, host objects
+
+            - name: Call native-side WinRT code from web-side code
+              href: webview2/how-to/winrt-from-js.md
+              displayName: AddHostObjectToScript, host objects
+
+            - name: How WinRT types and members are represented in JavaScript
+              href: webview2/how-to/winrt-js-conversion.md
+              displayName: 
+
+# -----------------------------------------------------------------------------
+        - name: Distribution and SDK versions
+          items:
+            - name: Deployment and distribution  # firstchild landing page
+              href: webview2/concepts/deployment-distribution.md
+              displayName: Manage WebView2 applications  # old title
+
+            - name: Prerelease and release SDKs for WebView2
               href: webview2/concepts/versioning.md
-              displayName: Understand WebView2 SDK versions  # old title
+              displayName: experimental APIs, Understand the different WebView2 SDK versions  # old title
 
             # update needed?
             - name: Test upcoming APIs and features
@@ -1273,13 +1298,37 @@
               href: webview2/concepts/distribution.md
               displayName: 
 
-            - name: Working with local content in WebView2 apps
-              href: webview2/concepts/working-with-local-content.md
-              displayName: 
+            - name: Enterprise management of WebView2 Runtimes
+              href: webview2/concepts/enterprise.md
+              displayName: Manage WebView2 applications  # old title
+
+            - name: Distribute an app as a single executable file
+              href: webview2/how-to/static.md
+              displayName: Statically link the WebView2 loader library, single-file app  # old title
+
+            - name: Publish a UWP WebView2 app to the Microsoft Store
+              href: webview2/how-to/publish-uwp-app-store.md
+              displayName: Partner Center, Microsoft Store
 
 # -----------------------------------------------------------------------------
-        - name: Debug WebView2 apps
-          items: 
+        - name: Testing and best practices
+          items:
+            - name: Development best practices
+              href: webview2/concepts/developer-guide.md
+              displayName: Development best practices for WebView2 apps  # top-of-page title
+
+            - name: Develop secure WebView2 apps
+              href: webview2/concepts/security.md
+              displayName: 
+
+            - name: Use the Chrome DevTools Protocol
+              href: webview2/how-to/chromium-devtools-protocol.md
+              displayName: Use the Chrome DevTools Protocol in WebView2  # old title
+
+            - name: Automate and test with Microsoft Edge WebDriver
+              href: webview2/how-to/webdriver.md
+              displayName: Automate and test WebView2 apps with Microsoft Edge WebDriver  # top-of-page title
+
             - name: Debug WebView2 apps
               href: webview2/how-to/debug.md
               displayName: 
@@ -1332,53 +1381,6 @@
               displayName: 
 
 # -----------------------------------------------------------------------------
-        - name: Advanced Topics and Best Practices
-          items:
-            - name: Development best practices
-              href: webview2/concepts/developer-guide.md
-              displayName: Development best practices for WebView2 apps  # top-of-page title
-
-            - name: Develop secure WebView2 apps
-              href: webview2/concepts/security.md
-              displayName: 
-
-            # - name: Customize the UI   # not needed?  flatten
-            #   items:
-            #     - name: Customize the UI of WebView2 apps
-            #       href: webview2/how-to/customize-ui.md
-            #       displayName: context menu, right-click menu
-
-            - name: Customize context menus
-              href: webview2/how-to/context-menus.md
-              displayName: right-click menu, Customize context menus in WebView2  # top-of-page title
-
-            - name: Use the Chrome DevTools Protocol
-              href: webview2/how-to/chromium-devtools-protocol.md
-              displayName: Use the Chrome DevTools Protocol in WebView2  # old title
-
-            - name: Automate and test with Microsoft Edge WebDriver
-              href: webview2/how-to/webdriver.md
-              displayName: Automate and test WebView2 apps with Microsoft Edge WebDriver  # top-of-page title
-
-# -----------------------------------------------------------------------------
-        - name: Deployment and distribution
-          items:
-            - name: Deployment and distribution  # new firstchild page
-              href: webview2/concepts/deployment-distribution.md
-              displayName: Manage WebView2 applications  # old title
-
-            - name: Enterprise management of WebView2 Runtimes
-              href: webview2/concepts/enterprise.md
-              displayName: Manage WebView2 applications  # old title
-
-            - name: Distribute an app as a single executable file
-              href: webview2/how-to/static.md
-              displayName: Statically link the WebView2 loader library, single-file app  # old title
-
-            - name: Publish a UWP WebView2 app to the Microsoft Store
-              href: webview2/how-to/publish-uwp-app-store.md
-              displayName: Partner Center, Microsoft Store
-
         - name: Release Notes for the WebView2 SDK
           href: webview2/release-notes.md
           displayName: what's new, announcements

microsoft-edge/webview2/code-samples-links.md

@@ -8,7 +8,10 @@ ms.prod: microsoft-edge
 ms.technology: webview
 ms.date: 08/29/2022
 ---
-# Sample apps
+# WebView2 Sample apps
+
+This page is specifically about the code-rich platform sample apps within the Samples repo.  For the finished Getting Started article projects (minimal code) which are also at the Samples repo, see [Getting Started tutorials](./get-started/get-started.md).
+
 
 Sample apps that use WebView2 are available in the [WebView2Samples repo](https://github.com/MicrosoftEdge/WebView2Samples/tree/main/SampleApps), for various frameworks or platforms.
 

microsoft-edge/webview2/concepts/basic-authentication.md

@@ -111,7 +111,7 @@ For more realistic code, see the subsequent section.
 
 <!-- ------------------------------ -->
 
-# [C#](#tab/csharp)
+##### [C#](#tab/csharp)
 
 ```csharp
 // Prerequisite: Before using this code, make sure you read the section "Use HTTPS 
@@ -132,7 +132,7 @@ For more realistic code, see the subsequent section.
 
 <!-- ------------------------------ -->
 
-# [C++](#tab/cpp)
+##### [C++](#tab/cpp)
 
 ```cpp
 // Prerequisite: Before using this code, make sure you read the section "Use HTTPS 
@@ -186,7 +186,7 @@ This example builds upon the above sample, by adding the following features:
 
 <!-- ------------------------------ -->
 
-# [C#](#tab/csharp)
+##### [C#](#tab/csharp)
 
 ```csharp
 // Prerequisite: Before using this code, make sure you read the section "Use HTTPS 
@@ -263,7 +263,7 @@ webView.CoreWebView2.BasicAuthenticationRequested += delegate (
 
 <!-- ------------------------------ -->
 
-# [C++](#tab/cpp)
+##### [C++](#tab/cpp)
 
 ```cpp
 // Prerequisite: Before using this code, make sure you read the section "Use HTTPS 
@@ -394,7 +394,8 @@ As a part of navigation, the WebView2 control renders the corresponding page (th
 For more information, see [Navigation events for WebView2 apps](navigation-events.md).
 
 
-### Navigations for basic authentication
+<!-- ------------------------------ -->
+#### Navigations for basic authentication
 
 There are two kinds of navigations in the flow:
 *  A "server requested authentication" navigation.
@@ -422,15 +423,15 @@ Navigation `event args` has a property: the `NavigationId`.  The `NavigationId`
 
 <!-- ------------------------------ -->
 
-# [C#](#tab/csharp)
+##### [C#](#tab/csharp)
 
 * [CoreWebView2BasicAuthenticationRequestedEventArgs Class](/dotnet/api/microsoft.web.webview2.core.corewebview2basicauthenticationrequestedeventargs)
 * [CoreWebView2.BasicAuthenticationRequested Event](/dotnet/api/microsoft.web.webview2.core.corewebview2.basicauthenticationrequested)
 * [CoreWebView2Deferral Class](/dotnet/api/microsoft.web.webview2.core.corewebview2deferral)
 
 <!-- ------------------------------ -->
 
-# [C++](#tab/cpp)
+##### [C++](#tab/cpp)
 
 * [ICoreWebView2BasicAuthenticationRequestedEventArgs interface](/microsoft-edge/webview2/reference/win32/icorewebview2basicauthenticationrequestedeventargs)
 * [add_BasicAuthenticationRequested method](/microsoft-edge/webview2/reference/win32/icorewebview2_10#add_basicauthenticationrequested)