Skip to content

Commit 4b17c41

Browse files
authored
Merge pull request #295770 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 30e7e6d + e9e84f5 commit 4b17c41

10 files changed

+38
-31
lines changed

articles/active-directory-b2c/identity-provider-apple-id.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ If the sign-in process is successful, your browser is redirected to `https://jwt
110110

111111
## Signing the client secret
112112

113-
Use the .p8 file you downloaded previously to sign the client secret into a JWT token. There are many libraries that can create and sign the JWT for you. Use the [Azure Function that creates a token](https://github.com/azure-ad-b2c/samples/tree/master/policies/sign-in-with-apple/azure-function) for you.
113+
Use the .p8 file you downloaded previously to sign the client secret into a JWT. There are many libraries that can create and sign the JWT for you. Use the [Azure Function that creates a token](https://github.com/azure-ad-b2c/samples/tree/master/policies/sign-in-with-apple/azure-function) for you.
114114

115115
1. Create an [Azure Function](../azure-functions/functions-create-function-app-portal.md).
116116
1. Under **Developer**, select **Code + Test**.
@@ -154,7 +154,7 @@ You need to store the client secret that you previously recorded in your Azure A
154154
1. Select **Policy Keys**, and then select **Add**.
155155
1. For **Options**, choose **Manual**.
156156
1. Enter a **Name** for the policy key. For example, "AppleSecret". The prefix "B2C_1A_" is added automatically to the name of your key.
157-
1. In **Secret**, enter the value of a token returned by the Azure Function (a JWT token).
157+
1. In **Secret**, enter the value of a token returned by the Azure Function (a JWT).
158158
1. For **Key usage**, select **Signature**.
159159
1. Select **Create**.
160160

articles/active-directory-b2c/session-behavior.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@ The following example illustrates the JWT and SAML token issuers with single sig
317317
<ClaimsProvider>
318318
<DisplayName>Local Account SignIn</DisplayName>
319319
<TechnicalProfiles>
320-
<!-- JWT Token Issuer -->
320+
<!-- JWT Issuer -->
321321
<TechnicalProfile Id="JwtIssuer">
322-
<DisplayName>JWT token Issuer</DisplayName>
322+
<DisplayName>JWT Issuer</DisplayName>
323323
<Protocol Name="OpenIdConnect" />
324324
<OutputTokenFormat>JWT</OutputTokenFormat>
325325
...

articles/active-directory-b2c/troubleshoot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ The following screenshot shows an example of the Application Insights trace log
155155

156156
![Screenshot of Azure AD B2C extension Azure AD B2C trace report.](./media/troubleshoot-custom-policies/vscode-extension-application-insights-report.png)
157157

158-
## Troubleshoot JWT tokens
158+
## Troubleshoot JWTs
159159

160-
For JWT token validation and debugging purposes, your can decode JWTs using a site like [https://jwt.ms](https://jwt.ms). Create a test application that can redirect to `https://jwt.ms` for token inspection. If you haven't already done so, [register a web application](tutorial-register-applications.md), and [enable ID token implicit grant](tutorial-register-applications.md#enable-id-token-implicit-grant).
160+
For JWT validation and debugging purposes, your can decode JWTs using a site like [https://jwt.ms](https://jwt.ms). Create a test application that can redirect to `https://jwt.ms` for token inspection. If you haven't already done so, [register a web application](tutorial-register-applications.md), and [enable ID token implicit grant](tutorial-register-applications.md#enable-id-token-implicit-grant).
161161

162-
![Screenshot of JWT token preview.](./media/troubleshoot-custom-policies/jwt-token-preview.png)
162+
![Screenshot of JWT preview.](./media/troubleshoot-custom-policies/jwt-token-preview.png)
163163

164164
Use **Run now** and `https://jwt.ms` to test your policies independently of your web or mobile application. This website acts like a relying party application. It displays the contents of the JSON web token (JWT) that your Azure AD B2C policy generates.
165165

articles/app-service/monitor-instances-health-check.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ function envVarMatchesHeader(headerValue) {
143143
144144
## Instances
145145

146-
Once Health check is enabled, you can restart and monitor the status of your application instances from the instances tab. The instances tab shows your instance's name and the status of that application's instance. You can also manually restart the instance from this tab.
146+
Once Health check is enabled, you can restart and monitor the status of your application instances from the instances tab. The instances tab shows your instance's name and the status of that application's instance. You can also manually do an advanced application restart from this tab by using the "Restart" button.
147147

148-
If the status of your application instance is "unhealthy," you can restart the instance manually by using the restart button in the table. Keep in mind that any other applications hosted on the same App Service plan as the instance will also be affected by the restart. If there are other applications using the same App Service plan as the instance, they're listed on the opening blade from the restart button.
148+
If the status of your application instance is "unhealthy," you can restart the worker process of the respective app manually by using the restart button in the table. This will not be affecting any of the other applications hosted on the same App Service plan. If there are other applications using the same App Service plan as the instance, they're listed on the opening blade from the restart button.
149149

150-
If you restart the instance and the restart process fails, you'll be given the option to replace the worker. (Only one instance can be replaced per hour.) This will also affect any applications using the same App Service plan.
150+
If you restart the instance and the restart process fails, you'll be given the option to replace the worker. (Only one instance can be replaced per hour.) This will affect any applications using the same App Service plan.
151151

152152
For Windows applications, you can also view processes via the Process Explorer. This gives you further insight on the instance's processes, including thread count, private memory, and total CPU time.
153153

articles/azure-functions/functions-how-to-azure-devops.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,14 @@ variables:
202202
# Agent VM image name
203203
vmImageName: 'ubuntu-latest'
204204
205-
- task: AzureFunctionApp@1 # Add this at the end of your file
205+
- task: DownloadBuildArtifacts@1 # Add this at the end of your file
206+
inputs:
207+
buildType: 'current'
208+
downloadType: 'single'
209+
artifactName: 'drop'
210+
itemPattern: '**/*.zip'
211+
downloadPath: '$(System.ArtifactsDirectory)'
212+
- task: AzureFunctionApp@1
206213
inputs:
207214
azureSubscription: <Azure service connection>
208215
appType: functionAppLinux # default is functionApp

articles/azure-signalr/signalr-concept-internals.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ There are three steps to establish persistent connections between the client and
6060
```
6161
{
6262
"url":"https://test.service.signalr.net/client/?hub=chat&...",
63-
"accessToken":"<a typical JWT token>"
63+
"accessToken":"<a typical JWT>"
6464
}
6565
```
6666
- For ASP.NET SignalR, a typical redirect response looks like:
6767
```
6868
{
6969
"ProtocolVersion":"2.0",
7070
"RedirectUrl":"https://test.service.signalr.net/aspnetclient",
71-
"AccessToken":"<a typical JWT token>"
71+
"AccessToken":"<a typical JWT>"
7272
}
7373
```
7474

articles/azure-signalr/signalr-reference-data-plane-rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ A typical negotiation response has this format:
3939
```json
4040
{
4141
"url": "https://<service_name>.service.signalr.net/client/?hub=<hub_name>",
42-
"accessToken": "<a typical JWT token>"
42+
"accessToken": "<a typical JWT>"
4343
}
4444
```
4545

articles/azure-web-pubsub/concept-service-internals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ The maximum allowed message size for one WebSocket frame is **1MB**.
197197
198198
#### Authentication workflow
199199
200-
Client uses a signed JWT token to connect to the service. The upstream can also reject the client when it's `connect` event handler of the incoming client. The event handler authenticates the client by specifying the `userId` and the `role`s the client has in the webhook response, or decline the client with 401. [Event handler](#event-handler) section describes it in detail.
200+
Client uses a signed JSON Web Token (JWT) to connect to the service. The upstream can also reject the client when it's `connect` event handler of the incoming client. The event handler authenticates the client by specifying the `userId` and the `role`s the client has in the webhook response or decline the client with 401. [Event handler](#event-handler) section describes it in detail.
201201
202202
The following graph describes the workflow.
203203

articles/azure-web-pubsub/howto-connect-mqtt-websocket-client.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ This is the default workflow, shown as follows:
5959

6060
1. The client negotiates with your auth server. The auth server contains the authorization middleware, which handles the client request and signs a JWT for the client to connect to the service.
6161
1. The auth server returns the JWT to the client.
62-
1. The client tries to connect to the Web PubSub service with the JWT token returned from the auth server. The token can be in either the query string, as `/clients/mqtt/hubs/{hub}?access_token={token}`, or the `Authorization` header, as `Authorization: Bearer {token}`.
62+
1. The client tries to connect to the Web PubSub service with the JWT returned from the auth server. The token can be in either the query string, as `/clients/mqtt/hubs/{hub}?access_token={token}`, or the `Authorization` header, as `Authorization: Bearer {token}`.
6363

6464
#### Supported claims
65-
You could also configure properties for the client connection when generating the access token by specifying special claims inside the JWT token:
65+
You could also configure properties for the client connection when generating the access token by specifying special claims inside the JWT:
6666

6767
| Description | Claim type | Claim value | Notes |
6868
| --- | --- | --- | --- |

articles/storage/blobs/azcopy-cost-estimation.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ Using the [Sample prices](#sample-prices) that appear in this article, the follo
4747

4848
| Price factor | Hot | Cool | Cold | Archive |
4949
|------------------------------------------------------------------|-------------|-------------|--------------|--------------|
50-
| Price of a single write operation (price / 10,000) | $0.0000055 | $0.00001 | $0.000018 | $0.000011 |
50+
| Price of a single write operation | $0.0000055 | $0.00001 | $0.000018 | $0.000011 |
5151
| **Cost of write operations (641,000 * operation price)** | **$3.5255** | **$6.4100** | **$11.5380** | **$7.0510** |
52-
| Price of a single _other_ operation (price / 10,000) | $0.00000044 | $0.00000044 | $0.00000052 | $0.00000044 |
52+
| Price of a single _other_ operation | $0.00000044 | $0.00000044 | $0.00000052 | $0.00000044 |
5353
| **Cost to get blob properties (1000 * _other_ operation price)** | **$0.0004** | **$0.0004** | **$0.0005** | **$0.00044** |
5454
| **Total cost (write + properties)** | **$3.53** | **$6.41** | **$11.54** | **$7.05** |
5555

@@ -77,9 +77,9 @@ Using the [Sample prices](#sample-prices) that appear in this article, the follo
7777

7878
| Price factor | Hot | Cool | Cold | Archive |
7979
|------------------------------------------------------------|-------------|--------------|--------------|--------------|
80-
| Price of a single write operation (price / 10,000) | $0.00000720 | $0.000013 | $0.0000234 | $0.0000143 |
80+
| Price of a single write operation | $0.00000720 | $0.000013 | $0.0000234 | $0.0000143 |
8181
| **Cost of write operations (1,281,000 * operation price)** | **$9.2332** | **$16.6530** | **$29.9754** | **$18.3183** |
82-
| Price of a single _other_ operation (price / 10,000) | $0.00000044 | $0.00000044 | $0.00000068 | $0.00000044 |
82+
| Price of a single _other_ operation | $0.00000044 | $0.00000044 | $0.00000068 | $0.00000044 |
8383
| **Cost to get blob properties (1000 * operation price)** | **$0.0004** | **$0.0004** | **$0.0007** | **$0.0004** |
8484
| **Total cost (write + properties)** | **$9.22** | **$16.65** | **$29.98** | **$18.32** |
8585

@@ -102,11 +102,11 @@ Using the [Sample prices](#sample-prices) that appear in this article, the follo
102102
103103
| Price factor | Hot | Cool | Cold |
104104
|----------------------------------------------------------|----------------|----------------|----------------|
105-
| Price of a single list operation (price/ 10,000) | $0.0000055 | $0.0000055 | $0.0000065 |
105+
| Price of a single list operation | $0.0000055 | $0.0000055 | $0.0000065 |
106106
| **Cost of listing operations (1 * operation price)** | **$0.0000055** | **$0.0000050** | **$0.0000065** |
107-
| Price of a single _other_ operation (price / 10,000) | $0.00000044 | $0.00000044 | $0.00000052 |
107+
| Price of a single _other_ operation | $0.00000044 | $0.00000044 | $0.00000052 |
108108
| **Cost to get blob properties (1000 * operation price)** | **$0.00044** | **$0.00044** | **$0.00052** |
109-
| Price of a single read operation (price / 10,000) | $0.00000044 | $0.000001 | $0.00001 |
109+
| Price of a single read operation | $0.00000044 | $0.000001 | $0.00001 |
110110
| **Cost of read operations (1000 * operation price)** | **$0.00044** | **$0.001** | **$0.01** |
111111
| Price of data retrieval (per GiB) | $0.00 | $0.01 | $0.03 |
112112
| **Cost of data retrieval 1000 * (5 * operation price)** | **$0.00** | **$50.00** | **$150.00** |
@@ -136,11 +136,11 @@ Using the [Sample prices](#sample-prices) that appear in this article, the follo
136136
137137
| Price factor | Hot | Cool | Cold |
138138
|-----------------------------------------------------------|----------------|----------------|----------------|
139-
| Price of a single list operation (price/ 10,000) | $0.0000055 | $0.0000055 | $0.0000065 |
139+
| Price of a single list operation | $0.0000055 | $0.0000055 | $0.0000065 |
140140
| **Cost of listing operations (1 * operation price)** | **$0.0000055** | **$0.0000050** | **$0.0000065** |
141-
| Price of a single _other_ operation (price / 10,000) | $0.00000044 | $0.00000044 | $0.00000052 |
141+
| Price of a single _other_ operation | $0.00000044 | $0.00000044 | $0.00000052 |
142142
| **Cost to get blob properties (1000 * operation price)** | **$0.00044** | **$0.00044** | **$0.00052** |
143-
| Price of a single read operation (price / 10,000) | $0.00000060 | $0.00000130 | $0.00001300 |
143+
| Price of a single read operation | $0.00000060 | $0.00000130 | $0.00001300 |
144144
| **Cost of read operations (1,281,000 * operation price)** | **$0.73017** | **$1.6653** | **$16.653** |
145145
| Price of data retrieval (per GiB) | $0.00000000 | $0.01000000 | $0.03000000 |
146146
| **Cost of data retrieval 1000 * (5 * operation price)** | **$0.00** | **$50.00** | **$150.00** |
@@ -162,11 +162,11 @@ For each blob, AzCopy uses the [Get Blob Properties](/rest/api/storageservices/g
162162

163163
| Price factor | Hot | Cool | Cold |
164164
|----------------------------------------------------------|----------------|----------------|----------------|
165-
| Price of a single list operation (price/ 10,000) | $0.0000055 | $0.0000055 | $0.0000065 |
165+
| Price of a single list operation | $0.0000055 | $0.0000055 | $0.0000065 |
166166
| **Cost of listing operations (1 * operation price)** | **$0.0000055** | **$0.0000055** | **$0.0000065** |
167-
| Price of a single other operations (price / 10,000) | $0.00000044 | $0.00000044 | $0.00000052 |
167+
| Price of a single other operations | $0.00000044 | $0.00000044 | $0.00000052 |
168168
| **Cost to get blob properties (2000 * operation price)** | **$0.00088** | **$0.00088** | **$0.00104** |
169-
| Price of a single write operation (price / 10,000) | $0.0000055 | $0.00001 | $0.000018 |
169+
| Price of a single write operation | $0.0000055 | $0.00001 | $0.000018 |
170170
| **Cost to write (1000 * operation price)** | **$0.0055** | **$0.01** | **$0.018** |
171171
| **Total cost (listing + properties + write)** | **$0.0064** | **$0.0109** | **$0.0190** |
172172

@@ -177,7 +177,7 @@ This scenario is identical to the previous one except that you're also billed fo
177177
| Price factor | Hot | Cool | Cold |
178178
|---------------------------------------------------------|--------------|--------------|---------------|
179179
| **Total from previous section** | **$0.0064** | **$0.0109** | **$0.0190** |
180-
| Price of a single read operation (price / 10,000) | $0.00000044 | $0.000001 | $0.00001 |
180+
| Price of a single read operation | $0.00000044 | $0.000001 | $0.00001 |
181181
| **Cost of read operations (1,000 * operation price)** | **$0.00044** | **$0.001** | **$0.01** |
182182
| Price of data retrieval (per GiB) | Free | $0.01 | $0.03 |
183183
| **Cost of data retrieval 1000 * (5 * operation price)** | **$0.00** | **$50.00** | **$150.00** |

0 commit comments

Comments
 (0)