Skip to content

Commit 1335ab4

Browse files
authored
Merge pull request #99885 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 76d2342 + cecf2ac commit 1335ab4

32 files changed

+62
-43
lines changed

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ require multi-factor authentication as a grant access control.
201201
## Log in using Azure AD credentials to a Windows VM
202202

203203
> [!IMPORTANT]
204-
> Remote connection to VMs joined to Azure AD is only allowed from Windows 10 PCs that are Azure AD joined or hybrid Azure AD joined to the **same** directory as the VM. Additionally, to RDP using Azure AD credentials, the user must belong to one of the two RBAC roles, Virtual Machine Administrator Login or Virtual Machine User Login.
204+
> Remote connection to VMs joined to Azure AD is only allowed from Windows 10 PCs that are Azure AD joined or hybrid Azure AD joined to the **same** directory as the VM. Additionally, to RDP using Azure AD credentials, the user must belong to one of the two RBAC roles, Virtual Machine Administrator Login or Virtual Machine User Login. At this time, Azure Bastion cannot be used to login using Azure Active Directory authentication with the AADLoginForWindows extension. Only direct RDP is supported.
205205
206206
To login in to your Windows Server 2019 virtual machine using Azure AD:
207207

articles/active-directory/saas-apps/jiramicrosoft-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Use your Microsoft Azure Active Directory account with Atlassian JIRA server to
3939
To configure Azure AD integration with JIRA SAML SSO by Microsoft, you need the following items:
4040

4141
- An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
42-
- JIRA Core and Software 6.4 to 8.0 or JIRA Service Desk 3.0 to 3.5 should installed and configured on Windows 64-bit version
42+
- JIRA Core and Software 6.4 to 8.5.1 or JIRA Service Desk 3.0 to 4.6.0 should installed and configured on Windows 64-bit version
4343
- JIRA server is HTTPS enabled
4444
- Note the supported versions for JIRA Plugin are mentioned in below section.
4545
- JIRA server is reachable on internet particularly to Azure AD Login page for authentication and should able to receive the token from Azure AD
@@ -58,7 +58,7 @@ To get started, you need the following items:
5858
## Supported versions of JIRA
5959

6060
* JIRA Core and Software: 6.4 to 8.5.1
61-
* JIRA Service Desk 3.0.0 to 4.5.1
61+
* JIRA Service Desk 3.0.0 to 4.6.0
6262
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](jira52microsoft-tutorial.md)
6363

6464
> [!NOTE]

articles/app-service/app-service-web-tutorial-auth-aad.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ return new NoContentResult();
181181

182182
The first line makes a `DELETE /api/Todo/{id}` call to the back-end API app.
183183

184-
Save your all your changes. In the local terminal window, deploy your changes to the front-end app with the following Git commands:
184+
Save all your changes. In the local terminal window, deploy your changes to the front-end app with the following Git commands:
185185

186186
```bash
187187
git add .
@@ -308,7 +308,7 @@ public override void OnActionExecuting(ActionExecutingContext context)
308308

309309
This code adds the standard HTTP header `Authorization: Bearer <access-token>` to all remote API calls. In the ASP.NET Core MVC request execution pipeline, `OnActionExecuting` executes just before the respective action method (such as `GetAll()`) does, so each of your outgoing API call now presents the access token.
310310

311-
Save your all your changes. In the local terminal window, deploy your changes to the front-end app with the following Git commands:
311+
Save all your changes. In the local terminal window, deploy your changes to the front-end app with the following Git commands:
312312

313313
```bash
314314
git add .
@@ -392,7 +392,7 @@ The new change adds the `resolve` mapping that calls `/.auth/me` and sets the ac
392392

393393
### Deploy updates and test
394394

395-
Save your all your changes. In the local terminal window, deploy your changes to the front-end app with the following Git commands:
395+
Save all your changes. In the local terminal window, deploy your changes to the front-end app with the following Git commands:
396396

397397
```bash
398398
git add .

articles/azure-functions/durable/durable-functions-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ In the function chaining pattern, a sequence of functions executes in a specific
4444

4545
You can use Durable Functions to implement the function chaining pattern concisely as shown in the following example.
4646

47-
In this example, the values `F1`, `F2`, `F3`, and `F4` are the names of other functions in the function app. You can implement control flow by using normal imperative coding constructs. Code executes from the top down. The code can involve existing language control flow semantics, like conditionals and loops. You can include error handling logic in `try`/`catch`/`finally` blocks.
47+
In this example, the values `F1`, `F2`, `F3`, and `F4` are the names of other functions in the same function app. You can implement control flow by using normal imperative coding constructs. Code executes from the top down. The code can involve existing language control flow semantics, like conditionals and loops. You can include error handling logic in `try`/`catch`/`finally` blocks.
4848

4949
# [C#](#tab/csharp)
5050

@@ -349,7 +349,7 @@ An external client can deliver the event notification to a waiting orchestrator
349349
curl -d "true" http://localhost:7071/runtime/webhooks/durabletask/instances/{instanceId}/raiseEvent/ApprovalEvent -H "Content-Type: application/json"
350350
```
351351

352-
An event can also be raised using the durable orchestration client from another function:
352+
An event can also be raised using the durable orchestration client from another function in the same function app:
353353

354354
# [C#](#tab/csharp)
355355

articles/azure-functions/functions-create-first-java-maven.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ After the deployment completes, you see the URL you can use to access your funct
155155

156156
<!--- We can updates this to remove portal dependency after the Maven archetype returns the full URLs with keys on publish (https://github.com/microsoft/azure-maven-plugins/issues/571). -->
157157

158-
You can get the URL required to the trigger your function, with the function key, from the Azure portal.
158+
You can get the URL required to trigger your function, with the function key, from the Azure portal.
159159

160160
1. Browse to the [Azure portal], sign in, type the _appName_ of your function app into **Search** at the top of the page, and press enter.
161161

articles/azure-functions/functions-openapi-definition.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This tutorial uses an HTTP triggered function that takes two parameters:
3434
* The estimated time to make a turbine repair, in hours.
3535
* The capacity of the turbine, in kilowatts.
3636

37-
The function then calculates how much a repair will cost, and how much revenue the turbine could make in a 24 hour period. TO create the HTTP triggered function in the [Azure portal](https://portal.azure.com).
37+
The function then calculates how much a repair will cost, and how much revenue the turbine could make in a 24 hour period. To create the HTTP triggered function in the [Azure portal](https://portal.azure.com):
3838

3939
1. Expand your function app and select the **+** button next to **Functions**. Select **In-portal** > **Continue**.
4040

articles/azure-maps/drawing-tools-events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following are examples of some common scenarios that use the drawing tools e
3939

4040
### Select points in polygon area
4141

42-
The following code shows how to monitor the drawing of shapes that represent polygon areas (polygons, rectangles, and circles), and determine which data points on the map are within the drawn area. The `drawingcomplete` event is used to trigger the select logic. In the select logic, all data points on the map are looped through and tested for intersection with the polygon area of the drawn shape. This example makes use of the open-source [Turf.js](http://turfjs.org/) library to perform a spatial intersection calculation.
42+
The following code shows how to monitor the drawing of shapes that represent polygon areas (polygons, rectangles, and circles), and determine which data points on the map are within the drawn area. The `drawingcomplete` event is used to trigger the select logic. In the select logic, all data points on the map are looped through and tested for intersection with the polygon area of the drawn shape. This example makes use of the open-source [Turf.js](https://turfjs.org/) library to perform a spatial intersection calculation.
4343

4444
<br/>
4545

@@ -94,4 +94,4 @@ Learn more about the Services module:
9494
Check out more code samples:
9595

9696
> [!div class="nextstepaction"]
97-
> [Code sample page](https://aka.ms/AzureMapsSamples)
97+
> [Code sample page](https://aka.ms/AzureMapsSamples)

articles/azure-maps/map-accessibility.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Take a look at these useful accessibility tools:
142142
> [WAI-ARIA Overview](https://www.w3.org/WAI/standards-guidelines/aria/)
143143
144144
> [!div class="nextstepaction"]
145-
> [Web Accessibility Evaluation Tool (WAVE)](http://wave.webaim.org/)
145+
> [Web Accessibility Evaluation Tool (WAVE)](https://wave.webaim.org/)
146146
147147
> [!div class="nextstepaction"]
148148
> [WebAim color contrast checker](https://webaim.org/resources/contrastchecker/)

articles/azure-monitor/app/sampling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ apply sampling to those items already sampled in the SDK itself.'
544544
{
545545
if(somecondition)
546546
{
547-
((ISupportSampling)item).SamplingPercentage = 100;
547+
((ISupportSampling)telemetry).SamplingPercentage = 100;
548548
}
549549
}
550550
}

articles/billing/billing-ea-portal-rest-apis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Example: bearer \&lt;APIKey\&gt; |
7171

7272
### Swagger
7373

74-
A Swagger endpoint is available at [Enterprise Reporting v3 APIs](https://consumption.azure.com/swagger/ui/index)for the following APIs. Swagger helps inspect the API. Use Swagger to generate client SDKs using [AutoRest](https://github.com/Azure/AutoRest) or [Swagger CodeGen](http://swagger.io/swagger-codegen/). Data available after May 1, 2014 is available through the API.
74+
A Swagger endpoint is available at [Enterprise Reporting v3 APIs](https://consumption.azure.com/swagger/ui/index)for the following APIs. Swagger helps inspect the API. Use Swagger to generate client SDKs using [AutoRest](https://github.com/Azure/AutoRest) or [Swagger CodeGen](https://swagger.io/swagger-codegen/). Data available after May 1, 2014 is available through the API.
7575

7676
### API response codes
7777

0 commit comments

Comments
 (0)