Merge pull request MicrosoftDocs#1941 from Microsoft/FromPrivateRepo

From private repo

articles/active-directory/active-directory-saas-absorblms-tutorial.md

@@ -237,7 +237,7 @@ For Absorb LMS, provisioning is a manual task.
 
 	d. In the **Password** textbox, type the password of Britta Simon.
 
-	e. In the **Confirm Password** dropdown, select the confirm password of Britta Simon.
+	e. In the **Confirm Password** textbox, type the same password.
 
 	f. Make it as **ACTIVE**.	
 

articles/analysis-services/analysis-services-gateway.md

@@ -120,7 +120,7 @@ Under the hood, the on-premises data gateway used for connecting Azure Analysis
 
 If you’re having trouble when installing and configuring a gateway, be sure to see [Troubleshooting the Power BI Gateway](https://powerbi.microsoft.com/documentation/powerbi-gateway-onprem-tshoot/). If you think you are having an issue with your firewall, see the firewall or proxy sections.
 
-If you think you're encountering proxy issues, with the gateway, see [Configuring proxy settings for the Power BI Gateways](https://powerbi.microsoft.com/documentation/powerbi-gateway-proxy.md).
+If you think you're encountering proxy issues, with the gateway, see [Configuring proxy settings for the Power BI Gateways](https://powerbi.microsoft.com/documentation/powerbi-gateway-proxy).
 
 ### Telemetry
 Telemetry can be used for monitoring and troubleshooting. 

articles/analysis-services/analysis-services-overview.md

@@ -38,7 +38,7 @@ Azure Analysis Services is compatible with the same SQL Server Analysis Services
 ## Use the tools you already know
 ![BI developer tools](./media/analysis-services-overview/aas-overview-dev-tools.png)
 
-When creating data models for Azure Analysis Services, you use the same tools as for SQL Server Analysis Services. Author and deploy models by using [SQL Server Data Tools (SSDT)](https://msdn.microsoft.com/library/mt204009.aspx) or by using [Azure Powershell](/powershell/azureps-cmdlets-docs) and [Azure Resource Manager](../azure-resource-manager/resource-group-overview.md) templates in [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx).
+When creating data models for Azure Analysis Services, you use the same tools as for SQL Server Analysis Services. Author and deploy models by using [SQL Server Data Tools (SSDT)](https://msdn.microsoft.com/library/mt204009.aspx). Manage your servers and model databases by using [SQL Server Management Studio (SSMS)](https://msdn.microsoft.com/library/mt238290.aspx). And, automate tasks with [Powershell](analysis-services-powershell.md) and [Azure Resource Manager](../azure-resource-manager/resource-group-overview.md) templates 
 
 ## Supports the latest features
 Azure Analysis Services supports tabular models at the 1200 and 1400 Preview compatibility levels.
@@ -50,9 +50,7 @@ Azure Analysis Services supports tabular models at the 1200 and 1400 Preview com
 ## Data sources
 Data models deployed to servers in Azure support connecting to data sources on-premises in your organization or in the cloud. Combine data from both on-premises and cloud data sources for a hybrid BI solution.
 
-Because your server is in the cloud, connecting to cloud data sources is seamless. When connecting to on-premises data sources, the [On-premises data gateway](analysis-services-gateway.md) ensures fast, secure connections with your server in the cloud.
-
-To learn more about which on-premises data sources are supported, see [Data sources supported in Azure Analysis Services](analysis-services-datasource.md).
+Because your server is in the cloud, connecting to cloud data sources is seamless. When connecting to on-premises data sources, the [On-premises data gateway](analysis-services-gateway.md) ensures fast, secure connections with your server in the cloud. To learn more about which on-premises data sources are supported, see [Data sources supported in Azure Analysis Services](analysis-services-datasource.md).
 
 
 ## Explore your data from anywhere
@@ -79,13 +77,17 @@ Azure Analysis Services is governed by the [Microsoft Online Services Terms](htt
 To learn more about Azure Security, see the [Microsoft Trust Center](https://www.microsoft.com/trustcenter/Security/AzureSecurity).
 
 ## Get help
+
+### Documentation
 Azure Analysis Services is simple to set up and to manage. You can find all the info you need to create and manage a server here. When creating a data model to deploy to your server, it's much the same as it is for creating a data model you deploy to an on-premises server. There's an extensive library of conceptual, procedural, tutorials, and reference articles at [Analysis Services](https://docs.microsoft.com/sql/analysis-services/analysis-services).
 
-We also have a number of helpful videos at [Azure Analysis Services on Channel 9](https://channel9.msdn.com/series/Azure-Analysis-Services).
+### Videos
+Checkout helpful videos at [Azure Analysis Services on Channel 9](https://channel9.msdn.com/series/Azure-Analysis-Services).
 
-Things are changing rapidly. You can always get the latest information on the [Azure Analysis Services blog](https://go.microsoft.com/fwlink/?linkid=830920).
+### Blogs
+Things are changing rapidly. You can always get the latest information on the [Analysis Services team blog](https://blogs.msdn.microsoft.com/analysisservices/) and [Azure blog](https://azure.microsoft.com/blog/).
 
-## Community
+### Community
 Analysis Services has a vibrant community of users. Join the conversation on [Azure Analysis Services forum](https://aka.ms/azureanalysisservicesforum).
 
 ## Feedback
@@ -95,4 +97,3 @@ Have suggestions about the documentation? You can add comments using Livefyre at
 
 ## Next steps
 Now that you know more about Azure Analysis Services, it's time to get started. Learn how to [create a server](analysis-services-create-server.md) in Azure and [deploy a tabular model](analysis-services-deploy.md) to it.
-

articles/analysis-services/analysis-services-powershell.md

@@ -62,4 +62,4 @@ The SQLASCMDLETS module provides task-specific database management cmdlets as we
 
 ## Related information
 * [PowerShell scripting in Analysis Services](https://msdn.microsoft.com/library/hh213141.aspx).
-* [Tabular Model Programming for Compatibility Level 1200](https://msdn.microsoft.com/library/mt712541.aspx)
+* [Tabular Model Programming for Compatibility Level 1200 and higher](https://msdn.microsoft.com/library/mt712541.aspx)

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

@@ -1,6 +1,6 @@
 ---
-title: Create a static HTML web app in Azure in five minutes | Microsoft Docs
-description: Learn how easy it is to run web apps in App Service by deploying a sample app.
+title: Create a static HTML web app in Azure | Microsoft Docs
+description: Learn how to run web apps in Azure App Service by deploying a static HTML sample app.
 services: app-service\web
 documentationcenter: ''
 author: rick-anderson
@@ -13,28 +13,30 @@ ms.workload: web
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: hero-article
-ms.date: 05/08/2017
+ms.date: 05/26/2017
 ms.author: riande
 ms.custom: mvc
 ---
-# Create a static HTML web app in Azure in five minutes
+# Create a static HTML web app in Azure
 
-This quickstart walks through how to and deploy a basic HTML+CSS site to Azure. You’ll run the app using an [Azure App Service plan](https://docs.microsoft.com/azure/app-service/azure-web-sites-web-hosting-plans-in-depth-overview), and create a web app in it using the [Azure CLI](https://docs.microsoft.com/en-us/cli/azure/get-started-with-azure-cli). You use Git to deploy the app to Azure. It takes about five minutes to complete the tutorial once the prerequisites are installed.
+[Azure Web Apps](https://docs.microsoft.com/azure/app-service-web/app-service-web-overview) provides a highly scalable, self-patching web hosting service.  This quickstart shows how to deploy a basic HTML+CSS site to Azure Web Apps. You create the web app using the [Azure CLI](https://docs.microsoft.com/cli/azure/get-started-with-azure-cli), and you use Git to deploy sample HTML content to the web app.
 
-![hello-world-in-browser](media/app-service-web-get-started-html/hello-world-in-browser-az.png)
+![Home page of sample app](media/app-service-web-get-started-html/hello-world-in-browser-az.png)
+
+You can follow the steps below using a Mac, Windows, or Linux machine. Once the prerequisites are installed, it takes about five minutes to complete the steps.
 
 ## Prerequisites
 
-Before creating this sample, download and install the following components:
+To complete this quickstart:
 
-- [Git](https://git-scm.com/)
-- [Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli)
+- [Install Git](https://git-scm.com/)
+- [Install Azure CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli)
 
-[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+[!INCLUDE [Free trial note](../../includes/quickstarts-free-trial-note.md)]
 
 ## Download the sample
 
-In a terminal window, clone the sample app repository to your local machine:
+In a terminal window, run the following command to clone the sample app repository to your local machine.
 
 ```bash
 git clone https://github.com/Azure-Samples/html-docs-hello-world.git
@@ -44,25 +46,69 @@ git clone https://github.com/Azure-Samples/html-docs-hello-world.git
 
 Navigate to the directory that contains the sample HTML. Open the *index.html* file in your browser.
 
-![hello-world-in-browser](media/app-service-web-get-started-html/hello-world-in-browser.png)
+![Sample app home page](media/app-service-web-get-started-html/hello-world-in-browser.png)
+
+[!INCLUDE [Log in to Azure](../../includes/login-to-azure.md)] 
+
+[!INCLUDE [Configure deployment user](../../includes/configure-deployment-user.md)] 
 
-[!INCLUDE [login-to-azure](../../includes/login-to-azure.md)] 
-[!INCLUDE [configure-deployment-user](../../includes/configure-deployment-user.md)] 
+[!INCLUDE [Create resource group](../../includes/app-service-web-create-resource-group.md)] 
 
-[!INCLUDE [app-service-web-quickstart1](../../includes/app-service-web-quickstart1.md)] 
+[!INCLUDE [Create app service plan](../../includes/app-service-web-create-app-service-plan.md)] 
 
-Create a [Web App](app-service-web-overview.md) in the `quickStartPlan` App Service plan. 
-The web app provides a hosting space for your code and provides a URL for to view the deployed app.
+[!INCLUDE [Create web app](../../includes/app-service-web-create-web-app.md)] 
 
-[!INCLUDE [app-service-web-quickstart2](../../includes/app-service-web-quickstart2.md)] 
+![Empty web app page](media/app-service-web-get-started-html/app-service-web-service-created.png)
 
-The page is running as an Azure App Service web app:
+You’ve created an empty new web app in Azure.
 
-![hello-world-in-browser](media/app-service-web-get-started-html/hello-world-in-browser-az.png)
+[!INCLUDE [Configure local git](../../includes/app-service-web-configure-local-git.md)] 
+
+[!INCLUDE [Push to Azure](../../includes/app-service-web-git-push-to-azure.md)] 
+
+```bash
+Counting objects: 13, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (11/11), done.
+Writing objects: 100% (13/13), 2.07 KiB | 0 bytes/s, done.
+Total 13 (delta 2), reused 0 (delta 0)
+remote: Updating branch 'master'.
+remote: Updating submodules.
+remote: Preparing deployment for commit id 'cc39b1e4cb'.
+remote: Generating deployment script.
+remote: Generating deployment script for Web Site
+remote: Generated deployment script files
+remote: Running deployment command...
+remote: Handling Basic Web Site deployment.
+remote: KuduSync.NET from: 'D:\home\site\repository' to: 'D:\home\site\wwwroot'
+remote: Deleting file: 'hostingstart.html'
+remote: Copying file: '.gitignore'
+remote: Copying file: 'LICENSE'
+remote: Copying file: 'README.md'
+remote: Finished successfully.
+remote: Running post deployment command(s)...
+remote: Deployment successful.
+To https://<app_name>.scm.azurewebsites.net/<app_name>.git
+ * [new branch]      master -> master
+```
+
+## Browse to the app
+
+In a browser, go to the Azure web app URL:
+
+```
+http://<app_name>.azurewebsites.net
+```
+
+The page is running as an Azure App Service web app.
+
+![Sample app home page](media/app-service-web-get-started-html/hello-world-in-browser-az.png)
+
+**Congratulations!** You've deployed your first HTML app to App Service.
 
 ## Update and redeploy the app
 
-Open the *index.html* file. Make a change to the markup. For example, change `Hello world!` to `Hello Azure!`
+Open the *index.html* file in a text editor, and make a change to the markup. For example, change the H1 heading from "Azure App Service - Sample Static HTML Site" to just "Azure App Service`.
 
 Commit your changes in Git, and then push the code changes to Azure.
 
@@ -73,12 +119,25 @@ git push azure master
 
 Once deployment has completed, refresh your browser to see the changes.
 
-[!INCLUDE [manage-azure-web-app](../../includes/manage-azure-web-app.md)]
+![Updated sample app home page](media/app-service-web-get-started-html/hello-azure-in-browser-az.png)
+
+## Manage your new Azure web app
+
+Go to the [Azure portal](https://portal.azure.com) to manage the web app you created.
+
+From the left menu, click **App Services**, and then click the name of your Azure web app.
+
+![Portal navigation to Azure web app](./media/app-service-web-get-started-html/portal1.png)
+
+You see your web app's Overview page. Here, you can perform basic management tasks like browse, stop, start, restart, and delete. 
+
+![App Service blade in Azure portal](./media/app-service-web-get-started-html/portal2.png)
 
+The left menu provides different pages for configuring your app. 
 
 [!INCLUDE [cli-samples-clean-up](../../includes/cli-samples-clean-up.md)]
 
 ## Next steps
 
-- Explore sample [Web Apps CLI scripts](app-service-cli-samples.md).
-- Learn how to [Map a custom domain name](app-service-web-tutorial-custom-domain.md), such as contoso.com, to an [App Service app](app-service-web-tutorial-custom-domain.md).
+> [!div class="nextstepaction"]
+> [Map custom domain](app-service-web-tutorial-custom-domain.md)