Skip to content

Commit f8a48a6

Browse files
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into vminsights-optout
2 parents b3af65e + e119413 commit f8a48a6

File tree

115 files changed

+1761
-1240
lines changed

Some content is hidden

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

115 files changed

+1761
-1240
lines changed

.markdownlint.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"MD007": false,
1010
"MD009": false,
1111
"MD010": false,
12-
"MD011": false,
1312
"MD012": false,
1413
"MD013": false,
1514
"MD014": false,
@@ -38,5 +37,7 @@
3837
"MD040": false,
3938
"MD041": false,
4039
"MD042": false,
41-
"MD045": false
40+
"MD045": false,
41+
"MD046": false,
42+
"MD047": false
4243
}

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@
135135
"redirect_url": "https://docs.microsoft.com/azure/architecture/topics/high-performance-computing/",
136136
"redirect_document_id": false
137137
},
138+
{
139+
"source_path": "articles/virtual-machines/windows/new-azvm-demo.md",
140+
"redirect_url": "/azure/virtual-machines/windows/quick-create-powershell",
141+
"redirect_document_id": false
142+
},
138143
{
139144
"source_path": "articles/virtual-machines/linux/high-performance-computing.md",
140145
"redirect_url": "https://docs.microsoft.com/azure/architecture/topics/high-performance-computing/",

articles/active-directory/develop/scenario-web-app-sign-user-app-registration.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ If you navigate to this link, you can create bootstrap the creation of your web
4545
1. If your account gives you access to more than one tenant, select your account in the top-right corner, and set your portal session to the desired Azure AD tenant.
4646
1. In the left-hand navigation pane, select the **Azure Active Directory** service, and then select **App registrations** > **New registration**.
4747
1. When the **Register an application** page appears, enter your application's registration information:
48-
- choose the supported account types for your application (See [Supported Account types](./v2-supported-account-types.md))
49-
- In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `AspNetCore-WebApp`.
50-
- In **Reply URL**, add the reply URL for your app, for instance `https://localhost:44321/`, and select **Register**.
48+
1. choose the supported account types for your application (See [Supported Account types](./v2-supported-account-types.md))
49+
1. In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `AspNetCore-WebApp`.
50+
1. In **Redirect URI**, add the type of application and the URI destination that will accept returned token responses after successfully authenticating. For example, `https://localhost:44321/`. Select **Register**.
5151
1. Select the **Authentication** menu, and then add the following information:
52-
- In **Reply URL**, add `https://localhost:44321/signin-oidc`, and select **Register**.
53-
- In the **Advanced settings** section, set **sign out URL** to `https://localhost:44321/signout-oidc`.
54-
- Under **Implicit grant**, check **ID tokens**.
55-
- Select **Save**.
52+
1. In **Reply URL**, add `https://localhost:44321/signin-oidc`.
53+
1. In the **Advanced settings** section, set **Logout URL** to `https://localhost:44321/signout-oidc`.
54+
1. Under **Implicit grant**, check **ID tokens**.
55+
1. Select **Save**.
5656

5757
### Register an app using PowerShell
5858

articles/app-service/app-service-web-get-started-java.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Then add the following plugin definition inside the `<build>` element of the `po
6262
<plugin>
6363
<groupId>com.microsoft.azure</groupId>
6464
<artifactId>azure-webapp-maven-plugin</artifactId>
65-
<version>1.5.4</version>
65+
<version>1.6.0</version>
6666
<configuration>
6767
<!-- Specify v2 schema -->
6868
<schemaVersion>v2</schemaVersion>
@@ -101,9 +101,9 @@ Update the following placeholders in the plugin configuration:
101101
| Placeholder | Description |
102102
| ----------- | ----------- |
103103
| `SUBSCRIPTION_ID` | The unique ID of the subscription you want to deploy your app to. Default subscription's ID can be found from the Cloud Shell or CLI using the `az account show` command. For all the available subscriptions, use the `az account list` command.|
104-
| `RESOURCEGROUP_NAME` | Name for the new resource group in which to create your app. By putting all the resources for an app in a group, you can manage them together. For example, deleting the resource group would delete all resources associated with the app. Update this value with a unique new resource group name, for example, *TestResources*. You will use this resource group name to clean up all Azure resources in a later section. |
105-
| `WEBAPP_NAME` | The app name will be part the host name for the app when deployed to Azure (WEBAPP_NAME.azurewebsites.net). Update this value with a unique name for the new App Service app, which will host your Java app, for example *contoso*. |
106-
| `REGION` | An Azure region where the app is hosted, for example `westus2`. You can get a list of regions from the Cloud Shell or CLI using the `az account list-locations` command. |
104+
| `RESOURCEGROUP_NAME` | Name for the new resource group in which to create your app. By putting all the resources for an app in a group, you can manage them together. For example, deleting the resource group would delete all resources associated with the app. Update this value with a unique new resource group name, for example, *myResourceGroup*. You will use this resource group name to clean up all Azure resources in a later section. |
105+
| `WEBAPP_NAME` | The app name will be part of the host name for the app when deployed to Azure (WEBAPP_NAME.azurewebsites.net). Update this value with a unique name for the new App Service app, which will host your Java app, for example *contoso*. |
106+
| `REGION` | An Azure region where the app is hosted, for example *westus2*. You can get a list of regions from the Cloud Shell or CLI using the `az account list-locations` command. |
107107

108108
## Deploy the app
109109

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

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

239239
> [!NOTE]
240-
> 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).
240+
> 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).
241241
242242
If you missed a step or made a typo somewhere earlier, you see a verification error at the bottom of the page.
243243

73.4 KB
Loading
-19.9 KB
Loading

articles/app-service/overview-diagnostics.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ Like proactive CPU monitoring, proactive auto-healing offers an easy, proactive
9999

100100
![Proactive auto-healing](./media/app-service-diagnostics/proactive-auto-healing-10.png)
101101

102-
## Change analysis
102+
## Change analysis (only for Windows app)
103103

104-
In a fast-paced development environment, sometimes it may be difficult to keep track of all the changes made to your app and let alone pinpoint on a change that caused an unhealthy behavior. Change analysis can help you narrow down on the changes made to your app to facilitate trouble-shooting experience. Change analysis is embedded in diagnostic report such as **Application Crashes** so you can use it concurrently with other metrics.
104+
In a fast-paced development environment, sometimes it may be difficult to keep track of all the changes made to your app and let alone pinpoint on a change that caused unhealthy behavior. Change analysis can help you narrow down on the changes made to your app to facilitate trouble-shooting experience. Change analysis is found in **Application Changes** and also embedded in a diagnostic report such as **Application Crashes** so you can use it concurrently with other metrics.
105105

106-
![Change analysis default page](./media/app-service-diagnostics/change-analysis-default-page-11.png)
106+
Change analysis has to be enabled before using the feature. For more information on change analysis, visit [Announcing the new change analysis experience in App Service Diagnostics](https://azure.github.io/AppService/2019/05/07/Announcing-the-new-change-analysis-experience-in-App-Service-Diagnostics-Analysis.html).
107107

108-
![Diff view](./media/app-service-diagnostics/diff-view-12.png)
108+
![Change analysis default page](./media/app-service-diagnostics/change-analysis-default-page-11.png)
109109

110-
Change analysis has to be enabled before using the feature. For more information on change analysis, visit [Announcing the new change analysis experience in App Service Diagnostics](https://azure.github.io/AppService/2019/05/07/Announcing-the-new-change-analysis-experience-in-App-Service-Diagnostics-Analysis.html).
110+
![Diff view](./media/app-service-diagnostics/diff-view-12.png)

articles/application-gateway/migrate-v1-v2.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: vhorne
66
ms.service: application-gateway
77
ms.topic: article
8-
ms.date: 6/12/2019
8+
ms.date: 6/18/2019
99
ms.author: victorh
1010
---
1111

@@ -128,7 +128,7 @@ To run the script:
128128
-sslCertificates $Certs `
129129
-trustedRootCertificates $trustedCert `
130130
-privateIpAddress "10.0.0.1" `
131-
-publicIpResourceName "MyPublicIP" `
131+
-publicIpResourceId "MyPublicIP" `
132132
-validateMigration -enableAutoScale
133133
```
134134

articles/azure-functions/functions-create-function-app-portal.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,7 @@ To learn more about storage account types, see [Introducing the Azure Storage Se
4848

4949
## Next steps
5050

51-
[!INCLUDE [Functions quickstart next steps](../../includes/functions-quickstart-next-steps.md)]
51+
While the Azure portal makes it easy to create and try out Functions, we recommend [local development](functions-develop-local.md). After creating a function app in the portal, you still need to add a function.
52+
53+
> [!div class="nextstepaction"]
54+
> [Add an HTTP triggered function](functions-create-first-azure-function.md#create-function)

0 commit comments

Comments
 (0)