Skip to content

Commit 57eb9ac

Browse files
authored
Merge pull request #97432 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents c31dbf6 + 91a9fa2 commit 57eb9ac

File tree

88 files changed

+687
-597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+687
-597
lines changed

articles/active-directory-b2c/active-directory-b2c-get-started-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ms.subservice: B2C
3030
1. Sign in to the [Azure portal](https://portal.azure.com)
3131
1. Use the **Directory + subscription** filter in the top menu to select the directory that contains your Azure AD B2C tenant.
3232
1. In the left menu, select **Azure AD B2C**. Or, select **All services** and search for and select **Azure AD B2C**.
33-
1. On the Overview page, select **Identity Experience Framework**.
33+
1. On the Overview page, select **Identity Experience Framework** from the **Policies** pane.
3434

3535
### Create the signing key
3636

articles/active-directory-domain-services/tutorial-configure-ldaps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Let's create a rule to allow inbound secure LDAP access over TCP port 636 from a
206206

207207
1. In the Azure portal, select *Resource groups* on the left-hand side navigation.
208208
1. Choose you resource group, such as *myResourceGroup*, then select your network security group, such as *aaads-nsg*.
209-
1. The list of existing inbound and outbound security rules are displayed. On the left-hand side of the network security group windows, choose **Security > Inbound security rules**.
209+
1. The list of existing inbound and outbound security rules are displayed. On the left-hand side of the network security group windows, choose **Settings > Inbound security rules**.
210210
1. Select **Add**, then create a rule to allow *TCP* port *636*. For improved security, choose the source as *IP Addresses* and then specify your own valid IP address or range for your organization.
211211

212212
| Setting | Value |
@@ -241,7 +241,7 @@ The following example DNS entry, either with your external DNS provider or in th
241241

242242
## Test queries to the managed domain
243243

244-
To connect and bind to your Azure AD DS managed domain and search over LDAP, you use the *LDP.exe* too. This tool is included in the Remote Server Administration Tools (RSAT) package. For more information, see [install Remote Server Administration Tools][rsat].
244+
To connect and bind to your Azure AD DS managed domain and search over LDAP, you use the *LDP.exe* tool. This tool is included in the Remote Server Administration Tools (RSAT) package. For more information, see [install Remote Server Administration Tools][rsat].
245245

246246
1. Open *LDP.exe* and connect to the managed domain. Select **Connection**, then choose **Connect...**.
247247
1. Enter the secure LDAP DNS domain name of your managed domain created in the previous step, such as *ldaps.contoso.com*. To use secure LDAP, set **Port** to *636*, then check the box for **SSL**.

articles/active-directory/develop/authentication-flows-app-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ Scenarios that involve acquiring tokens also map to OAuth 2.0 authentication flo
258258

259259
<tr>
260260
<td><a href="scenario-daemon-overview.md"><img alt="Daemon app that calls web APIs" src="media/scenarios/daemon-app.svg"></a></td>
261-
<td><a href=scenario-daemon-overview.md">A daemon app that calls web APIs</a></td>
261+
<td><a href="scenario-daemon-overview.md">A daemon app that calls web APIs</a></td>
262262
<td><a href="v2-oauth2-client-creds-grant-flow.md">Client credentials</a></td>
263263
<td>App-only permissions with no user and used only in Azure AD organizations</td>
264264
</tr>

articles/app-service/containers/quickstart-java.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ The deploy process to Azure App Service uses account credentials from the Azure
4949
az login
5050
```
5151

52-
Then you can configure the deployment, run the maven command `mvn com.microsoft.azure:azure-webapp-maven-plugin:1.8.0:config` in the Command Prompt and use the default configurations by pressing **ENTER** until you get the **Confirm (Y/N)** prompt, then press **'y'** and the configuration is done.
52+
Then you can configure the deployment, run the maven command in the Command Prompt and use the default configurations by pressing **ENTER** until you get the **Confirm (Y/N)** prompt, then press **'y'** and the configuration is done.
53+
```cmd
54+
mvn com.microsoft.azure:azure-webapp-maven-plugin:1.8.0:config
55+
```
56+
A sample process looks like:
5357

5458
```cmd
5559
~@Azure:~/helloworld$ mvn com.microsoft.azure:azure-webapp-maven-plugin:1.8.0:config
@@ -101,6 +105,9 @@ Navigate to `pom.xml` again to see the plugin configuration is updated, You can
101105
[`<runtime>`](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#runtimesetting) | true | The runtime environment configuration, you could see the detail [here](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#runtimesetting). | 0.1.0+
102106
[`<deployment>`](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#deploymentsetting) | true | The deployment configuration, you could see the details [here](/java/api/overview/azure/maven/azure-webapp-maven-plugin/readme#deploymentsetting). | 0.1.0+
103107

108+
> [!div class="nextstepaction"]
109+
> [I ran into an issue](https://www.research.net/r/javae2e?tutorial=app-service-linux-quickstart&step=config)
110+
104111
## Deploy the app
105112

106113
Deploy your Java app to Azure using the following command:
@@ -115,9 +122,12 @@ Once deployment has completed, browse to the deployed application using the foll
115122

116123
**Congratulations!** You've deployed your first Java app to App Service on Linux.
117124

125+
> [!div class="nextstepaction"]
126+
> [I ran into an issue](https://www.research.net/r/javae2e?tutorial=app-service-linux-quickstart&step=deploy)
127+
118128
## Clean up resources
119129

120-
In the preceding steps, you created Azure resources in a resource group. If you don't expect to need these resources in the future, delete the resource group by running the following command in the Cloud Shell:
130+
In the preceding steps, you created Azure resources in a resource group. If you don't expect to need these resources in the future, delete the resource group from portal, or by running the following command in the Cloud Shell:
121131

122132
```azurecli-interactive
123133
az group delete --name <your resource group name; for example: helloworld-1558400876966-rg> --yes
@@ -138,3 +148,6 @@ This command may take a minute to run.
138148
139149
> [!div class="nextstepaction"]
140150
> [Other Azure for Java Developers Resources](/java/azure/)
151+
152+
> [!div class="nextstepaction"]
153+
> [Learn More about Maven plugins for Azure](https://github.com/microsoft/azure-maven-plugins)

articles/asc-for-iot/azure-iot-security-local-configuration-csharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Understanding Azure Security Center for agent local configuration file for C# | Microsoft Docs
3-
description: Learn about Azure Security Center for agent local configuration file for C#.
2+
title: Understanding Azure Security Center for IoT security agent local configuration file for C# | Microsoft Docs
3+
description: Learn more about the Azure Security Center for IoT security service, security agent local configuration file for C#.
44
services: asc-for-iot
55
ms.service: asc-for-iot
66
documentationcenter: na

articles/asc-for-iot/how-to-agent-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Configure Azure Security Center for IoT agent| Microsoft Docs
3-
description: Learn how to configure agents for use with Azure Security Center for IoT.
3+
description: Learn how to configure Azure Security Center for IoT security agents for use with the Azure Security Center for IoT security service.
44
services: asc-for-iot
55
ms.service: asc-for-iot
66
documentationcenter: na

articles/asc-for-iot/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: What is Azure Security Center for IoT | Microsoft Docs
3-
description: Learn about Azure Security Center for IoT features and service.
3+
description: Learn more about Azure Security Center for IoT features and service, and understand how Azure Security Center for IoT provides comprehensive IoT security across all of your IoT assets.
44
services: asc-for-iot
55
ms.service: asc-for-iot
66
documentationcenter: na

articles/asc-for-iot/quickstart-create-custom-alerts.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
2+
23
title: "Quickstart: Create custom alerts for Azure Security Center for IoT"
3-
description: In this quickstart, create and assign custom device alerts for Azure Security Center for IoT.
4+
description: Understand, create and assign custom device alerts for the Azure Security Center for IoT security service.
45
services: asc-for-iot
56
ms.service: asc-for-iot
67
documentationcenter: na

articles/asc-for-iot/quickstart-onboard-iot-hub.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
title: "Quickstart: Enable Azure Security Center for IoT service in IoT Hub"
4-
description: In this quickstart, learn how to enable Azure Security Center for IoT service in your IoT Hub.
4+
description: Learn how to onboard and enable the Azure Security Center for IoT security service in your Azure IoT Hub.
55
services: asc-for-iot
66
ms.service: asc-for-iot
77
documentationcenter: na

articles/asc-for-iot/security-agents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Get started using Azure Security Center for IoT security agents| Microsoft Docs
3-
description: Get started with Azure Security Center for IoT security agents.
3+
description: Get started with understanding, configuring, deploying and using Azure Security Center for IoT security service agents on your IoT devices.
44
services: asc-for-iot
55
ms.service: asc-for-iot
66
documentationcenter: na

0 commit comments

Comments
 (0)