Merge branch 'master' of https://github.com/Azure/azure-content-pr in…

…to k3

articles/app-service-logic/app-service-logic-use-logic-app-templates.md

@@ -13,15 +13,15 @@
 	ms.tgt_pltfrm="na"
 	ms.devlang="na"
 	ms.topic="article"
-	ms.date="06/24/2015"
+	ms.date="09/15/2015"
 	ms.author="klam"/>
 
 # Use Logic App templates
 
 Logic App Templates are a set of curated pre-built Logic Apps to help you quickly get started building your own integration application.
 
 These templates show how to use some of the many connectors available in the marketplace as well as being a good way to discover various patterns that can be built using Logic Apps.  You can either use these as is or modify and them to fit your scenario.
-To get started using a Logic App Template go to the Marketplace and select Logic Apps.  Choose one of the Logic App Templates from the curated list.
+To get started using a Logic App Template either go to the Marketplace and search for "Logic App Template" and choose one of the Logic App templates from the curated list or when a new logic app is created select "Triggers and actions" and pick from the set of Logic App Templates on the designer.
 
 ### SaaS and Cloud Templates
 Examples of how to integrate across different SaaS connectors.  Here you can find various examples integrating Salesforce, Box, SharePoint and other services.

articles/app-service-mobile/app-service-mobile-dotnet-backend-get-started-connect-to-enterprise.md

@@ -5,7 +5,7 @@
 	authors="mattchenderson"
 	manager="dwrede"
 	editor="na"
-	services="app-service\mobile,app-service\web,app-service\api"/>
+	services="app-service\mobile"/>
 
 <tags
 	ms.service="app-service-mobile"

articles/app-service-mobile/app-service-mobile-dotnet-backend-hybrid-connections-get-started-preview.md

@@ -1,7 +1,7 @@
 <properties
 	pageTitle="Connect your Azure Mobile App to an on-premises SQL Server using Hybrid Connections | Microsoft Azure"
 	description="Learn how to connect to an on-premises SQL Server from a App Service Mobile App using Hybrid Connections"
-	services="app-service\mobile,app-service\web,app-service\api"
+	services="app-service\mobile"
 	documentationCenter=""
 	authors="ggailey777"
 	manager="dwrede"

articles/app-service-mobile/app-service-mobile-dotnet-backend-web-and-mobile-client.md

@@ -1,7 +1,7 @@
 <properties
 	pageTitle="Create an app with a mobile and web client in Azure App Service | Microsoft Azure"
 	description="Create a multi-channel app with both a website and mobile client in Azure App Service."
-	services="app-service\mobile,app-service\web,app-service\api"
+	services="app-service\mobile"
 	documentationCenter=".net"
 	authors="lindydonna"
 	manager="dwrede"

articles/app-service-mobile/app-service-mobile-dotnet-backend-xamarin-ios-get-started-users-preview.md

@@ -1,7 +1,7 @@
 <properties 
 	pageTitle="Get Started with authentication for Mobile Apps in Xamarin iOS" 
 	description="Learn how to use Mobile Apps to authenticate users of your Xamarin iOS app through a variety of identity providers, including AAD, Google, Facebook, Twitter, and Microsoft." 
-	services="app-service\mobile,app-service\web,app-service\api" 
+	services="app-service\mobile" 
 	documentationCenter="xamarin" 
 	authors="mattchenderson" 
 	manager="dwrede" 

articles/application-insights/app-insights-release-notes-windows.md

@@ -32,6 +32,23 @@ See [Get started with Application Insights for Windows Phone and Store apps](app
 * Compare the old and new versions of ApplicationInsights.config. Merge back any customizations you made to the old version.
 * Rebuild your solution.
 
+## Version 1.2
+
+### Windows App SDK
+
+- Fix a FileNotFound exception that was preventing persisted telemetries from being sent after the app is re-opened.
+
+### Core SDK
+
+- First version of Application Insights SDK shipped from [github](http://github.com/microsoft/ApplicationInsights-dotnet)
+
+## Version 1.1
+
+### Core SDK
+
+- SDK now introduces new telemetry type ```DependencyTelemetry``` which contains information about dependency call from application
+- New method ```TelemetryClient.TrackDependency``` allows to send information about dependency calls from application
+
 ## Version 1.0.0
 
 ### Windows App SDK

articles/automation/automation-configuring.md

@@ -61,8 +61,8 @@ You can retrieve the credential in a runbook using the [Get-AutomationPSCredenti
 	Add-AzureAccount –Credential $cred
 	Select-AzureSubscription –SubscriptionName "My Subscription"
 
-You should repeat these lines after any [checkpoints](automation-runbook-execution#checkpoints) in your runbook. If the runbook is suspended and then resumes on another worker, then it will need to perform the authentication again.
+You should repeat these lines after any [checkpoints](http://technet.microsoft.com/library/dn469257.aspx#bk_Checkpoints) in your runbook. If the runbook is suspended and then resumes on another worker, then it will need to perform the authentication again.
 
 ## Related articles
 - [Azure Automation: Authenticating to Azure using Azure Active Directory](http://azure.microsoft.com/blog/2014/08/27/azure-automation-authenticating-to-azure-using-azure-active-directory/)
-
+

articles/azure-subscription-service-limits.md

@@ -151,6 +151,7 @@ The following App Service limits include limits for Web Apps, Mobile Apps, API A
 [AZURE.INCLUDE [azure-batch-limits](../includes/azure-batch-limits.md)]
 
 ###BizTalk Services Limits
+The following table shows the limits for Azure Biztalk Services.
 
 [AZURE.INCLUDE [biztalk-services-service-limits](../includes/biztalk-services-service-limits.md)]
 

articles/backup/backup-azure-backup-faq.md

@@ -14,7 +14,7 @@
 	 ms.devlang="na"
 	 ms.topic="article"
 	 ms.date="08/26/2015"
-	 ms.author="giridham"; "arunak"; "jimpark"; "aashishr"/>
+	 ms.author="trinadhk";"giridham"; "arunak"; "jimpark"; "aashishr"/>
 
 # Azure Backup - FAQ
 The following is a list of commonly asked questions about Azure Backup. If you have any additional questions about Azure Backup, please go to the the [discussion forum](https://social.msdn.microsoft.com/forums/azure/home?forum=windowsazureonlinebackup) and post your questions. Someone from our community will help you get your answers. If a question is commonly asked, we will add it to this article so that it can be found quickly and easily.
@@ -54,7 +54,7 @@ A5. Yes. As of July 2015, you can create 25 vaults per subscription. If you need
 A6. Though it is possible to get a detailed bill for each vault, we highly recommend that you consider an Azure subscription as a billing entity. It is consistent across all services and is easier to manage.
 
 **Q7. Are there any limits on the number of servers/machines that can be registered against each vault?** <br/>
-A7. Yes, you can register upto 50 machines per vault. If you need to register more machines, create a new vault.
+A7. Yes, you can register upto 50 machines per vault. For Azure IaaS virtual machines, limit is 100 VMs per vault. If you need to register more machines, create a new vault. 
 
 **Q8. Are there any limits on the amount of data that can be backed up from a Windows server/client or SCDPM server?** <br/>
 A8. No.
@@ -143,7 +143,7 @@ The datasource size is measured as mentioned below
 |BMR/System State|Each individual copy of BMR or system state of the machine being backed up|
 
 **Q2. Is there are limit on the number of times backup can be scheduled per day?**<br/>
-A2. Yes, Azure Backup enables 3 backup copies per day through Windows Server/Client and 2 backup copies per day through SCDPM.
+A2. Yes, Azure Backup enables 3 backup copies per day through Windows Server/Client, 2 backup copies per day through SCDPM and once a day backup for IaaS VMs.
 
 **Q3. Is there a difference between DPM’s and Azure Backup’s (i.e on Windows Server without DPM) backup scheduling policy?** <br/>
 A3. Yes. Using DPM, you can specify daily, weekly, monthly, yearly scheduling while from a Windows Server (without DPM), you can specify only daily, weekly schedules.
@@ -170,15 +170,10 @@ A8. No – the time taken to recovery the oldest or the latest point is one and
 A9.  Typical long term retention point products store backup data as full points. However, these are storage inefficient but are easier and faster to restore. Incremental copies are storage efficient but require you to restore a chain of data which impacts your recovery time. Azure Backup’s unique storage architecture gives you the best of both worlds by optimally storing data for fast restores and incurring low storage costs. This approach ensures that your (ingress and egress) bandwidth is efficiently used, storage is kept to the minimum and the time taken to recover is kept to the minimum.
 
 **Q10. Is there a limit on the number of recovery points that can be created?**<br/>
-A10. As of April 2015, you can have upto 366 recovery points. You can use any permutation to arrive at a number which is less than 366. Eg – the retention points in the below picture add to 354. <br/>
+A10. No. We have eliminated limits on recovery points. You can create as many recovery points as you desire. 
 
-![Retention screen](./media/backup-azure-backup-faq/RetentionScreen1.png)
-
-**Q11. Once Microsoft improves the limit from 366, will I need to upgrade the agent or reseed the initial backup?** <br/>
-A11. No. Once we make the change in our service, you will be notified through our social media outlets (blogs, Azure announcements, portal etc). Based on your needs, you would then be required to only change the retention policy.
-
-**Q12. Why is the amount of data transferred in backup not equal to the amount of data I backed up?**<br/>
-A12. All the data that is backed up is compressed and encrypted before being transferred. You can expect 30-40% compression benefits depending on the type of data being backed up.
+**Q11. Why is the amount of data transferred in backup not equal to the amount of data I backed up?**<br/>
+A11. All the data that is backed up is compressed and encrypted before being transferred. You can expect 30-40% compression benefits depending on the type of data being backed up.
 
 ## Recovery
 **Q1. How many recoveries can I perform on the data that is backed up to Azure?**<br/>
@@ -216,8 +211,8 @@ A4. The key used to encrypt the backup data is present only on the customer prem
 
 	| Registry path | Registry Key | Value |
 	| ------ | ------- | ------ |
-	| HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config |  ScratchLocation | <i>New cache folder location</i> |
-	| HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config\CloudBackupProvider | ScratchLocation | <i>New cache folder location</i> |
+	| `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config` |  ScratchLocation | <i>New cache folder location</i> |
+	| `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Azure Backup\Config\CloudBackupProvider` | ScratchLocation | <i>New cache folder location</i> |
 
 
 + Start the OBEngine by executing the below command in an elevated command prompt:

articles/backup/backup-azure-vms-automation.md

@@ -13,7 +13,7 @@
 	ms.tgt_pltfrm="na"
 	ms.devlang="na"
 	ms.topic="article"
-	ms.date="09/14/2015"
+	ms.date="09/16/2015"
 	ms.author="trinadhk";"aashishr" />
 
 
@@ -32,7 +32,9 @@ The 2 most important flows are enabling protection for a VM, and restoring data
 
 ## Setup and Registration
 To begin:
+
 1. [Download latest PowerShell](https://github.com/Azure/azure-powershell/releases) (minimum version required is : 0.9.8)
+
 2. Enable the Azure Backup commandlets by switching to *AzureResourceManager* mode by using the **Switch-AzureMode** commandlet:
 
 ```
@@ -51,8 +53,8 @@ The following setup and registration tasks can be automated with PowerShell:
 You can create a new backup vault using the **New-AzureRMBackupVault** commandlet. The backup vault is an ARM resource, so you need to place it within a Resource Group. In an elevated Azure PowerShell console, run the following commands:
 
 ```
-PS C:\> New-AzureRMResourceGroup –Name “test-rg” –Region “West US”
-PS C:\> $backupvault = New-AzureRMBackupVault –ResourceGroupName “test-rg” –Name “test-vault” –Region “West US” –Storage GRS
+PS C:\> New-AzureResourceGroup –Name “test-rg” –Region “West US”
+PS C:\> $backupvault = New-AzureRMBackupVault –ResourceGroupName “test-rg” –Name “test-vault” –Region “West US” –Storage GeoRedundant
 ```
 
 You can get a list of all the backup vaults in a given subscription using the **Get-AzureRMBackupVault** commandlet.

articles/cloud-services/cloud-services-guestos-msrc-releases.md

@@ -179,7 +179,7 @@ The following tables show the Microsoft Security Response Center (MSRC) updates
 [3089669]: http://support.microsoft.com/kb/3089669
 [3089657]: http://support.microsoft.com/kb/3089657
 [3091287]: http://support.microsoft.com/kb/3091287
-
+[3089662]: http://support.microsoft.com/kb/3089662
 
 [3082442]: http://support.microsoft.com/kb/3082442
 [3078662]: http://support.microsoft.com/kb/3078662

articles/media-services/media-services-dynamic-packaging-overview.md

@@ -1,23 +1,23 @@
-<properties 
-	pageTitle="Dynamic Packaging Overview" 
-	description="The topic gives and overview of dynamic packaging." 
-	authors="Juliako" 
-	manager="dwrede" 
-	editor="" 
-	services="media-services" 
+<properties
+	pageTitle="Dynamic Packaging Overview"
+	description="The topic gives and overview of dynamic packaging."
+	authors="Juliako"
+	manager="dwrede"
+	editor=""
+	services="media-services"
 	documentationCenter=""/>
 
-<tags 
-	ms.service="media-services" 
-	ms.workload="media" 
-	ms.tgt_pltfrm="na" 
-	ms.devlang="na" 
-	ms.topic="article" 
-	ms.date="09/07/2015" 
+<tags
+	ms.service="media-services"
+	ms.workload="media"
+	ms.tgt_pltfrm="na"
+	ms.devlang="na"
+	ms.topic="article"
+	ms.date="09/07/2015"
 	ms.author="juliako"/>
 
 
-#Dynamic Packaging 
+#Dynamic Packaging
 
 ##Overview
 
@@ -38,19 +38,19 @@ The following diagram shows the dynamic packaging workflow.
 
 ##Common scenario
 
-1. Upload an input file (called a mezzanine file). For example, H.264, MP4, or WMV (for the list of supported formats see Formats Supported by the Media Services Encoder).
- 
+1. Upload an input file (called a mezzanine file). For example, H.264, MP4, or WMV (for the list of supported formats see [Formats Supported by the Media Services Encoder](media-services-azure-media-encoder-formats)).
+
 1. Encode your mezzanine file to H.264 MP4 adaptive bitrate sets.
- 
+
 1. Publish the asset that contains the adaptive bitrate MP4 set by creating the On-Demand Locator.
- 
+
 1. Build the streaming URLs to access and stream your content.
- 
+
 >[AZURE.NOTE]Not all MP4 file formats are supported by dynamic packaging, for more information, see [Unsupported formats for dynamic packaging](media-services-dynamic-packaging-overview.md#unsupported_formats).
 
 ##Preparing assets for dynamic streaming
 
-To prepare your asset for dynamic streaming you have two options: 
+To prepare your asset for dynamic streaming you have two options:
 
 - Upload a master file and produce H.264 MP4 adaptive bitrate sets using the Azure Media Encoder.
 - Upload existing adaptive bitrate sets and validate them using the Media Packager.
@@ -65,7 +65,7 @@ Upload your files using **Azure Management Portal**, **.NET** or **REST API**.
 [AZURE.INCLUDE [media-services-selector-upload-files](../../includes/media-services-selector-upload-files.md)]
 
 Encode with **Azure Media Encoder** using **Azure Management Portal**, **.NET**, or **REST API**.
- 
+
 [AZURE.INCLUDE [media-services-selector-encode](../../includes/media-services-selector-encode.md)]
 
 
@@ -79,7 +79,7 @@ Once you have the adaptive bitrate sets, you can publish your asset by creating
 
 For information on how to create locators and use dynamic packaging to stream your content, see the following topics:
 
-[Delivering Content to Customers Overview](media-services-deliver-content-overview.md). 
+[Delivering Content to Customers Overview](media-services-deliver-content-overview.md).
 
 Configure asset delivery policy using **.NET** or **REST API**.
 
@@ -104,5 +104,3 @@ You can view AMS learning paths here:
 
 - [AMS Live Streaming Workflow](http://azure.microsoft.com/documentation/learning-paths/media-services-streaming-live/)
 - [AMS on Demand Streaming Workflow](http://azure.microsoft.com/documentation/learning-paths/media-services-streaming-on-demand/)
-
-

articles/redis-cache/cache-dotnet-how-to-use-azure-redis-cache.md

@@ -1,7 +1,7 @@
 <properties 
 	pageTitle="How to Use Azure Redis Cache" 
 	description="Learn how to improve the performance of your Azure applications with Azure Redis Cache" 
-	services="redis-cache" 
+	services="redis-cache,app-service" 
 	documentationCenter="" 
 	authors="steved0x" 
 	manager="dwrede" 

articles/service-fabric/service-fabric-resource-balancer-service-description.md

@@ -3,7 +3,7 @@
    description="An overview of configuring service descriptions for the Resource Balancer to use"
    services="service-fabric"
    documentationCenter=".net"
-   authors="GaugeField"
+   authors="masnider"
    manager="timlt"
    editor=""/>
 
@@ -13,7 +13,7 @@
    ms.topic="article"
    ms.tgt_pltfrm="NA"
    ms.workload="NA"
-   ms.date="09/03/2015"
+   ms.date="09/15/2015"
    ms.author="masnider"/>
 
 # Service Description Overview
@@ -203,6 +203,7 @@ The code example shows ServiceTemplates definitions via the application manifest
  </ServiceTemplates>
 ```
 The code example shows the DefaultServices definitions via application manifest.
+
 ``` xml
 <DefaultServices>
   <Service Name="QueueServiceInstance">
@@ -228,4 +229,4 @@ For more information: [Resource Balancer Architecture](service-fabric-resource-b
 [Image1]: media/service-fabric-resource-balancer-service-description/PC.png
 [Image2]: media/service-fabric-resource-balancer-service-description/DM.png
 [Image3]: media/service-fabric-resource-balancer-service-description/MW.png
-
+