Skip to content

Commit 668c0e8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nsp
2 parents 0c31634 + 8d072fb commit 668c0e8

177 files changed

Lines changed: 1000 additions & 876 deletions

File tree

Some content is hidden

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

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6640,6 +6640,26 @@
66406640
"redirect_url": "/azure/oracle/oracle-db/database-overview",
66416641
"redirect_document_id": false
66426642
},
6643+
{
6644+
"source_path": "articles/cyclecloud/how-to/ccws/register-entra-id-app.md",
6645+
"redirect_url": "/azure/cyclecloud/how-to/create-app-registration",
6646+
"redirect_document_id": false
6647+
},
6648+
{
6649+
"source_path": "articles/cyclecloud/how-to/ccws/open-ondemand-add-users.md",
6650+
"redirect_url": "/azure/cyclecloud/how-to/ccws/configure-open-ondemand",
6651+
"redirect_document_id": false
6652+
},
6653+
{
6654+
"source_path": "articles/reliability/reliability-health-insights.md",
6655+
"redirect_url": "/azure/azure-health-insights/reliability-health-insights",
6656+
"redirect_document_id": false
6657+
},
6658+
{
6659+
"source_path": "articles/reliability/migrate-load-balancer.md",
6660+
"redirect_url": "/azure/reliability/reliability-load-balancer",
6661+
"redirect_document_id": false
6662+
},
66436663
{
66446664
"source_path": "articles/nat-gateway/nat-availability-zones.md",
66456665
"redirect_url": "/azure/reliability/reliability-nat-gateway",

articles/active-directory-b2c/add-captcha.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.author: kengaderdus
1111
ms.subservice: b2c
1212
zone_pivot_groups: b2c-policy-type
1313

14-
#Customer intent: As a developer, I want to enable CAPTCHA in consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
14+
#Customer intent: As a developer, I want to enable CAPTCHA in a consumer-facing application that is secured by Azure Active Directory B2C, so that I can protect my sign-in and sign-up flows from automated attacks.
1515

1616
---
1717

@@ -21,7 +21,7 @@ zone_pivot_groups: b2c-policy-type
2121

2222
[!INCLUDE [active-directory-b2c-choose-user-flow-or-custom-policy](../../includes/active-directory-b2c-choose-user-flow-or-custom-policy.md)]
2323

24-
Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C’s CAPTCHA supports both audio and visual CAPTCHA challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.
24+
Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to prevent automated attacks on your consumer-facing applications. Azure AD B2C CAPTCHA supports both audio and visual challenges. You can enable this security feature in both sign-up and sign-in flows for your local accounts. CAPTCHA isn't applicable for social identity providers' sign-in.
2525

2626
> [!NOTE]
2727
> This feature is in public preview
@@ -52,7 +52,7 @@ Azure Active Directory B2C (Azure AD B2C) allows you to enable CAPTCHA to preven
5252

5353
## Test the user flow
5454

55-
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type, visual, or audio, you choose.
55+
Use the steps in [Test the user flow](tutorial-create-user-flows.md?pivots=b2c-user-flow#test-the-user-flow-1) to test and confirm that CAPTCHA is enabled for your chosen flow. You should be prompted to enter the characters you see or hear depending on the CAPTCHA type (visual or audio) that you choose.
5656

5757
::: zone-end
5858

@@ -395,7 +395,7 @@ Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b
395395

396396
> [!NOTE]
397397
> - You can't add CAPTCHA to an MFA step in a sign-up only user flow.
398-
> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only or Phone call only.
398+
> - In an MFA flow, CAPTCHA is applicable where the MFA method you select is SMS or phone call, SMS only, or phone call only.
399399
400400
## Related content
401401

articles/app-testing/load-testing/quickstart-create-run-load-tests-from-recording.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ ms.date: 12/16/2025
1212

1313
# Quickstart: Create and run a load test from a recording using AI
1414

15-
Learn how to use the Azure App Testing browser extension for Microsoft Edge to easily create JMeter load tests. The experience uses AI to enhance your test scripts by suggesting correlations, parameterizations, and other improvements. You can then run the load test at scale in **Azure Load Testing**.
15+
Learn how to use the Azure App Testing browser extension for Microsoft Edge or Google Chrome to easily create JMeter load tests. The experience uses AI to enhance your test scripts by suggesting correlations, parameterizations, and other improvements. You can then run the load test at scale in **Azure Load Testing**.
1616

1717
This quickstart guides you through the steps of installing the browser extension, recording a user journey, reviewing and enhancing the generated load test script with AI assistance, and finally running the load test in **Azure Load Testing**.
1818

1919
## Prerequisites
2020

21-
- Azure App Testing browser extension for Microsoft Edge. [Download and install it here](https://aka.ms/AppTesting/Browser-Ext).
21+
- Azure App Testing browser extension for [Microsoft Edge](https://aka.ms/AppTesting/Browser-Ext) or [Google Chrome](https://aka.ms/AppTesting/Browser-Ext-Chrome).
2222
- An Azure account with an active subscription. Needed to run load tests at scale in **Azure Load Testing**. [Create an account for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2323

2424

articles/application-gateway/monitor-application-gateway-reference.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ For Application Gateway and WAF v2 SKU:
211211
|sslEnabled | Whether communication to the backend pools used TLS. Valid values are on and off. |
212212
|sslCipher | Cipher suite being used for TLS communication (if TLS is enabled). |
213213
|sslProtocol | SSL/TLS protocol being used (if TLS is enabled). |
214-
|sslClientVerify | Shows the result of client certificate verification as SUCCESS or FAILED. Failed status includes error information.|
214+
|sslClientVerify | Shows the result of client certificate verification as SUCCESS or FAILED. Failed status will include error information. SUCCESS status will include Strict or Passthrough|
215215
|sslClientCertificateFingerprint|The SHA1 thumbprint of the client certificate for an established TLS connection.|
216216
|sslClientCertificateIssuerName|The issuer DN string of the client certificate for an established TLS connection.|
217217
|serverRouted | The backend server that application gateway routes the request to. |
@@ -226,6 +226,7 @@ For Application Gateway and WAF v2 SKU:
226226
|originalHost | This field contains the original request host name. |
227227
|error_info | The reason for the 4xx and 5xx error. Displays an error code for a failed request. More details in the error code tables in this article. |
228228
|contentType | The type of content or data that's being processed or delivered by the application gateway. |
229+
|identity | Provides the Tenant ID (TID) and Object ID (OID) of the authenticated entity after successful JWT validation. |
229230

230231
```json
231232
{

articles/azure-cache-for-redis/cache-private-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ You can restrict public access to the private endpoint of your cache by disablin
3434
3535
## Scope of availability
3636

37-
|Tier | Basic, Standard, Premium |Enterprise, Enterprise Flash | Azure Managed Redis (preview)
37+
|Tier | Basic, Standard, Premium |Enterprise, Enterprise Flash | Azure Managed Redis
3838
|--------- |:------------------:|:---------:|:---------:|
3939
|Available | Yes | Yes | Yes |
4040

articles/azure-change-tracking-inventory/overview-monitoring-agent.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ With Change Tracking and Inventory, you can view the contents of a Windows or Li
6969

7070
Change Tracking and Inventory allows monitoring of changes to Windows registry keys. When you use monitoring, you can pinpoint extensibility points where non-Microsoft code and malware can activate. The following table lists preconfigured (but not enabled) registry keys. To track these keys, you must enable each one.
7171

72+
>[!Note]
73+
>A registry key is a container in the Windows Registry that works like a folder in a file system. It organizes configuration settings and data for hardware, software, and users. The keys contain registry values, like files, and subkeys.
74+
75+
7276
> [!div class="mx-tdBreakAll"]
7377
> |Registry key | Purpose |
7478
> | --- | --- |

articles/azure-functions/deployment-zip-push.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ To speed up development, you might find it easier to deploy your function app pr
2828
For more information, see the [.zip deployment reference](https://github.com/projectkudu/kudu/wiki/Deploying-from-a-zip-file-or-url).
2929

3030
>[!IMPORTANT]
31-
> When you use .zip deployment, any files from an existing deployment that aren't found in the .zip file are deleted from your function app.
31+
> When you use .zip deployment, any files from the previous deployment are either deleted or updated during a subsequent deployment to your function app. Other files and directories in your function app that weren't part of the previous deployment are maintained.
3232
3333
## Deployment .zip file requirements
3434

articles/azure-functions/dotnet-isolated-in-process-differences.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,11 @@ Use the following table to compare feature and functional differences between th
4545
| [Flex Consumption] | [Supported](./flex-consumption-plan.md#supported-language-stack-versions) | Not supported |
4646
| .NET Aspire | [Preview](./dotnet-aspire-integration.md) | Not supported |
4747

48-
<sup>1</sup> When you need to interact with a service using parameters determined at runtime, using the corresponding service SDKs directly is recommended over using imperative bindings. The SDKs are less verbose, cover more scenarios, and have advantages for error handling and debugging purposes. This recommendation applies to both models.
49-
50-
<sup>2</sup> Cold start times could be additionally affected on Windows when using some preview versions of .NET due to just-in-time loading of preview frameworks. This impact applies to both the in-process and out-of-process models but can be noticeable when comparing across different versions. This delay for preview versions isn't present on Linux plans.
51-
52-
<sup>3</sup> C# Script functions also run in-process and use the same libraries as in-process class library functions. For more information, see the [Azure Functions C# script (.csx) developer reference](functions-reference-csharp.md).
53-
54-
<sup>4</sup> Service SDK types include types from the [Azure SDK for .NET](/dotnet/azure/sdk/azure-sdk-for-dotnet) such as [BlobClient](/dotnet/api/azure.storage.blobs.blobclient).
55-
56-
<sup>5</sup> ASP.NET Core types aren't supported for .NET Framework.
48+
1. When you need to interact with a service using parameters determined at runtime, using the corresponding service SDKs directly is recommended over using imperative bindings. The SDKs are less verbose, cover more scenarios, and have advantages for error handling and debugging purposes. This recommendation applies to both models.
49+
2. Cold start times could be additionally affected on Windows when using some preview versions of .NET due to just-in-time loading of preview frameworks. This impact applies to both the in-process and isolated worker models but can be noticeable when comparing across different versions. This delay for preview versions isn't present on Linux plans.
50+
3. C# Script functions also run in-process and use the same libraries as in-process class library functions. For more information, see the [Azure Functions C# script (.csx) developer reference](functions-reference-csharp.md).
51+
4. Service SDK types include types from the [Azure SDK for .NET](/dotnet/azure/sdk/azure-sdk-for-dotnet) such as [BlobClient](/dotnet/api/azure.storage.blobs.blobclient).
52+
5. ASP.NET Core types aren't supported for .NET Framework.
5753

5854
[HttpRequest]: /dotnet/api/microsoft.aspnetcore.http.httprequest
5955
[IActionResult]: /dotnet/api/microsoft.aspnetcore.mvc.iactionresult

articles/azure-functions/dotnet-isolated-process-guide.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,20 +154,18 @@ The following code shows an example of a [HostBuilder] pipeline:
154154

155155
:::code language="csharp" source="~/azure-functions-dotnet-worker/samples/FunctionApp/Program.cs" id="docsnippet_startup":::
156156

157-
This code requires `using Microsoft.Extensions.DependencyInjection;`.
158-
159-
Before calling `Build()` on the `IHostBuilder`, you should:
160-
161-
- Call either `ConfigureFunctionsWebApplication()` if you're using [ASP.NET Core integration](#aspnet-core-integration) or `ConfigureFunctionsWorkerDefaults()` otherwise. See [HTTP trigger](#http-trigger) for details on these options.
162-
If you're writing your application using F#, some trigger and binding extensions require extra configuration. See the setup documentation for the [Blobs extension][fsharp-blobs], the [Tables extension][fsharp-tables], and the [Cosmos DB extension][fsharp-cosmos] when you plan to use these extensions in an F# app.
163-
- Configure any services or app configuration your project requires. See [Configuration](#configuration) for details.
164-
If you plan to use Application Insights, you need to call `AddApplicationInsightsTelemetryWorkerService()` and `ConfigureFunctionsApplicationInsights()` in the `ConfigureServices()` delegate. See [Application Insights](#application-insights) for details.
165-
166-
If your project targets .NET Framework 4.8, you also need to add `FunctionsDebugger.Enable();` before creating the HostBuilder. It should be the first line of your `Main()` method. For more information, see [Debugging when targeting .NET Framework](#debugging-when-targeting-net-framework).
167-
168-
The [HostBuilder] builds and returns a fully initialized [`IHost`][IHost] instance. You run this instance asynchronously to start your function app.
169-
170-
:::code language="csharp" source="~/azure-functions-dotnet-worker/samples/FunctionApp/Program.cs" id="docsnippet_host_run":::
157+
Considerations for your start-up code:
158+
159+
- Before calling `Build()` on the `IHostBuilder`, you should:
160+
- Call either `ConfigureFunctionsWebApplication()` if you're using [ASP.NET Core integration](#aspnet-core-integration) or `ConfigureFunctionsWorkerDefaults()` otherwise. See [HTTP trigger](#http-trigger) for details on these options.
161+
If you're writing your application using F#, some trigger and binding extensions require extra configuration. See the setup documentation for the [Blobs extension][fsharp-blobs], the [Tables extension][fsharp-tables], and the [Cosmos DB extension][fsharp-cosmos] when you plan to use these extensions in an F# app.
162+
- Configure any services or app configuration your project requires. See [Configuration](#configuration) for details.
163+
If you plan to use Application Insights, you need to call `AddApplicationInsightsTelemetryWorkerService()` and `ConfigureFunctionsApplicationInsights()` in the `ConfigureServices()` delegate. See [Application Insights](#application-insights) for details.
164+
- If your project targets .NET Framework 4.8, you also need to add `FunctionsDebugger.Enable();` before creating the HostBuilder. It should be the first line of your `Main()` method. For more information, see [Debugging when targeting .NET Framework](#debugging-when-targeting-net-framework).
165+
- This example includes dependency injection, which is optional for your start-up code. Dependency injection also requires `using Microsoft.Extensions.DependencyInjection;`. For more information, see [Dependency injection](#dependency-injection).
166+
- The [HostBuilder] builds and returns a fully initialized [`IHost`][IHost] instance. You run this instance asynchronously to start your function app.
167+
168+
:::code language="csharp" source="~/azure-functions-dotnet-worker/samples/FunctionApp/Program.cs" id="docsnippet_host_run":::
171169

172170
---
173171

articles/azure-functions/functions-app-settings.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,8 +893,6 @@ Determines whether the built-in administrator (`/admin`) endpoints in your funct
893893

894894
This property can't be set for apps running on Linux in a Consumption plan. It can't be set for apps running on version 1.x of Azure Functions. If you're using version 1.x, you must first [migrate to version 4.x](./migrate-version-1-version-4.md).
895895

896-
[!INCLUDE [functions-flex-consumption-recommended-serverless](../../includes/functions-flex-consumption-recommended-serverless.md)]
897-
898896
## linuxFxVersion
899897

900898
For function apps running on Linux, `linuxFxVersion` indicates the language and version for the language-specific worker process. This information is used, along with [`FUNCTIONS_EXTENSION_VERSION`](#functions_extension_version), to determine which specific Linux container image is installed to run your function app. This setting can be set to a predefined value or a custom image URI.

0 commit comments

Comments
 (0)