Skip to content

Commit 7dc28b3

Browse files
authored
Merge pull request #231736 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 e639bfd + 2f33a8e commit 7dc28b3

File tree

7 files changed

+23
-7
lines changed

7 files changed

+23
-7
lines changed

articles/active-directory/authentication/howto-authentication-passwordless-phone.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Users can register for passwordless phone sign-in directly within the Microsoft
8585
1. Acquire a [Temporary Access Pass](../authentication/howto-authentication-temporary-access-pass.md) from your Admin or Organization.
8686
2. Download and install the Microsoft Authenticator app on your mobile device.
8787
3. Open Microsoft Authenticator and click **Add account** and then choose **Work or school account.**
88-
4. Choose **Sign in."
88+
4. Choose **Sign in**.
8989
5. Follow the instructions to sign-in with your account using the Temporary Access Pass provided by your Admin or Organization.
9090
6. Once signed-in, continue following the additional steps to set up phone sign-in.
9191

articles/cognitive-services/includes/quickstarts/sku-pricing.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ See the list of SKUs and pricing information below.
5151
| Content Moderator | `ContentModerator` |
5252
| Personalizer | `Personalizer` |
5353

54+
#### Azure OpenAI
55+
56+
| Service | Kind |
57+
|-------------------|--------------------|
58+
| Azure OpenAI | `OpenAI` |
5459

5560
#### Pricing tiers and billing
5661

articles/cognitive-services/language-service/question-answering/how-to/authoring.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ curl -X POST -H "Ocp-Apim-Subscription-Key: {API-KEY}" -H "Content-Type: applica
479479
}' -i 'https://{ENDPOINT}.api.cognitive.microsoft.com/language/query-knowledgebases/projects/{PROJECT-NAME}/:import?api-version=2021-10-01&format=tsv'
480480
```
481481

482-
A successful call to deploy a project results in an `Operation-Location` header being returned, which can be used to check the status of the import job. In many of our examples, we haven't needed to look at the response headers and thus haven't been displaying them. To retrieve the response headers our curl command uses `-i`. Without this additional parameter prior to the endpoint address, the response to this command would appear empty as if no response occurred.
482+
A successful call to import a project results in an `Operation-Location` header being returned, which can be used to check the status of the import job. In many of our examples, we haven't needed to look at the response headers and thus haven't been displaying them. To retrieve the response headers our curl command uses `-i`. Without this additional parameter prior to the endpoint address, the response to this command would appear empty as if no response occurred.
483483

484484
### Example response
485485

@@ -807,4 +807,4 @@ apim-request-id: 92225e03-e83f-4c7f-b35a-223b1b0f29dd
807807
strict-transport-security: max-age=31536000; includeSubDomains; preload
808808
x-content-type-options: nosniff
809809
date: Wed, 24 Nov 2021 04:02:56 GMT
810-
```
810+
```

articles/expressroute/expressroute-howto-reset-peering.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,22 @@ There are a two scenarios where you may find it helpful to reset your ExpressRou
129129
AllowClassicOperations : False
130130
GatewayManagerEtag :
131131
```
132-
6. Run the following commands to change the state of the peering.
132+
6. Run the following commands to change the peering state to disabled.
133133

134134
```azurepowershell-interactive
135135
$ckt.Peerings[0].State = "Disabled"
136136
Set-AzExpressRouteCircuit -ExpressRouteCircuit $ckt
137137
```
138-
The peering should be in a state you set.
138+
The peering should be in a disabled state you set.
139139

140+
7. Run the following commands to change the peering state back to enabled.
141+
142+
```azurepowershell-interactive
143+
$ckt.Peerings[0].State = "Enabled"
144+
Set-AzExpressRouteCircuit -ExpressRouteCircuit $ckt
145+
```
146+
The peering should be in a enabled state you set.
147+
140148
## Next steps
141149
If you need help with troubleshooting an ExpressRoute problem, see the following articles:
142150
* [Verifying ExpressRoute connectivity](expressroute-troubleshooting-expressroute-overview.md)

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
@@ -60,7 +60,7 @@ In this section, you'll map the Private Link service to a private endpoint creat
6060
| Resource | If you select **In my directory**, specify the Private Link Service resource for the ILB in your subscription. |
6161
| ID/alias | If you select **By ID or alias**, specify the resource ID of the Private Link Service resource you want to enable private link to. |
6262
| Region | Select the region that is the same or closest to your origin. |
63-
| Request message | Customize message or choose the default. |
63+
| Request message | Custom message to see while approving the Private Endpoint. |
6464

6565
1. Then select **Add** and then **Update** to save the origin group settings.
6666

articles/service-bus-messaging/message-sessions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ On session-aware queues or subscriptions, sessions come into existence when ther
2121
Typically, however, an application has a clear notion of where a set of related messages starts and ends. Service Bus doesn't set any specific rules. For example, your application could set the **Label** property for the first message to **start**, for intermediate messages to **content**, and for the last message to **end**. The relative position of the content messages can be computed as the current message *SequenceNumber* delta from the **start** message *SequenceNumber*.
2222

2323
> [!IMPORTANT]
24-
> When sessions are enabled on a queue or a subscription, the client applications can ***no longer*** send/receive regular messages. All messages must be sent as part of a session (by setting the session id) and received by accepting the session.
24+
> When sessions are enabled on a queue or a subscription, the client applications can ***no longer*** send/receive regular messages. All messages must be sent as part of a session (by setting the session id) and received by accepting the session. Clients may still peek a queue or subscription that has sessions enabled. See [Message browsing](message-browsing.md).
2525
2626
The APIs for sessions exist on queue and subscription clients. There's an imperative model that controls when sessions and messages are received, and a handler-based model that hides the complexity of managing the receive loop.
2727

articles/virtual-network/what-is-ip-address-168-63-129-16.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ The public IP address 168.63.129.16 is used in all regions and all national clou
3939
- When the VM is part of a load balancer backend pool, [health probe](../load-balancer/load-balancer-custom-probe-overview.md) communication should be allowed to originate from 168.63.129.16. The default network security group configuration has a rule that allows this communication. This rule leverages the [AzureLoadBalancer](../virtual-network/service-tags-overview.md#available-service-tags) service tag. If desired this traffic can be blocked by configuring the network security group however this will result in probes that fail.
4040

4141
## Troubleshoot connectivity
42+
> [!NOTE]
43+
> When running the tests below, the action need to be run as Administrator (Windows) and Root (Linux) to ensure accurate results.
44+
4245
### Windows OS
4346
You can test communication to 168.63.129.16 by using the following tests with PowerShell.
4447

0 commit comments

Comments
 (0)