Skip to content

Commit 577f5ca

Browse files
authored
Merge pull request #79776 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 d5803a4 + 1d6c5e2 commit 577f5ca

25 files changed

+56
-61
lines changed

articles/active-directory-b2c/active-directory-b2c-reference-spa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.subservice: B2C
1515

1616
# Single-page sign in using the OAuth 2.0 implicit flow in Azure Active Directory B2C
1717

18-
Many modern applications have a single-page app front end that primarily is written in JavaScript. Often, the app is written by using a framework like AngularJS, Ember.js, or Durandal. Single-page apps and other JavaScript apps that run primarily in a browser have some additional challenges for authentication:
18+
Many modern applications have a single-page app front end that primarily is written in JavaScript. Often, the app is written by using a framework like React, Angular or Vue.js. Single-page apps and other JavaScript apps that run primarily in a browser have some additional challenges for authentication:
1919

2020
- The security characteristics of these apps are different from traditional server-based web applications.
2121
- Many authorization servers and identity providers do not support cross-origin resource sharing (CORS) requests.

articles/active-directory/develop/msal-net-instantiate-confidential-client-config-options.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ An ASP.NET Core application configuration is described in an *appsettings.json*
5959
}
6060
```
6161

62-
Starting in MSAL.NET v3.x, you can configure your confidential client application from the config file. The classes related to the app configuration are located in the `Microsoft.Identity.Client.AppConfig` namespace.
62+
Starting in MSAL.NET v3.x, you can configure your confidential client application from the config file.
6363

64-
In the class where you want configure and instantiate your application, you need to declare a `ConfidentialClientApplicationOptions` object. Bind the configuration read from the source (including the appconfig.json file) to the instance of the application options:
64+
In the class where you want configure and instantiate your application, you need to declare a `ConfidentialClientApplicationOptions` object. Bind the configuration read from the source (including the appconfig.json file) to the instance of the application options, using the `IConfigurationRoot.Bind()` method from the [Microsoft.Extensions.Configuration.Binder nuget package](https://www.nuget.org/packages/Microsoft.Extensions.Configuration.Binder):
6565

6666
```csharp
67-
using Microsoft.Identity.Client.AppConfig;
67+
using Microsoft.Identity.Client;
6868

6969
private ConfidentialClientApplicationOptions _applicationOptions;
7070
_applicationOptions = new ConfidentialClientApplicationOptions();

articles/active-directory/devices/overview.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ In a mobile-first, cloud-first world, Azure Active Directory (Azure AD) enables
3030

3131
Through devices in Azure AD, your users are getting access to your corporate assets. To protect your corporate assets, as an IT administrator, you want to manage these devices identities. This enables you to make sure that your users are accessing your resources from devices that meet your standards for security and compliance.
3232

33-
Device identity management is also the foundation for [device-based Conditional Access](../conditional-access/require-managed-devices.md). With device-based Conditional Access, you can ensure that access to resources in your environment is only possible with managed devices.
33+
Device identity management is also the foundation for [device-based conditional access](../conditional-access/require-managed-devices.md). With device-based conditional access, you can ensure that access to resources in your environment is only possible with managed devices.
3434

3535
## Getting devices in Azure AD
3636

@@ -41,7 +41,7 @@ To get a device in Azure AD, you have two options:
4141

4242
**Registering** a device to Azure AD enables you to manage a device’s identity. When a device is registered, Azure AD device registration provides the device with an identity that is used to authenticate the device when a user signs-in to Azure AD. You can use the identity to enable or disable a device.
4343

44-
When combined with a mobile device management(MDM) solution such as Microsoft Intune, the device attributes in Azure AD are updated with additional information about the device. This allows you to create Conditional Access rules that enforce access from devices to meet your standards for security and compliance. For more information on enrolling devices in Microsoft Intune, see [What is device enrollment?](https://docs.microsoft.com/intune/device-enrollment)
44+
When combined with a mobile device management(MDM) solution such as Microsoft Intune, the device attributes in Azure AD are updated with additional information about the device. This allows you to create conditional access rules that enforce access from devices to meet your standards for security and compliance. For more information on enrolling devices in Microsoft Intune, see [What is device enrollment?](https://docs.microsoft.com/intune/device-enrollment)
4545

4646
**Joining** a device is an extension to registering a device. This means, it provides you with all the benefits of registering a device and in addition to this, it also changes the local state of a device. Changing the local state enables your users to sign-in to a device using an organizational work or school account instead of a personal account.
4747

@@ -68,6 +68,7 @@ The goal of Azure AD joined devices is to simplify:
6868
- Windows deployments of work-owned devices
6969
- Access to organizational apps and resources from any Windows device
7070
- Cloud-based management of work-owned devices
71+
- Users to sign in to their devices with their Azure AD or synced Active Directory work or school accounts.
7172

7273
![Azure AD registered devices](./media/overview/02.png)
7374

@@ -134,12 +135,10 @@ As a rule of a thumb, you should use:
134135
- Azure AD joined devices:
135136
- For devices that are owned by your organization
136137
- For devices that are **not** joined to an on-premises AD
137-
- To manually register devices with Azure AD
138138
- To change the local state of a device
139139
- Hybrid Azure AD joined devices for devices that are joined to an on-premises AD
140140
- For devices that are owned by your organization
141141
- For devices that are joined to an on-premises AD
142-
- To automatically register devices with Azure AD
143142
- To change the local state of a device
144143

145144
## License requirements
@@ -153,4 +152,4 @@ As a rule of a thumb, you should use:
153152
- Azure Active Directory registered Windows 10 devices, see [How to configure Azure Active Directory registered Windows 10 devices](../user-help/device-management-azuread-registered-devices-windows10-setup.md).
154153
- Azure Active Directory joined devices, see [How to plan your Azure Active Directory join implementation](azureadjoin-plan.md).
155154
- Hybrid Azure AD joined devices, see [How to plan your hybrid Azure Active Directory join implementation](hybrid-azuread-join-plan.md).
156-
- To learn more about device-based Conditional Access, see [Configure Azure Active Directory device-based Conditional Access policies](../conditional-access/require-managed-devices.md).
155+
- To learn more about device-based conditional access, see [Configure Azure Active Directory device-based conditional access policies](../conditional-access/require-managed-devices.md).

articles/app-service/app-service-web-tutorial-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ It might take some time for the new custom domain to be reflected in the app's *
153153
![CNAME record added](./media/app-service-web-tutorial-custom-domain/cname-record-added.png)
154154

155155
> [!NOTE]
156-
> A **Note Secure** label for your custom domain means that it's not yet bound to an SSL certificate, and any HTTPS request from a browser to your custom domain will receive and error or warning, depending on the browser. To add an SSL binding, see [Bind an existing custom SSL certificate to Azure App Service](app-service-web-tutorial-custom-ssl.md).
156+
> A **Not Secure** label for your custom domain means that it's not yet bound to an SSL certificate, and any HTTPS request from a browser to your custom domain will receive and error or warning, depending on the browser. To add an SSL binding, see [Bind an existing custom SSL certificate to Azure App Service](app-service-web-tutorial-custom-ssl.md).
157157
158158
If you missed a step or made a typo somewhere earlier, you see a verification error at the bottom of the page.
159159

articles/azure-monitor/app/api-custom-events-metrics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ namespace User.Namespace.Example01
244244
## TrackMetric
245245

246246
> [!NOTE]
247-
> Microsoft.ApplicationInsights.TelemetryClient.TrackMetric is deprecated in the .NET SDK. Metrics should always be pre-aggregated across a time period before being sent. Use one of the GetMetric(..) overloads to get a metric object for accessing SDK pre-aggregation capabilities. If you are implementing your own pre-aggregation logic, you can
248-
use the Track(ITelemetry metricTelemetry) method to send the resulting aggregates. If your application requires sending a separate telemetry item at every occasion without aggregation across time, you likely have a use case for event telemetry; see TelemetryClient.TrackEvent
247+
> Microsoft.ApplicationInsights.TelemetryClient.TrackMetric is not the preferred method for sending metrics. Metrics should always be pre-aggregated across a time period before being sent. Use one of the GetMetric(..) overloads to get a metric object for accessing SDK pre-aggregation capabilities. If you are implementing your own pre-aggregation logic, you can
248+
use the TrackMetric() method to send the resulting aggregates. If your application requires sending a separate telemetry item at every occasion without aggregation across time, you likely have a use case for event telemetry; see TelemetryClient.TrackEvent
249249
(Microsoft.ApplicationInsights.DataContracts.EventTelemetry).
250250

251251
Application Insights can chart metrics that are not attached to particular events. For example, you could monitor a queue length at regular intervals. With metrics, the individual measurements are of less interest than the variations and trends, and so statistical charts are useful.

articles/azure-monitor/app/asp-net-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The [Application Insights SDK (Software Development Kit) for ASP.NET Core](https
5454

5555
```xml
5656
<ItemGroup>
57-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.6.1" />
57+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.7.0" />
5858
</ItemGroup>
5959
```
6060

articles/azure-resource-manager/resource-group-lock-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ To lock a resource group, provide the name of the resource group.
147147
New-AzResourceLock -LockName LockGroup -LockLevel CanNotDelete -ResourceGroupName exampleresourcegroup
148148
```
149149

150-
To get information about a lock, use [Get-​Azure​Rm​Resource​Lock](/powershell/module/az.resources/get-azresourcelock). To get all the locks in your subscription, use:
150+
To get information about a lock, use [Get-AzResourceLock](/powershell/module/az.resources/get-azresourcelock). To get all the locks in your subscription, use:
151151

152152
```azurepowershell-interactive
153153
Get-AzResourceLock

articles/cosmos-db/cassandra-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ foreach (string key in insertResult.Info.IncomingPayload)
152152

153153
## Consistency mapping
154154

155-
Azure Cosmos DB Cassandra API provides choice of consistency for read operations. The consistency mapping is detailed [here[(https://docs.microsoft.com/en-us/azure/cosmos-db/consistency-levels-across-apis#cassandra-mapping).
155+
Azure Cosmos DB Cassandra API provides choice of consistency for read operations. The consistency mapping is detailed [here[(https://docs.microsoft.com/azure/cosmos-db/consistency-levels-across-apis#cassandra-mapping).
156156

157157
## Permission and role management
158158

articles/dev-spaces/how-dev-spaces-works.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ The `up` command uploads your application source files and other artifacts neede
206206
1. Builds the container for your application.
207207
1. Deploys your application to the dev space.
208208
1. Creates a publicly accessible DNS name for your application endpoint if configured.
209-
1. Uses *port-forward* to provide access to your application endpoint using http://locahost.
209+
1. Uses *port-forward* to provide access to your application endpoint using http://localhost.
210210
1. Forwards stdout and stderr to the client-side tooling.
211211

212212

@@ -441,4 +441,4 @@ To get started with team development, see the following how-to articles:
441441

442442

443443

444-
[supported-regions]: about.md#supported-regions-and-configurations
444+
[supported-regions]: about.md#supported-regions-and-configurations

articles/iot-edge/tutorial-machine-learning-edge-02-prepare-environment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The DevVM directory contains the files needed to create an Azure virtual machine
5656
1. Open Powershell as an administrator and navigate to the directory where you downloaded the code. We will refer to the root directory for your source as `<srcdir>`.
5757

5858
```powershell
59-
cd \<srcdir\>\IoTEdgeAndMlSample\DevVM
59+
cd <srcdir>\IoTEdgeAndMlSample\DevVM
6060
```
6161
6262
2. Run the following command to allow execution of scripts. Choose **Yes to All** when prompted.
@@ -137,7 +137,7 @@ Now that you have connected to the development machine, add some useful extensio
137137
3. Run the script.
138138
139139
```powershell
140-
.\\Enable-CodeExtensions.ps1
140+
.\Enable-CodeExtensions.ps1
141141
```
142142
143143
4. The script will run for a few minutes installing VS code extensions:

0 commit comments

Comments
 (0)