Skip to content

Commit 6f8f262

Browse files
authored
Merge pull request #215708 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 1cd544d + 8507e7f commit 6f8f262

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

articles/azure-resource-manager/bicep/bicep-functions-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ The preceding example returns the following object when deployed to global Azure
176176
"vmImageAliasDoc": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json",
177177
"resourceManager": "https://management.azure.com/",
178178
"authentication": {
179-
"loginEndpoint": "https://login.windows.net/",
179+
"loginEndpoint": "https://login.microsoftonline.com/",
180180
"audiences": [
181181
"https://management.core.windows.net/",
182182
"https://management.azure.com/"

articles/azure-signalr/signalr-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ There are many different ways to program with Azure SignalR Service, as some of
7070

7171
- **[Scale an ASP.NET Core SignalR App](signalr-concept-scale-aspnet-core.md)** - Integrate Azure SignalR Service with an ASP.NET Core SignalR application to scale out to hundreds of thousands of connections.
7272
- **[Build serverless real-time apps](signalr-concept-azure-functions.md)** - Use Azure Functions' integration with Azure SignalR Service to build serverless real-time applications in languages such as JavaScript, C#, and Java.
73-
- **[Send messages from server to clients via REST API](https://github.com/Azure/azure-signalr/blob/dev/docs/rest-api.md)** - Azure SignalR Service provides REST API to enable applications to post messages to clients connected with SignalR Service, in any REST capable programming languages.
73+
- **[Send messages from server to clients via REST API](signalr-reference-data-plane-rest-api.md)** - Azure SignalR Service provides REST API to enable applications to post messages to clients connected with SignalR Service, in any REST capable programming languages.

articles/service-bus-messaging/service-bus-dotnet-get-started-with-queues.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,8 @@ In this section, you'll add code to retrieve messages from the queue.
540540
// the client that owns the connection and can be used to create senders and receivers
541541
ServiceBusClient client;
542542
543-
// the sender used to publish messages to the queue
544-
ServiceBusSender sender;
543+
// the processor that reads and processes messages from the queue
544+
ServiceBusProcessor processor;
545545
546546
// The Service Bus client types are safe to cache and use as a singleton for the lifetime
547547
// of the application, which is best practice when messages are being published or read

articles/service-fabric/service-fabric-reliable-services-reliable-collections-guidelines.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ The guidelines are organized as simple recommendations prefixed with the terms *
2828
* Consider using backup and restore functionality to have disaster recovery.
2929
* Avoid mixing single entity operations and multi-entity operations (e.g `GetCountAsync`, `CreateEnumerableAsync`) in the same transaction due to the different isolation levels.
3030
* Do handle InvalidOperationException. User transactions can be aborted by the system for variety of reasons. For example, when the Reliable State Manager is changing its role out of Primary or when a long-running transaction is blocking truncation of the transactional log. In such cases, user may receive InvalidOperationException indicating that their transaction has already been terminated. Assuming, the termination of the transaction was not requested by the user, best way to handle this exception is to dispose the transaction, check if the cancellation token has been signaled (or the role of the replica has been changed), and if not create a new transaction and retry.
31+
* Do not apply any parallelism within a transaction.
32+
* Consider dispose transaction as soon as possible after commit completes (especially if using ConcurrentQueue).
33+
* Do not perform any blocking code inside a transaction.
3134

3235
Here are some things to keep in mind:
3336

articles/virtual-desktop/disaster-recovery-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Another option is an active-active deployment, where you use both sets of infras
5555
- Have extra session hosts in both active regions, but deallocate them when they aren't needed, which reduces costs.
5656
- Only provision new infrastructure during disaster recovery and allow affected users to connect to the newly provisioned session hosts. This method requires regular testing with infrastructure-as-code tools so you can deploy the new infrastructure as quickly as possible during a disaster.
5757

58-
## Recommended diaster recovery methods
58+
## Recommended disaster recovery methods
5959

6060
The disaster recovery methods we recommend are:
6161

0 commit comments

Comments
 (0)