Merge branch 'MicrosoftDocs:main' into rossgrambo/variant-feature-flags-doc-rewrite

Author: rossgrambo

.openpublishing.redirection.json

@@ -3729,6 +3729,21 @@
       "source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-cli.md",
       "redirect_url": "/azure/virtual-network/tutorial-create-route-table",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-portal.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-powershell.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-cli.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
     }
   ]
 }

articles/active-directory-b2c/age-gating.md

@@ -25,7 +25,7 @@ Age gating in Azure Active Directory B2C (Azure AD B2C) enables you to identify
 >This feature is in public preview. Do not use feature for production applications.
 >
 
-When age gating is enabled for a user flow, users are asked for their date of birth, and country of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
+When age gating is enabled for a user flow, users are asked for their date of birth, and country/region of residence. If a user signs in that hasn't previously entered the information, they'll need to enter it the next time they sign in. The rules are applied every time a user signs in.
 
 ![Screenshot of age gating information gather flow](./media/age-gating/age-gating-information-gathering.png)
 
@@ -69,7 +69,7 @@ After your tenant is set up to use age gating, you can then use this feature in
 1. To test your policy, select **Run user flow**.
 1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
 1. Select the **Run user flow** button.
-1. Sign-in with a local or social account. Then select your country of residence, and date of birth that simulate a minor. 
+1. Sign-in with a local or social account. Then select your country/region of residence, and date of birth that simulate a minor. 
 1. Repeat the test, and select a date of birth that simulates an adult.  
 
 When you sign-in as a minor, you should see the following error message: *Unfortunately, your sign on has been blocked. Privacy and online safety laws in your country prevent access to accounts belonging to children.*

articles/active-directory-b2c/localization-string-ids.md

@@ -318,7 +318,7 @@ The Following are the IDs for a content definition with an ID of `api.phonefacto
 | `error_phone_throttled` | You hit the limit on the number of call attempts. Try again shortly. | `>= 1.2.3` |
 | `error_throttled` | You hit the limit on the number of verification attempts. Try again shortly. | `>= 1.2.3` |
 | `error_incorrect_code` | The verification code you have entered does not match our records. Please try again, or request a new code. | `All` |
-| `countryList` | See [the countries list](#phone-factor-authentication-page-example). | `All` |
+| `countryList` | See [the countries/regions list](#phone-factor-authentication-page-example). | `All` |
 | `error_448` | The phone number you provided is unreachable. | `All` |
 | `error_449` | User has exceeded the number of retry attempts. | `All` |
 | `verification_code_input_placeholder_text` | Verification code | `All` |

articles/active-directory-b2c/sign-in-options.md

@@ -44,7 +44,7 @@ Your local account identity provider includes a Username option that lets users
 
 Phone sign-in is a passwordless option in your local account identity provider settings. This method lets users sign up for your app using a phone number as their primary identifier. One-time passwords are sent to your users via SMS text messages. Users will have the following experience during sign-up and sign-in:
 
-- **Sign-in**: If the user has an existing account with phone number as their identifier, the user enters their phone number and selects *Sign in*. They confirm the country and phone number by selecting *Continue*, and a one-time verification code is sent to their phone. The user enters the verification code and selects *Continue* to sign in.
+- **Sign-in**: If the user has an existing account with phone number as their identifier, the user enters their phone number and selects *Sign in*. They confirm the country/region and phone number by selecting *Continue*, and a one-time verification code is sent to their phone. The user enters the verification code and selects *Continue* to sign in.
 - **Sign-up**: If the user doesn't already have an account for your application, they can create one by clicking on the *Sign up now* link.
     1. A sign-up page appears, where the user selects their *Country*, enters their phone number, and selects *Send Code*. 
     1. A one-time verification code is sent to the user's phone number. The user enters the *Verification Code* on the sign-up page, and then selects *Verify Code*. (If the user can't retrieve the code, they can select *Send New Code*).

articles/api-center/build-register-apis-vscode-extension.md

@@ -28,7 +28,7 @@ The following Visual Studio Code extensions are needed for the specified scenari
 * [GitHub Actions](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-github-actions) - to register APIs using a CI/CD pipeline with GitHub Actions
 * [Azure Pipelines](https://marketplace.visualstudio.com/items?itemName=ms-azure-devops.azure-pipelines) - to register APIs using a CI/CD pipeline with Azure Pipelines
 * [GitHub Copilot](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot) - to generate OpenAPI specification files from API code
-* [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) - to generate OpenAPI specification files using the Azure API Center Plugin for GitHub Copilot for Azure
+* [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) - to generate OpenAPI specification files using the Azure API Center Plugin for [GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction) (preview)
 
 [!INCLUDE [vscode-extension-setup](includes/vscode-extension-setup.md)]  
 
@@ -66,7 +66,7 @@ After generating the OpenAPI specification file and checking for accuracy, you c
 
 ## Generate OpenAPI spec using natural language prompts
 
-The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) helps you design new APIs starting from natural language prompts. With AI assistance, quickly generate an OpenAPI spec for API development that complies with your organization's standards.
+The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) (preview) helps you design new APIs starting from natural language prompts. With AI assistance, quickly generate an OpenAPI spec for API development that complies with your organization's standards.
 
 > [!NOTE]
 > This feature is available in the pre-release version of the API Center extension.
@@ -98,4 +98,5 @@ The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visuals
 * [Discover and consume APIs with the Azure API Center extension for Visual Studio Code](discover-apis-vscode-extension.md)
 * [Govern APIs with the Azure API Center extension for Visual Studio Code](govern-apis-vscode-extension.md)
 * [Enable and view platform API catalog in Visual Studio Code](enable-platform-api-catalog-vscode-extension.md)
+* [Overview of GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction)
 

articles/api-management/TOC.yml

@@ -108,20 +108,26 @@
     items:
     - name: Networking options
       href: virtual-network-concepts.md
-    - name: VNet injection (service) - requirements
-      href: virtual-network-injection-resources.md
-    - name: VNet integration (workspace gateway) - requirements
+    - name: Network isolation - classic tiers
+      items:  
+      - name: Virtual network injection (classic tiers) - requirements
+        href: virtual-network-injection-resources.md
+      - name: Deploy to virtual network - external
+        href: api-management-using-with-vnet.md
+      - name: Deploy to virtual network - internal
+        href: api-management-using-with-internal-vnet.md
+      - name: Integrate Application Gateway in internal virtual network
+        href: api-management-howto-integrate-internal-vnet-appgateway.md
+    - name: Network isolation - v2 tiers
+      items:
+      - name: Virtual network injection (v2 tiers) 
+        href: inject-vnet-v2.md
+      - name: Virtual network integration (v2 tiers)
+        href: integrate-vnet-outbound.md
+    - name: Virtual network integration (workspace gateway) - requirements
       href: virtual-network-workspaces-resources.md
-    - name: Deploy to a VNet - external
-      href: api-management-using-with-vnet.md
-    - name: Deploy to a VNet - internal
-      href: api-management-using-with-internal-vnet.md
-    - name: Integrate Application Gateway in an internal virtual network
-      href: api-management-howto-integrate-internal-vnet-appgateway.md
     - name: Connect privately using private endpoint
       href: private-endpoint.md
-    - name: Integrate with VNet for outbound requests
-      href: integrate-vnet-outbound.md
     - name: Retrieve IP addresses
       href: api-management-howto-ip-addresses.md
     - name: Defend against DDoS attacks
@@ -694,7 +700,7 @@
     - name: Built-in analytics dashboard retirement (March 2027)
       href: breaking-changes/analytics-dashboard-retirement-march-2027.md
   - name: Regional availability
-    href: https://azure.microsoft.com/global-infrastructure/services/
+    href: api-management-region-availability.md
   - name: Microsoft Q&A question page
     href: /answers/tags/29/azure-api-management
   - name: Stack Overflow

articles/api-management/api-management-capacity.md

@@ -6,14 +6,14 @@ author: dlepow
 
 ms.service: azure-api-management
 ms.topic: how-to
-ms.date: 08/26/2024
+ms.date: 10/01/2024
 ms.author: danlep
 ms.custom: fasttrack-edit
 ---
 
 # Capacity of an Azure API Management instance
 
-[!INCLUDE [api-management-availability-premium-dev-standard-basic-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-standardv2-basicv2.md)]
+[!INCLUDE [api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2](../../includes/api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2.md)]
 
 API Management provides [Azure Monitor metrics](api-management-howto-use-azure-monitor.md#view-metrics-of-your-apis) to detect use of system capacity, helping you troubleshoot gateway problems and make informed decisions whether to [scale or upgrade](upgrade-and-scale.md) an API Management instance to accommodate more load.