Bringing even with master.

Author: v-alje

.openpublishing.redirection.json

@@ -2051,6 +2051,11 @@
             "redirect_url": "/azure/managed-applications/microsoft-storage-storageaccountselector",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/managed-applications/microsoft-network-availabilityzonedropdown.md",
+            "redirect_url": "/azure/managed-applications/create-uidefinition-elements",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/solution-dev-test-environments.md",
             "redirect_url": "/azure/lab-services/devtest-lab-overview",

articles/active-directory-b2c/active-directory-b2c-user-migration.md

@@ -46,6 +46,7 @@ Make sure the server  that you're using for Azure Multi-Factor Authentication me
 |:--- |:--- |
 | Hardware |<li>200 MB of hard disk space</li><li>x32 or x64 capable processor</li><li>1 GB or greater RAM</li> |
 | Software |<li>Windows Server 2016</li><li>Windows Server 2012 R2</li><li>Windows Server 2012</li><li>Windows Server 2008 R2</li><li>Windows Server 2008, SP1, SP2</li><li>Windows Server 2003 R2</li><li>Windows Server 2003, SP1, SP2</li><li>Windows 10</li><li>Windows 8.1, all editions</li><li>Windows 8, all editions</li><li>Windows 7, all editions</li><li>Windows Vista, all editions, SP1, SP2</li><li>Microsoft .NET 4.0 Framework</li><li>IIS 7.0 or greater if installing the user portal or web service SDK</li> |
+| Permissions | Domain Administrator or Enterprise Administrator account to register with Active Directory |
 
 ### Azure MFA Server Components
 

articles/active-directory/authentication/howto-mfaserver-deploy.md

@@ -14,7 +14,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/09/2018
+ms.date: 09/19/2018
 ms.author: andret
 ms.custom: aaddev 
 ---

articles/active-directory/develop/tutorial-v2-windows-desktop.md

@@ -33,12 +33,8 @@ Azure AD helps you to:
 
 -   Take advantage of the [high-availability and reliability](https://docs.microsoft.com/azure/architecture/checklist/availability) of a worldwide, enterprise-grade, cloud-based identity and access management solution.
 
-<<<<<<< HEAD
-    Additionally, with just [four clicks](../hybrid/how-to-connect-install-express.md), you can integrate Azure AD with an existing Windows Server Active Directory, letting your organization use your existing on-premises identity investments to manage cloud-based SaaS app access.
-=======
 ## Who uses Azure AD
 Azure AD is intended for IT admins, app developers, and for users of Office 365, Azure, or Dynamics CRM Online.
->>>>>>> 73f447b1499ba1f189efb6832ad759f1230e55a2
 
 - **IT admins.** Azure AD provides a more secure solution for your organization through the use of stronger identity management and single sign-on (SSO) access to thousands of [cloud-based SaaS apps](../saas-apps/tutorial-list.md) and on-premises apps. Through these apps, you'll also get cloud-based app security, seamless access, enhanced collaboration, and automation of the identity lifecycle for your users, helping to increase both security and compliance.
 
@@ -77,4 +73,6 @@ Sign up for a free 30-day trial and deploy your first cloud solution, see [Azure
 Sign up for a free 30-day trial and start integrating your apps with Azure AD, see [Azure Active Directory Premium trial](https://azure.microsoft.com/trial/get-started-active-directory/). For more information, you can also see the [Developers Guide](../develop/azure-ad-developers-guide.md) for Azure Active Directory.
 
 ## Next steps
-[Learn more about the fundamentals of Azure identity and access management](identity-fundamentals.md).
+- [Learn more about the fundamentals of Azure identity and access management](identity-fundamentals.md).
+
+- [Integrate Azure AD with Windows Server Active directory](../hybrid/how-to-connect-install-express.md).

articles/active-directory/fundamentals/active-directory-whatis.md

@@ -15,7 +15,7 @@ ms.reviewer: kexia
 custom: it-pro
 ---
 
-# How to: Add branding to your Azure AD sign-in page
+# How to: Add branding to your Azure Active Directory sign-in page
 Use your organization's logo and custom color schemes to provide a consistent look-and-feel on your Azure Active Directory (Azure AD) sign-in pages. Your sign-in pages appear when users sign in to your organization's web-based apps, such as Office 365, which uses Azure AD as your identity provider.
 
 >[!Note]
@@ -79,12 +79,10 @@ Your custom branding won't immediately appear when your users go to sites such a
 
 3. After you've finished adding your branding, select **Save**.
 
-    If this process creates your first custom branding configuration, it becomes the default for your tenant. If you have additional configurations, you'll can choose your default configuration.
-
-  If this exercise is your first branding configuration, it will be the default for your tenant. If you add more configurations, you'll get the option to choose your default.
-
-  >[!Important]
-  >To add more corporate branding configurations to your tenant, you must choose **New language** on the **Contoso - Company branding** page. This opens the **Configure company branding** page, where you can follow the same steps as above.
+    If this process creates your first custom branding configuration, it becomes the default for your tenant. If you have additional configurations, you'll be able to choose your default configuration.
+    
+    >[!Important]
+    >To add more corporate branding configurations to your tenant, you must choose **New language** on the **Contoso - Company branding** page. This opens the **Configure company branding** page, where you can follow the same steps as above.
 
 ## Update your custom branding
 After you've created your custom branding, you can go back and change anything you want.

articles/active-directory/fundamentals/customize-branding.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.component: app-mgmt
 ms.topic: conceptual
 ms.workload: identity
-ms.date: 09/17/2018
+ms.date: 09/19/2018
 ms.author: barbkess
 ms.reviewer: baselden
 
@@ -22,7 +22,7 @@ Resources to help you migrate application access and authentication to Azure Act
 |:-----------|:-------------|
 |[Migrating your apps to Azure AD](https://aka.ms/migrateapps/whitepaper) | This white paper presents the benefits of migration, and describes how to plan for migration in four clearly-outlined phases: discovery, classification, migration, and ongoing management. You’ll be guided through how to think about the process and break down your project into easy-to-consume pieces. Throughout the document are links to important resources that will help you along the way. |
 |[Solution guide: Migrating apps from Active Directory Federation Services (AD FS) to Azure AD](https://aka.ms/migrateapps/adfssolutionguide) | This solution guide walks you through the same four phases of planning and executing an application migration project described at a higher level in the migration whitepaper. In this guide, you’ll learn how to apply those phases to the specific goal of moving an application from Azure Directory Federated Services (AD FS) to Azure AD.|
-| [Tool: Active Directory Federation Services Migration Readiness Script](https://aka.ms/migrateapps/adfsscript) | This is a script you can run on your on-premises Active Directory Federation Services (AD FS) server to determine the readiness of apps for migration to Azure AD.|
+| [Tool: Active Directory Federation Services Migration Readiness Script](https://aka.ms/migrateapps/adfstools) | This is a script you can run on your on-premises Active Directory Federation Services (AD FS) server to determine the readiness of apps for migration to Azure AD.|
 | [Deployment plan: Migrating from AD FS to password hash sync](https://aka.ms/ADFSTOPHSDPDownload) | With password hash synchronization, hashes of user passwords are synchronized from on-premises Active Directory to Azure AD. This allows Azure AD to authenticate users without interacting with the on-premises Active Directory.| 
 | [Deployment plan: Migrating from AD FS to pass-through authentication](https://aka.ms/ADFSTOPTADPDownload)|Azure AD pass-through authentication helps users sign in to both on-premises and cloud-based applications by using the same password. This feature provides your users with a better experience since they have one less password to remember. It also reduces IT helpdesk costs because users are less likely to forget how to sign in when they only need to remember one password. When people sign in using Azure AD, this feature validates users' passwords directly against your on-premises Active Directory.|
 | [Deployment plan: Enabling Single Sign-on to a SaaS app with Azure AD](https://aka.ms/SSODPDownload) | Single sign-on (SSO) helps you access all the apps and resources you need to do business, while signing in only once, using a single user account. For example, after a user has signed in, the user can move from Microsoft Office, to SalesForce, to Box without authenticating (for example, typing a password) a second time. 

articles/active-directory/manage-apps/migration-resources.md

@@ -147,7 +147,7 @@ For this next step, you will need [Microsoft SQL Server Management Studio](https
 11.  Clear the query window, enter the following line, and click **Execute** in the toolbar:
      
      ```
-     ALTER ROLE db_datareader ADD MEMBER [VM VM managed identity access to SQL access to SQL]
+     ALTER ROLE db_datareader ADD MEMBER [VM managed identity access to SQL]
      ```
 
      The command should complete successfully, granting the contained user the ability to read the entire database.

articles/active-directory/managed-identities-azure-resources/tutorial-windows-vm-access-sql.md

@@ -77,7 +77,7 @@ This section guides you through connecting your Azure AD to GitHub's user accoun
 
 	![Authorization Dialog](./media/github-provisioning-tutorial/GitHub2.png)
 
-7. In the Azure portal, input **Tenant URL** and click **Test Connection** to ensure Azure AD can connect to your GitHub app. If the connection fails, ensure your GitHub account has Admin permissions and **Tenant URl** is inputted correctly, then try the "Authorize" step again (you can constitute **Tenant URL** by rule: `https://api.github.com/scim/v2/<Organizations_name>`, you can find your organizations under your GitHub account: **Settings** > **Organizations**).
+7. In the Azure portal, input **Tenant URL** and click **Test Connection** to ensure Azure AD can connect to your GitHub app. If the connection fails, ensure your GitHub account has Admin permissions and **Tenant URl** is inputted correctly, then try the "Authorize" step again (you can constitute **Tenant URL** by rule: `https://api.github.com/scim/v2/organizations/<Organization_name>`, you can find your organizations under your GitHub account: **Settings** > **Organizations**).
 
 	![Authorization Dialog](./media/github-provisioning-tutorial/GitHub3.png)
 

articles/active-directory/saas-apps/github-provisioning-tutorial.md

@@ -1,6 +1,6 @@
 ---
-title: Assigning administrator roles in Azure Active Directory | Microsoft Docs
-description: An admin role can add users, assign administrative roles, reset user passwords, manage user licenses, or manage domains. A user who is assigned an admin role has the same permissions across all cloud services to which your organization has subscribed.
+title: Administrator roles reference in Azure Active Directory | Microsoft Docs
+description: An admin role can add users, assign administrative roles, reset user passwords, manage user licenses, or manage domains.
 services: active-directory
 documentationcenter: ''
 author: curtand
@@ -11,7 +11,7 @@ ms.service: active-directory
 ms.workload: identity
 ms.component: users-groups-roles
 ms.topic: article
-ms.date: 09/07/2018
+ms.date: 09/19/2018
 ms.author: curtand
 ms.reviewer: vincesm
 ms.custom: it-pro
@@ -325,7 +325,8 @@ Full access to manage devices in Azure AD.
 | **Actions** | **Description** |
 | --- | --- |
 | microsoft.aad.directory/devices/delete | Delete devices in Azure Active Directory. |
-| microsoft.aad.directory/devices/update | Update the accountEnabled property on Devices in Azure Active Directory |
+| microsoft.aad.directory/devices/disable | Disable devices in Azure Active Directory. |
+| microsoft.aad.directory/devices/enable | Enable devices in Azure Active Directory. |
 | microsoft.aad.reports/allEntities/read | Read Azure AD Reports. |
 | microsoft.azure.serviceHealth/allEntities/allTasks | Read and configure Azure Service Health. |
 | microsoft.office365.serviceHealth/allEntities/allTasks | Read and configure Office 365 Service Health. |