Merge branch 'main' into ga-indonesia-central

Author: johndowns

.openpublishing.redirection.json

@@ -1,5 +1,30 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/cdn/cdn-http-variables.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-http-variables",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-advanced-http-reports.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-advanced-http-reports",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-preload-endpoint.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-preload-endpoint",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-real-time-stats.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-real-time-stats",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-token-auth.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-token-auth",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/cdn/edgio-retirement-faq.md",
       "redirect_url": "/previous-versions/azure/cdn/edgio-retirement-faq",
@@ -6784,5 +6809,10 @@
       "redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
+      "redirect_url": "/azure/storage/files/storage-files-prevent-file-share-deletion",
+      "redirect_document_id": false
+    }
   ]
 }

articles/active-directory-b2c/api-connectors-overview.md

@@ -85,7 +85,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
 ![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
 
 > [!NOTE]
-> If there is slow or no response from the RESTful service to Azure AD B2C, the timeout is 30 seconds and the retry count is two times (meaning there are 3 tries in total). Currently, you can't configure the timeout and retry count settings.
+> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
 
 ## Calling a RESTful service
 

articles/active-directory-b2c/manage-custom-policies-powershell.md

@@ -6,7 +6,7 @@ author: kengaderdus
 manager: CelesteDG
 
 ms.service: azure-active-directory
-ms.custom: has-azure-ad-ps-ref, azure-ad-ref-level-one-done
+ms.custom: no-azure-ad-ps-ref
 ms.topic: how-to
 ms.date: 01/11/2024
 ms.author: kengaderdus
@@ -16,7 +16,7 @@ ms.subservice: b2c
 
 # Manage Azure AD B2C custom policies with Microsoft Graph PowerShell
 
-Microsoft Graph PowerShell provides several cmdlets for command line- and script-based custom policy management in your Azure AD B2C tenant. Learn how to use the Azure AD PowerShell module to:
+Microsoft Graph PowerShell provides several cmdlets for command line- and script-based custom policy management in your Azure AD B2C tenant. Learn how to use the Microsoft Graph PowerShell SDK to:
 
 * List the custom policies in an Azure AD B2C tenant
 * Download a policy from a tenant

articles/active-directory-b2c/service-limits.md

@@ -196,7 +196,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 233 |	Ghana|	10	| 30 |
 | 234 | Nigeria | 20 | 100 |
 | 236 |	Central African Republic  |	10	| 30 |
-| 238 | Cape Verde | 10 | 30 |
+| 238 | Cabo Verde | 10 | 30 |
 | 249 |  Sudan | 10  |  30  |
 | 251 |	Ethiopia  |	10	| 30 |
 | 252 |  Somalia   | 10  |  30  |  

articles/api-center/frequently-asked-questions.yml

@@ -59,5 +59,6 @@ additionalContent: |
     ## Related content
 
     * [Azure API Center overview](overview.md)
-    * [Build APIs | Microsoft Developer](https://developer.microsoft.com/build-apis
+    * [Build APIs | Microsoft Developer](https://developer.microsoft.com/build-apis)
+    * [API Center flash workshop](https://azure-samples.github.io/API-Center-Workshop/)
 

articles/api-center/synchronize-aws-gateway-apis.md

@@ -8,8 +8,9 @@ ms.date: 02/10/2025
 ms.author: danlep 
 ms.custom: 
   - devx-track-azurecli
-  - migration
-  - aws-to-azure
+ms.collection: 
+ - migration
+ - aws-to-azure
 # Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
 ---
 

articles/api-management/TOC.yml

@@ -91,8 +91,8 @@
         href: migrate-stv1-to-stv2-no-vnet.md
       - name: Migrate a VNet-injected instance
         href: migrate-stv1-to-stv2-vnet.md
-    - name: Validate service updates
-      href: validate-service-updates.md
+    - name: Configure update settings
+      href: configure-service-update-settings.md
     - name: Move instances between regions
       href: api-management-howto-migrate.md
     - name: Recover a deleted instance
@@ -217,7 +217,7 @@
       href: grpc-api.md
     - name: Azure OpenAI and LLM APIs
       items:
-      - name: GenAI gateway capabilities in API Management
+      - name: AI gateway capabilities in API Management
         href: genai-gateway-capabilities.md
       - name: Import Azure OpenAI API
         href: azure-openai-api-from-specification.md

articles/api-management/api-management-error-handling-policies.md

@@ -113,13 +113,13 @@ The following errors are predefined for error conditions that can occur during p
 | ip-filter    | Caller IP is in blocked list                                    | CallerIpBlocked           | Caller IP address is blocked. Access denied.                                                                                         |
 | check-header | Required header not presented or value is missing               | HeaderNotFound            | Header {header-name} was not found in the request. Access denied.                                                                    |
 | check-header | Required header not presented or value is missing               | HeaderValueNotAllowed     | Header {header-name} value of {header-value} is not allowed. Access denied.                                                          |
-| validate-jwt | Jwt token is missing in request                                 | TokenNotPresent             | JWT not present.                                                                                         |
+| validate-jwt | JWT is missing in request                                 | TokenNotPresent             | JWT not present.                                                                                         |
 | validate-jwt | Signature validation failed                                     | TokenSignatureInvalid     | <message from jwt library\>. Access denied.                                                                                          |
 | validate-jwt | Invalid audience                                                | TokenAudienceNotAllowed   | <message from jwt library\>. Access denied.                                                                                          |
 | validate-jwt | Invalid issuer                                                  | TokenIssuerNotAllowed     | <message from jwt library\>. Access denied.                                                                                          |
 | validate-jwt | Token expired                                                   | TokenExpired              | <message from jwt library\>. Access denied.                                                                                          |
 | validate-jwt | Signature key was not resolved by ID                            | TokenSignatureKeyNotFound | <message from jwt library\>. Access denied.                                                                                          |
-| validate-jwt | Required claims are missing from token                          | TokenClaimNotFound        | JWT token is missing the following claims: <c1\>, <c2\>, … Access denied.                                                            |
+| validate-jwt | Required claims are missing from token                          | TokenClaimNotFound        | JWT is missing the following claims: <c1\>, <c2\>, … Access denied.                                                            |
 | validate-jwt | Claim values mismatch                                           | TokenClaimValueNotAllowed | Claim {claim-name} value of {claim-value} is not allowed. Access denied.                                                             |
 | validate-jwt | Other validation failures                                       | JwtInvalid                | <message from jwt library\>                                                                                                          |
 | forward-request or send-request | HTTP response status code and headers were not received from the backend within the configured timeout | Timeout | multiple |

articles/api-management/api-management-gateways-overview.md

@@ -201,4 +201,4 @@ Lear more about:
 -   [API Management in a Hybrid and multicloud World](https://aka.ms/hybrid-and-multi-cloud-api-management)
 -   [Capacity metric](api-management-capacity.md) for scaling decisions
 -   [Observability capabilities](observability.md) in API Management
--   [GenAI gateway capabilities](genai-gateway-capabilities.md) in API Management
+-   [AI gateway capabilities](genai-gateway-capabilities.md) in API Management

articles/api-management/api-management-key-concepts-experiment.md

@@ -58,7 +58,7 @@ All requests from client applications first reach the API gateway, which then fo
 The API gateway:
 
   * Accepts API calls and routes them to configured backends
-  * Verifies API keys, JWT tokens, certificates, and other credentials
+  * Verifies API keys, JWTs, certificates, and other credentials
   * Enforces usage quotas and rate limits
   * Optionally transforms requests and responses as specified in [policy statements](#policies)
   * If configured, caches responses to improve response latency and minimize the load on backend services