Skip to content

Commit a62cbb5

Browse files
authored
Merge pull request #49751 from MicrosoftDocs/master
8/22 PM Publish
2 parents fab878f + 810f214 commit a62cbb5

File tree

58 files changed

+387
-583
lines changed

Some content is hidden

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

58 files changed

+387
-583
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27314,7 +27314,16 @@
2731427314
"source_path": "articles/cognitive-services/luis/Home.md",
2731527315
"redirect_url": "/azure/cognitive-services/luis/what-is-luis",
2731627316
"redirect_document_id": true
27317+
},
27318+
{
27319+
"source_path": "articles/data-factory/data-factory-monitor-oms.md",
27320+
"redirect_url": "/azure/data-factory/monitor-using-azure-monitor",
27321+
"redirect_document_id": true
27322+
},
27323+
{
27324+
"source_path": "articles/virtual-machines/linux/ansible-create-complete-vm.md",
27325+
"redirect_url": "/azure/virtual-machines/linux/ansible-create-vm",
27326+
"redirect_document_id": true
2731727327
}
27318-
2731927328
]
2732027329
}

articles/active-directory/active-directory-tou.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.tgt_pltfrm: na
1212
ms.devlang: na
1313
ms.topic: conceptual
1414
ms.component: compliance
15-
ms.date: 07/31/2018
15+
ms.date: 08/22/2018
1616
ms.author: rolyon
1717

1818
---
@@ -119,6 +119,8 @@ The following screen shows how Terms of use looks on mobile devices.
119119

120120
![Audit Event](media/active-directory-tou/mobile-tou.png)
121121

122+
Users are only required to accept the Terms of use once and they will not see the Terms of use again on subsequent sign ins.
123+
122124
### How users can review their Terms of use
123125
Users can review and see the Terms of use that they have accepted by using the following procedure.
124126

articles/active-directory/application-config-sso-problem-configure-password-sso-gallery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ There are two main causes to this issue:
6464

6565
- Depending on the security settings enabled in Internet Explorer, if the website is not part of a **Trusted Zone**, sometimes our script be blocked from executing for the application.
6666

67-
* To resolve this, instruct the user to **Add the application’s website** to the **Trusted Sites** list within their **Internet Explorer security settings**. You can send your users to the [How to add a site to my trusted sites list](https://answers.microsoft.com/ie/forum/ie9-windows_7/how-do-i-add-a-site-to-my-trusted-sites-list/98cc77c8-b364-e011-8dfc-68b599b31bf5) article for detailed instructions.
67+
* To resolve this, instruct the user to **Add the application’s website** to the **Trusted Sites** list within their **Internet Explorer security settings**. You can send your users to the [How to add a site to my trusted sites list](https://answers.microsoft.com/en-us/ie/forum/ie9-windows_7/how-do-i-add-a-site-to-my-trusted-sites-list/98cc77c8-b364-e011-8dfc-68b599b31bf5) article for detailed instructions.
6868

6969
- In rare circumstances, Internet Explorer’s security validation can sometimes cause the page to load more slowly than the execution of our script.
7070

articles/active-directory/privileged-identity-management/subscription-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This command retrieves a list of the subscriptions in your tenant. If there are
3838

3939
If this command returns a line in which SkuPartNumber is "AAD_PREMIUM_P2" or "EMSPREMIUM" and IsTrial is "True", this indicates an Azure AD Premium P2 trial is present in the tenant. If the subscription status is not enabled, and you do not have an Azure AD Premium P2 or EMS E5 subscription purchase, then you must purchase an Azure AD Premium P2 subscription or EMS E5 subscription to continue using Azure AD Privileged Identity Management.
4040

41-
Azure AD Premium P2 is available through a [Microsoft Enterprise Agreement](https://www.microsoft.com/licensing/licensing-programs/enterprise.aspx), the [Open Volume License Program](https://www.microsoft.com/licensing/licensing-programs/open-license.aspx), and the [Cloud Solution Providers program](https://partner.microsoft.com/cloud-solution-provider). Azure and Office 365 subscribers can also buy Azure AD Premium P2 online. More information on Azure AD Premium pricing and how to order online can be found at [Azure Active Directory Pricing](https://azure.microsoft.com/pricing/details/active-directory/).
41+
Azure AD Premium P2 is available through a [Microsoft Enterprise Agreement](https://www.microsoft.com/en-us/licensing/licensing-programs/enterprise.aspx), the [Open Volume License Program](https://www.microsoft.com/en-us/licensing/licensing-programs/open-license.aspx), and the [Cloud Solution Providers program](https://partner.microsoft.com/cloud-solution-provider). Azure and Office 365 subscribers can also buy Azure AD Premium P2 online. More information on Azure AD Premium pricing and how to order online can be found at [Azure Active Directory Pricing](https://azure.microsoft.com/pricing/details/active-directory/).
4242

4343
## Azure AD Privileged Identity Management is not available in tenant
4444

articles/ansible/ansible-create-configure-aks.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ description: Learn how to use Ansible to create and manage an Azure Kubernetes S
44
ms.service: ansible
55
keywords: ansible, azure, devops, bash, cloudshell, playbook, aks, container, Kubernetes
66
author: tomarcher
7-
manager: jpconnock
8-
editor: na
9-
ms.topic: article
10-
ms.tgt_pltfrm: vm-linux
11-
ms.date: 07/11/2018
7+
manager: jeconnoc
128
ms.author: tarcher
9+
ms.topic: tutorial
10+
ms.date: 08/21/2018
1311
---
1412

1513
# Create and configure Azure Kubernetes Service clusters in Azure using Ansible
@@ -18,9 +16,20 @@ Ansible allows you to automate the deployment and configuration of resources in
1816
## Prerequisites
1917
- **Azure subscription** - If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio) before you begin.
2018
- **Azure service principal** - When [creating the service principal](/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest#create-the-service-principal), note the following values: **appId**, **displayName**, **password**, and **tenant**.
21-
- **Configure Azure Cloud Shell** - If you are new to Azure Cloud Shell, the article, [Quickstart for Bash in Azure Cloud Shell](/azure/cloud-shell/quickstart), illustrates how to start and configure Cloud Shell.
22-
or
23-
- **Install and Configure Ansible** - Install Ansible on one of the following Linux platforms: [CentOS 7.4](../virtual-machines/linux/ansible-install-configure.md#centos-74), [Ubuntu 16.04 LTS](../virtual-machines/linux/ansible-install-configure.md#ubuntu-1604-lts), or [SLES 12 SP2](../virtual-machines/linux/ansible-install-configure.md#sles-12-sp2). Then [Create Azure credentials and configure Ansible](../virtual-machines/linux/ansible-install-configure.md#create-azure-credentials)
19+
20+
- **Configure Azure Cloud Shell** or **Install and configure Ansible on a Linux virtual machine**
21+
22+
**Configure Azure Cloud Shell**
23+
24+
1. **Configure Azure Cloud Shell** - If you are new to Azure Cloud Shell, the article, [Quickstart for Bash in Azure Cloud Shell](/azure/cloud-shell/quickstart), illustrates how to start and configure Cloud Shell.
25+
26+
**--OR--**
27+
28+
**Install and configure Ansible on a Linux virtual machine**
29+
30+
1. **Install Ansible** - Install Ansible on a [supported Linux platform](/azure/virtual-machines/linux/ansible-install-configure#install-ansible-on-an-azure-linux-virtual-machine).
31+
32+
1. **Configure Ansible** - [Create Azure credentials and configure Ansible](/azure/virtual-machines/linux/ansible-install-configure#create-azure-credentials)
2433

2534
> [!Note]
2635
> Ansible 2.6 is required to run the following the sample playbooks in this tutorial.

articles/app-service-mobile/TOC.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
#### [Client and server versioning](app-service-mobile-client-and-server-versioning.md)
7575

7676
### App Service Environment
77-
#### [Create a web app in an App Service Environment](../app-service/environment/app-service-web-how-to-create-a-web-app-in-an-ase.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
78-
#### [How To Create an ILB ASE Using Azure Resource Manager Templates](../app-service/environment/app-service-app-service-environment-create-ilb-ase-resourcemanager.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
79-
#### [Using an Internal Load Balancer](../app-service/environment/app-service-environment-with-internal-load-balancer.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
77+
#### [Create a web app in an App Service Environment](../app-service/environment/intro.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
78+
#### [Create and use an internal load balancer](../app-service/environment/create-ilb-ase.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
79+
#### [Create an ASE by using a template](../app-service/environment/create-from-template.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)
8080

8181
## Deploy
8282
### [Cloud sync deployment](../app-service/app-service-deploy-content-sync.md?toc=%2fazure%2fapp-service-mobile%2ftoc.json)

articles/app-service/app-service-web-open-source-technologies-faq.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,6 @@ This article has answers to frequently asked questions (FAQs) about issues with
2626

2727
[!INCLUDE [support-disclaimer](../../includes/support-disclaimer.md)]
2828

29-
## My ClearDB database is down. How do I resolve this?
30-
31-
For database-related issues, contact [ClearDB support](https://www.cleardb.com/developers/help/support).
32-
33-
For answers to common questions about ClearDB, see [ClearDB FAQs](https://docs.microsoft.com/azure/store-cleardb-faq/).
34-
35-
## Why wasn't my ClearDB database migrated during my subscription migration?
36-
37-
When you perform resource migration across subscriptions, some limitations apply. A ClearDB MySQL database is a third-party service and is not migrated during an Azure subscription migration.
38-
39-
If you don't manage the migration of your MySQL database before you migrate your Azure resources, your ClearDB MySQL database might be unavailable. To avoid this, first, manually migrate your ClearDB database, and then migrate the Azure subscription for your web app.
40-
41-
For more information, see [FAQs for ClearDB MySQL databases with Azure App Service](https://docs.microsoft.com/azure/store-cleardb-faq/).
42-
4329
## How do I turn on PHP logging to troubleshoot PHP issues?
4430

4531
To turn on PHP logging:

articles/automation/automation-quickstart-create-account.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create an Azure Automation account and run a runbook
44
services: automation
55
author: csand-msft
66
ms.author: csand
7-
ms.date: 12/13/2017
7+
ms.date: 08/22/2018
88
ms.topic: quickstart
99
ms.service: automation
1010
ms.component: process-automation
@@ -25,13 +25,13 @@ Sign in to Azure at https://portal.azure.com
2525

2626
1. Click the **Create a resource** button found on the upper left-hand corner of Azure.
2727

28-
1. Select **Monitoring + Management**, and then select **Automation**.
28+
1. Select **Management Tools**, and then select **Automation**.
2929

3030
1. Enter the account information. For **Create Azure Run As account**, choose **Yes** so that the artifacts to simplify authentication to Azure are enabled automatically. It is important to note, that when creating an Automation Account, the name cannot be changed after it is chosen. When complete, click **Create**, to start the Automation account deployment.
3131

3232
![Enter information about your Automation account in the page](./media/automation-quickstart-create-account/create-automation-account-portal-blade.png)
3333

34-
1. The Automation account is pinned to the Azure dashboard. When the deployment has completed, the Automation account overview automatically opens.
34+
1. When the deployment has completed, click ** **All Services**, select **Automation Accounts** and select the Automation Account you created.
3535

3636
![Automation account overview](./media/automation-quickstart-create-account/automation-account-overview.png)
3737

18.7 KB
Loading
5.86 KB
Loading

0 commit comments

Comments
 (0)