Skip to content

Commit 062805e

Browse files
authored
Merge pull request #265670 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 1667337 + b839cbf commit 062805e

File tree

10 files changed

+30
-15
lines changed

10 files changed

+30
-15
lines changed

articles/advisor/advisor-reference-reliability-recommendations.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,12 +645,13 @@ In active-active configuration, both instances of the VPN gateway establish S2S
645645

646646
Learn more about [Virtual network gateway - VNetGatewayActiveActive (Enable Active-Active gateways for redundancy)](https://aka.ms/aa_vpnha_learnmore).
647647

648+
<!--
648649
### Use HEAD health probes
649650
650651
For health probes, it’s a good practice to use the HEAD method, which reduces the amount of traffic load on your origins.
651652
652653
Learn more about [Front Door - Use HEAD health probes](https://aka.ms/afd-use-health-probes).
653-
654+
-->
654655
### Use managed TLS certificates
655656

656657
Front Door management of your TLS certificates reduces your operational costs and helps you to avoid costly outages caused by forgetting to renew a certificate.
@@ -663,6 +664,12 @@ If you only have a single origin, Front Door always routes traffic to that origi
663664

664665
Learn more about [Health probe best practices](https://aka.ms/afd-disable-health-probes).
665666

667+
### Use the same domain name on Azure Front Door and your origin
668+
669+
We recommend that you preserve the original HTTP host name when you use a reverse proxy in front of a web application. Having a different host name at the reverse proxy than the one that's provided to the back-end application server can lead to cookies or redirect URLs that don't work properly. For example, session state can get lost, authentication can fail, or back-end URLs can inadvertently be exposed to end users. You can avoid these problems by preserving the host name of the initial request so that the application server sees the same domain as the web browser.
670+
671+
Learn more about [Use the same domain name on Azure Front Door and your origin](https://aka.ms/afd-same-domain-origin).
672+
666673
## SAP for Azure
667674

668675
### Enable the 'concurrent-fencing' parameter in Pacemaker cofiguration in ASCS HA setup in SAP workloads

articles/azure-signalr/signalr-tutorial-build-blazor-server-chat-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ Beginning in Visual Studio 2019 version 16.2.0, Azure SignalR Service is built i
371371

372372
## Publish to Azure
373373

374-
When you deploy the Blazor app to Azure App Service, we recommend that you use [Azure SignalR Service](/aspnet/core/signalr/scale#azure-signalr-service). Azure SingalR Service allows for scaling up a Blazor Server app to a large number of concurrent SignalR connections. In addition, the SignalR service's global reach and high-performance datacenters significantly aid in reducing latency due to geography.
374+
When you deploy the Blazor app to Azure App Service, we recommend that you use [Azure SignalR Service](/aspnet/core/signalr/scale#azure-signalr-service). Azure SignalR Service allows for scaling up a Blazor Server app to a large number of concurrent SignalR connections. In addition, the SignalR service's global reach and high-performance datacenters significantly aid in reducing latency due to geography.
375375

376376
> [!IMPORTANT]
377377
> In a Blazor Server app, UI states are maintained on the server side, which means a sticky server session is required to preserve state. If there is a single app server, sticky sessions are ensured by design. However, if there are multiple app servers, there are chances that the client negotiation and connection may go to different servers which may lead to an inconsistent UI state management in a Blazor app. Hence, it is recommended to enable sticky server sessions as shown below in *appsettings.json*:
@@ -422,7 +422,7 @@ When you deploy the Blazor app to Azure App Service, we recommend that you use [
422422
dotnet add package Microsoft.Azure.SignalR --version 1.5.1
423423
```
424424
425-
1. Add a call to `AddAzureSingalR()` in `Startup.ConfigureServices()` as demonstrated below.
425+
1. Add a call to `AddAzureSignalR()` in `Startup.ConfigureServices()` as demonstrated below.
426426

427427
```cs
428428
public void ConfigureServices(IServiceCollection services)

articles/communication-services/samples/includes/call-automation-ai-javascript.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Open the `.env` file to configure the following settings
5656
1. `CONNECTION_STRING`: Azure Communication Service resource's connection string.
5757
2. `CALLBACK_URI`: Base url of the app. (For local development replace the dev tunnel url)
5858
3. `COGNITIVE_SERVICE_ENDPOINT`: Azure AI Service endpoint
59-
4. `AZURE_OPENAI_SERVICE_KEY`: Azure Open AI service key
60-
5. `AZURE_OPENAI_SERVICE_ENDPOINT`: Azure Open AI endpoint
61-
6. `AZURE_OPENAI_DEPLOYMENT_MODEL_NAME`: Azure Open AI deployment name
59+
4. `AZURE_OPENAI_SERVICE_KEY`: Azure OpenAI service key
60+
5. `AZURE_OPENAI_SERVICE_ENDPOINT`: Azure OpenAI endpoint
61+
6. `AZURE_OPENAI_DEPLOYMENT_MODEL_NAME`: Azure OpenAI deployment name
6262
6. `AGENT_PHONE_NUMBER`: Agent phone number to transfer the call to resolve queries
6363

6464

articles/frontdoor/standard-premium/how-to-enable-private-link-internal-load-balancer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ In this section, you map the Private Link service to a private endpoint created
3333
1. Select **+ Add an origin** to add new origin. Select or enter the following settings to configure the internal load balancer origin.
3434

3535
> [!NOTE]
36-
> The hostname must be a valid domain name, IPv4 or IPv6. The hostname can be the private IP of the internal load balancer or a domain name. If you are using a domain name, you must have a DNS record that resolves to the private IP of the internal load balancer.
36+
> The hostname must be a valid domain name, IPv4 or IPv6. The hostname can be the private IP of the internal load balancer or a domain name.
3737
3838
:::image type="content" source="../media/how-to-enable-private-link-internal-load-balancer/private-endpoint-internal-load-balancer-ip.png" alt-text="Screenshot of enabling private link to an internal load balancer using an IP address.":::
3939

articles/governance/policy/concepts/scope.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ the definition location to target for assignment. The [resources covered by Azur
2525

2626
If the definition location is a:
2727

28-
- **Subscription** - Only resources within that subscription can be assigned the policy definition.
29-
- **Management group** - Only resources within child management groups and child subscriptions can
28+
- **Subscription** - The subscription where policy is defined and resources within that subscription can be assigned the policy definition.
29+
- **Management group** - The management group where the policy is defined and resources within child management groups and child subscriptions can
3030
be assigned the policy definition. If you plan to apply the policy definition to several
3131
subscriptions, the location must be a management group that contains each subscription.
3232

articles/oracle/oracle-db/oracle-database-network-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.date: 12/12/2023
1212

1313
# Network planning for Oracle Database@Azure
1414

15-
In this article, you learn about the topologies and constraints for Oracle Database@Azure. After you purchase the offer through Azure Marketplace and provision the Exadata infrastructure, you'll then need to create your virtual machine cluster that will host your Oracle Exadata Database. These Oracle database clusters are connected to your Azure virtual network via a virtual NIC from your delegated subnet (delegated to ``Oracle.Database/networkAattachement``).
15+
In this article, you learn about the topologies and constraints for Oracle Database@Azure. After you purchase the offer through Azure Marketplace and provision the Exadata infrastructure, you'll then need to create your virtual machine cluster that will host your Oracle Exadata Database. These Oracle database clusters are connected to your Azure virtual network via a virtual NIC from your delegated subnet (delegated to ``Oracle.Database/networkAttachement``).
1616

1717
## Supported topologies
1818

articles/reliability/reliability-traffic-manager.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: anaharris
66
ms.topic: overview
77
ms.custom: subject-reliability, references-regions
88
ms.service: traffic-manager
9-
ms.date: 02/02/2024
9+
ms.date: 02/06/2024
1010
---
1111

1212

articles/role-based-access-control/conditions-troubleshoot.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,19 @@ When you try to add a role assignment with a condition, you get an error similar
4848

4949
`The given role assignment condition is invalid.`
5050

51-
**Cause**
51+
**Cause 1**
52+
53+
The `conditionVersion` property is set to "1.0".
54+
55+
**Solution 1**
56+
57+
Set `conditionVersion` property to "2.0".
58+
59+
**Cause 2**
5260

5361
Your condition is not formatted correctly.
5462

55-
**Solution**
63+
**Solution 2**
5664

5765
Fix any [condition format or syntax](conditions-format.md) issues. Alternatively, add the condition using the [visual editor in the Azure portal](conditions-role-assignments-portal.md).
5866

articles/search/search-language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Non-string fields and non-searchable string fields don't undergo lexical analysi
4343

4444
## Add text translation
4545

46-
This article assumes translated strings alreach exist. If that's not the case, you can attach Azure AI services to an [enrichment pipeline](cognitive-search-concept-intro.md), invoking text translation during indexing. Text translation takes a dependency on the indexer feature and Azure AI services, but all setup is done within Azure AI Search.
46+
This article assumes translated strings already exist. If that's not the case, you can attach Azure AI services to an [enrichment pipeline](cognitive-search-concept-intro.md), invoking text translation during indexing. Text translation takes a dependency on the indexer feature and Azure AI services, but all setup is done within Azure AI Search.
4747

4848
To add text translation, follow these steps:
4949

articles/service-fabric/service-fabric-how-to-specify-environment-variables.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ environment:
5353
```
5454

5555
## Next steps
56-
To learn more about some of the core concepts that are discussed in this article, see the [Manage applications for multiple environments articles](service-fabric-manage-multiple-environment-app-configuration.md).
56+
To learn more about some of the core concepts that are discussed in this article, see the [Manage applications for multiple environments](service-fabric-manage-multiple-environment-app-configuration.md).
5757

5858
For information about other app management capabilities that are available in Visual Studio, see [Manage your Service Fabric applications in Visual Studio](service-fabric-manage-application-in-visual-studio.md).

0 commit comments

Comments
 (0)