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

articles/active-directory/vs-active-directory-dotnet-getting-started.md

@@ -3,7 +3,7 @@
 	description="How to get started using Azure Active Directory in MVC projects after connecting to or creating an Azure AD using Visual Studio connected services" 
 	services="active-directory" 
 	documentationCenter="" 
-	authors="patshea123" 
+	authors="tarcher" 
 	manager="douge" 
 	editor="tglee"/>
 
@@ -14,7 +14,7 @@
 	ms.devlang="na" 
 	ms.topic="article" 
 	ms.date="09/03/2015" 
-	ms.author="patshea"/>
+	ms.author="tarcher"/>
 
 # Getting Started with Azure Active Directory and Visual Studio connected services (MVC Projects)
 

articles/active-directory/vs-active-directory-dotnet-what-happened.md

@@ -3,7 +3,7 @@
 	description="Describes what happens to your MVC project when you connect to Azure AD by using Visual Studio connected services"
 	services="active-directory"
 	documentationCenter="na"
-	authors="patshea123"
+	authors="tarcher"
 	manager="douge"
 	editor="tglee"/>
 
@@ -14,7 +14,7 @@
 	ms.devlang="na"
 	ms.topic="article"
 	ms.date="09/03/2015"
-	ms.author="patshea"/>
+	ms.author="tarcher"/>
 
 # What happened to my MVC project (Visual Studio Azure Active Directory connected service)?
 

articles/active-directory/vs-active-directory-error.md

@@ -3,7 +3,7 @@
 	description="The active directory connection wizard detected an incompatible authentication type" 
 	services="active-directory" 
 	documentationCenter="" 
-	authors="patshea123" 
+	authors="tarcher" 
 	manager="douge" 
 	editor="tglee"/>
 
@@ -14,7 +14,7 @@
 	ms.devlang="na" 
 	ms.topic="article" 
 	ms.date="07/22/2015" 
-	ms.author="patshea"/>
+	ms.author="tarcher"/>
 
 # Error During Authentication Detection
 

articles/active-directory/vs-active-directory-webapi-getting-started.md

@@ -3,7 +3,7 @@
 	description="How to get started using Azure Active Directory in WebApi projects after connecting to or creating an Azure AD using Visual Studio connected services" 
     services="active-directory"
 	documentationCenter="" 
-	authors="patshea123" 
+	authors="tarcher" 
 	manager="douge" 
 	editor="tglee"/>
 
@@ -14,7 +14,7 @@
 	ms.devlang="na" 
 	ms.topic="article" 
 	ms.date="09/03/2015" 
-	ms.author="patshea"/>
+	ms.author="tarcher"/>
 
 # Get Started with Azure Active Directory and Visual Studio connected services (WebApi projects)
 

articles/active-directory/vs-active-directory-webapi-what-happened.md

@@ -3,7 +3,7 @@
 	description="Describes what happens to your MVC project WebApi you connect to Azure AD by using Visual Studio services="active-directory"
     services="active-directory"
 	documentationCenter=""
-	authors="patshea123"
+	authors="tarcher"
 	manager="douge"
 	editor="tglee"/>
 
@@ -14,7 +14,7 @@
 	ms.devlang="na"
 	ms.topic="article"
 	ms.date="09/03/2015"
-	ms.author="patshea"/>
+	ms.author="tarcher"/>
 
 # What happened to my WebApi project (Visual Studio Azure Active Directory connected service)
 

articles/app-service-web/web-sites-php-enterprise-wordpress.md

@@ -13,7 +13,7 @@
 	ms.topic="article"
 	ms.tgt_pltfrm="na"
 	ms.workload="web"
-	ms.date="08/03/2015"
+	ms.date="11/06/2015"
 	ms.author="tomfitz"/>
 
 #Enterprise-class WordPress on Azure App Service
@@ -28,7 +28,7 @@ A basic WordPress installation has only two requirements.
 
     > [AZURE.NOTE] ClearDB provides several MySQL configurations, with different performance characteristics for each configuration. See the [Azure Store][cdbnstore] for information on offerings provided through the Azure store or [ClearDB pricing](http://www.cleardb.com/pricing.view) for offerings directly from ClearDB.
 
-* **PHP 5.2.4 or greater** - Azure App Service currently provide [PHP versions 5.3, 5.4, and 5.5][phpwebsite].
+* **PHP 5.2.4 or greater** - Azure App Service currently provide [PHP versions 5.4, 5.5, and 5.6][phpwebsite].
 
 	> [AZURE.NOTE] We recommend always running on the latest version of PHP to ensure you have the latest security fixes.
 
@@ -53,7 +53,7 @@ Replication and routing to multiple MySQL Databases can be done using ClearDB's
 
 ###Multi-region deployment with media storage and caching
 
-If the site will accept uploads, or host media files, use Azure Blob storage. If you need caching, consider [Redis cache][rediscache], [Memcache Cloud](http://azure.microsoft.com/gallery/store/garantiadata/memcached/), [MemCachier](http://azure.microsoft.com/gallery/store/memcachier/memcachier/), or one of the other caching offerings in the [Azure Store](http://azure.microsoft.com/gallery/store/).
+If the site will accept uploads, or host media files, use Azure Blob storage. If you need caching, consider [Redis cache][rediscache], [Memcache Cloud](https://azure.microsoft.com/marketplace/partners/garantiadata/memcached/), [MemCachier](https://azure.microsoft.com/marketplace/partners/memcachier/memcachier/), or one of the other caching offerings in the [Azure Store](http://azure.microsoft.com/gallery/store/).
 
 ![an Azure web app, hosted in multiple regions, using CDBR High Availability router for MySQL, with Managed Cache, Blob storage, and CDN][performance-diagram]
 
@@ -87,7 +87,7 @@ Performance in the cloud is achieved primarily through caching and scale out; ho
 To do this... | Use this...
 ------------------------|-----------
 **Understand App Service instance capabilities** |  [Pricing details, including capabilities of App Service tiers][websitepricing]
-**Cache resources** | [Redis cache][rediscache], [Memcache Cloud](/gallery/store/garantiadata/memcached/), [MemCachier](/gallery/store/memcachier/memcachier/), or one of the other caching offerings in the [Azure Store](/gallery/store/)
+**Cache resources** | [Redis cache][rediscache], [Memcache Cloud](https://azure.microsoft.com/marketplace/partners/garantiadata/memcached/), [MemCachier](https://azure.microsoft.com/marketplace/partners/memcachier/memcachier/), or one of the other caching offerings in the [Azure Store](/gallery/store/)
 **Scale your application** | [Scale a web app in Azure App Service][websitescale] and [ClearDB High Availability Routing][cleardbscale]. If you choose to host and manage your own MySQL installation, you should consider [MySQL Cluster CGE][cge] for scale out
 
 ####Migration
@@ -249,10 +249,10 @@ To do this... | Use this...
 [sendgridplugin]: http://wordpress.org/plugins/sendgrid-email-delivery-simplified/
 [phpwebsite]: web-sites-php-configure.md
 [customdomain]: web-sites-custom-domain-name.md
-[trafficmanager]: /blog/2014/03/27/azure-traffic-manager-can-now-integrate-with-azure-web-sites/
+[trafficmanager]: ../traffic-manager/traffic-manager-overview.md
 [backup]: web-sites-backup.md
 [restore]: web-sites-restore.md
-[rediscache]: http://msdn.microsoft.com/library/azure/dn690470.aspx
+[rediscache]: https://azure.microsoft.com/documentation/services/redis-cache/
 [managedcache]: http://msdn.microsoft.com/library/azure/dn386122.aspx
 [websitescale]: web-sites-scale.md
 [managedcachescale]: http://msdn.microsoft.com/library/azure/dn386113.aspx
@@ -279,6 +279,6 @@ To do this... | Use this...
 [deploy]: web-sites-deploy.md
 [posh]: ../install-configure-powershell.md
 [Azure CLI]: ../xplat-cli-install.md
-[storesendgrid]: /gallery/store/sendgrid/sendgrid-azure/
+[storesendgrid]: https://azure.microsoft.com/marketplace/partners/sendgrid/sendgrid-azure/
 [cdn]: ../cdn-how-to-use.md
 

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

@@ -118,7 +118,7 @@ HttpProxy.Port=<proxy port>
 	![Create a new rule](./media/backup-azure-vms-prepare/firewall-02.png)
 2. In the *New Inbound Rule Wizard* choose the **Custom** option for the *Rule Type* and click Next. In the screen to select the *Program* choose **All Programs** and click Next.
 
-3. In the *Protcol and Ports* screen use the inputs in the table below and click Next:
+3. In the *Protocol and Ports* screen use the inputs in the table below and click Next:
 
 	![Create a new rule](./media/backup-azure-vms-prepare/firewall-03.png)
 

articles/backup/backup-azure-vms.md

@@ -72,7 +72,7 @@ You register an Azure virtual machine to associate the it with the Azure Backup
 
     ![register job](./media/backup-azure-vms/register-create-job.png)
 
-   The virtual machine also appears in the list of registered items along with the status of the registration operation.
+    The virtual machine also appears in the list of registered items along with the status of the registration operation.
 
     ![Registering status 1](./media/backup-azure-vms/register-status01.png)
 

articles/backup/backup-configure-vault.md

@@ -13,10 +13,10 @@
 	ms.tgt_pltfrm="na"
 	ms.devlang="na"
 	ms.topic="hero-article"
-	ms.date="08/21/2015"
+	ms.date="11/03/2015"
 	ms.author="jimpark"; "aashishr"/>
 
-# Configure Azure Backup to prepare for back up of Windows Server
+# Prepare your environment to back up Windows machines
 
 This article will lead you through enabling the Azure Backup feature. To back up Windows Server or Windows Client to Azure, you need an Azure account. If you don't have an account, you can create a free trial account in just a couple of minutes. For details, see [Azure Free Trial](https://azure.microsoft.com/pricing/free-trial/).
 >[AZURE.NOTE] Previously you needed to create or acquire a X.509 v3 certificate in order to register your backup server. Certificates are still supported, but now to make Azure vault registration with a server easier, you can generate a vault credential right from the Quick Start page.