Skip to content

Commit 0571d3e

Browse files
author
Bharathi Selvaraj
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into delete-cors-image
2 parents ae8f8d4 + 908c3b3 commit 0571d3e

File tree

2,225 files changed

+43296
-13036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,225 files changed

+43296
-13036
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Age gating in Azure Active Directory B2C (Azure AD B2C) enables you to identify
2525
>This feature is in public preview. Do not use feature for production applications.
2626
>
2727
28-
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.
28+
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.
2929

3030
![Screenshot of age gating information gather flow](./media/age-gating/age-gating-information-gathering.png)
3131

@@ -69,7 +69,7 @@ After your tenant is set up to use age gating, you can then use this feature in
6969
1. To test your policy, select **Run user flow**.
7070
1. For **Application**, select the web application named *testapp1* that you previously registered. The **Reply URL** should show `https://jwt.ms`.
7171
1. Select the **Run user flow** button.
72-
1. Sign-in with a local or social account. Then select your country of residence, and date of birth that simulate a minor.
72+
1. Sign-in with a local or social account. Then select your country/region of residence, and date of birth that simulate a minor.
7373
1. Repeat the test, and select a date of birth that simulates an adult.
7474

7575
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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Your local account identity provider includes a Username option that lets users
4444

4545
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:
4646

47-
- **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.
47+
- **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.
4848
- **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.
4949
1. A sign-up page appears, where the user selects their *Country*, enters their phone number, and selects *Send Code*.
5050
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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following Visual Studio Code extensions are needed for the specified scenari
2828
* [GitHub Actions](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-github-actions) - to register APIs using a CI/CD pipeline with GitHub Actions
2929
* [Azure Pipelines](https://marketplace.visualstudio.com/items?itemName=ms-azure-devops.azure-pipelines) - to register APIs using a CI/CD pipeline with Azure Pipelines
3030
* [GitHub Copilot](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot) - to generate OpenAPI specification files from API code
31-
* [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
31+
* [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)
3232

3333
[!INCLUDE [vscode-extension-setup](includes/vscode-extension-setup.md)]
3434

@@ -66,7 +66,7 @@ After generating the OpenAPI specification file and checking for accuracy, you c
6666

6767
## Generate OpenAPI spec using natural language prompts
6868

69-
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.
69+
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.
7070

7171
> [!NOTE]
7272
> 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
9898
* [Discover and consume APIs with the Azure API Center extension for Visual Studio Code](discover-apis-vscode-extension.md)
9999
* [Govern APIs with the Azure API Center extension for Visual Studio Code](govern-apis-vscode-extension.md)
100100
* [Enable and view platform API catalog in Visual Studio Code](enable-platform-api-catalog-vscode-extension.md)
101+
* [Overview of GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction)
101102

articles/api-management/api-management-howto-add-products.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Products are associations of one or more APIs. You can include many APIs and off
149149

150150
```azurecli
151151
az apim product api add --resource-group apim-hello-word-resource-group \
152-
--api-id demo-conference-api --product-id contoso-product \
152+
--api-id petstore-api --product-id contoso-product \
153153
--service-name apim-hello-world
154154
```
155155

@@ -164,7 +164,7 @@ You can remove an API from a product by using the [az apim product api delete](/
164164

165165
```azurecli
166166
az apim product api delete --resource-group apim-hello-word-resource-group \
167-
--api-id demo-conference-api --product-id contoso-product \
167+
--api-id petstore-api --product-id contoso-product \
168168
--service-name apim-hello-world
169169
```
170170

@@ -291,4 +291,4 @@ az apim show --<apim_service_name> --<resource_group_name>
291291
> [!div class="nextstepaction"]
292292
> [Create blank API and mock API responses](mock-api-responses.md).
293293
294-
:::zone-end
294+
:::zone-end

articles/api-management/api-management-howto-integrate-internal-vnet-appgateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Throughout this guide, you need to define several variables. Naming is based on
8686

8787
```powershell
8888
# These variables must be changed.
89-
$subscriptionId = "00000000-0000-0000-0000-000000000000" # GUID of your Azure subscription
89+
$subscriptionId = "aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e" # GUID of your Azure subscription
9090
$domain = "contoso.net" # The custom domain for your certificate
9191
$apimServiceName = "apim-contoso" # API Management service instance name, must be globally unique
9292
$apimDomainNameLabel = $apimServiceName # Domain name label for API Management's public IP address, must be globally unique

articles/api-management/breaking-changes/workspaces-breaking-changes-march-2025.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ The following are abbreviated steps to add a workspace gateway to a workspace. F
6565

6666
> [!NOTE]
6767
> * The workspace gateway incurs additional charges. For more information, see [API Management pricing](https://aka.ms/apimpricing).
68-
> * API Management currently supports a dedicated gateway per workspace only. If this is impacting your migration plans, see the workspaces roadmap in the [workspaces GA announcement](https://aka.ms/apim/workspaces/ga-announcement).
68+
> * We're introducing the ability to associate multiple workspaces with a workspace gateway, helping organizations manage APIs with workspaces at a lower cost. This feature is being rolled out starting in December 2024 and it may not be available to all eligible services before January. [Learn more](https://aka.ms/apim/workspaces/sharedgateway)
6969
7070
1. In the [Azure portal](https://portal.azure.com), navigate to your API Management instance.
7171
1. In the left menu, under **APIs**, select **Workspaces**.

articles/api-management/how-to-configure-local-metrics-logs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,8 @@ For example, you can filter all syslogs to just the ones from the self-hosted ga
310310

311311
```shell
312312
$ cat host/var/log/syslog | grep "apimuser"
313-
May 15 05:54:20 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:20.0445178Z, isRequestSuccess=True, totalTime=290, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:20.0445178Z, region=Repro, correlationId=b28565ec-73e0-41e6-9312-efcdd6841846, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=287, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
314-
May 15 05:54:21 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:21.1189171Z, isRequestSuccess=True, totalTime=150, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:21.1189171Z, region=Repro, correlationId=ab4d7464-acee-40ae-af95-a521cc57c759, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=148, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
313+
May 15 05:54:20 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:20.0445178Z, isRequestSuccess=True, totalTime=290, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:20.0445178Z, region=Repro, correlationId=aaaa0000-bb11-2222-33cc-444444dddddd, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=287, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
314+
May 15 05:54:21 aks-agentpool-43853532-vmss000000 apimuser[8]: Timestamp=2023-05-15T05:54:21.1189171Z, isRequestSuccess=True, totalTime=150, category=GatewayLogs, callerIpAddress=141.134.132.243, timeGenerated=2023-05-15T05:54:21.1189171Z, region=Repro, correlationId=bbbb1111-cc22-3333-44dd-555555eeeeee, method=GET, url="http://20.126.242.200/echo/resource?param1\=sample", backendResponseCode=200, responseCode=200, responseSize=628, cache=none, backendTime=148, apiId=echo-api, operationId=retrieve-resource, apimSubscriptionId=master, clientProtocol=HTTP/1.1, backendProtocol=HTTP/1.1, apiRevision=1, backendMethod=GET, backendUrl="http://echoapi.cloudapp.net/api/resource?param1\=sample"
315315
```
316316
> [!NOTE]
317317
> If you have changed the root with `chroot`, for example `chroot /host`, then the above path needs to reflect that change.

articles/api-management/how-to-create-workspace.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: dlepow
55
ms.topic: how-to
66
ms.service: azure-api-management
77
ms.author: danlep
8-
ms.date: 07/10/2024
8+
ms.date: 11/12/2024
99
ms.custom:
1010
---
1111

@@ -24,7 +24,8 @@ Follow the steps in this article to:
2424
* Assign permissions to the workspace
2525

2626
> [!NOTE]
27-
> Currently, creating a workspace gateway is a long-running operation that can take up to 3 hours or more to complete.
27+
> * Currently, creating a workspace gateway is a long-running operation that can take up to 3 hours or more to complete.
28+
> * We're introducing the ability to associate multiple workspaces with a workspace gateway, helping organizations manage APIs with workspaces at a lower cost. This feature is being rolled out starting in December 2024 and it may not be available to all eligible services before January. [Learn more](https://aka.ms/apim/workspaces/sharedgateway)
2829
2930
## Prerequisites
3031

articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes-opentelemetry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Now that both our OpenTelemetry Collector and the self-hosted gateway are deploy
213213
X-Forwarded-For: 10.244.1.1
214214
traceparent: 00-3192030c89fd7a60ef4c9749d6bdef0c-f4eeeee46f770061-01
215215
Request-Id: |3192030c89fd7a60ef4c9749d6bdef0c.f4eeeee46f770061.
216-
Request-Context: appId=cid-v1:c24f5e00-aa25-47f2-bbb5-035847e7f52a
216+
Request-Context: appId=cid-v1:00001111-aaaa-2222-bbbb-3333cccc4444
217217
X-Powered-By: Azure API Management - http://api.azure.com/,ASP.NET
218218
X-AspNet-Version: 4.0.30319
219219
```

0 commit comments

Comments
 (0)