Merge pull request #10738 from JoeDavies-MSFT/2015-05-07

File name changes, updates to reset remote access topics, new SharePo…

articles/virtual-machines-create-windows-powershell-rm-template-simple.md → articles/virtual-machines-create-windows-powershell-resource-manager-template-simple.md

@@ -20,7 +20,7 @@
 
 You can easily create a new Windows-based Azure virtual machine (VM) using a Resource Manager template with Azure PowerShell. This template creates a single virtual machine running Windows in a new virtual network with a single subnet in a new resource group.
 
-![](./media/virtual-machines-create-windows-powershell-rm-template-simple/windowsvm.png)
+![](./media/virtual-machines-create-windows-powershell-resource-manager-template-simple/windowsvm.png)
 
 Before you dive in, make sure you have Azure and PowerShell configured and ready to go.
 
@@ -94,9 +94,9 @@ You now have a new Windows virtual machine named MyWindowsVM in your new resourc
 
 [Azure Resource Manager Overview](resource-group-overview.md)
 
-[Create a Windows virtual machine with Azure Resource Manager and PowerShell](virtual-machines-create-windows-powershell-rm.md)
+[Create a Windows virtual machine with Azure Resource Manager and PowerShell](virtual-machines-create-windows-powershell-resource-manager.md)
 
-[Create a Windows virtual machine with PowerShell and Azure Service Manager](virtual-machines-create-windows-powershell-sm.md)
+[Create a Windows virtual machine with PowerShell and Azure Service Manager](virtual-machines-create-windows-powershell-service-manager.md)
 
 [Virtual machines documentation](http://azure.microsoft.com/documentation/services/virtual-machines/)
 

articles/virtual-machines-create-windows-powershell-rm-template.md → articles/virtual-machines-create-windows-powershell-resource-manager-template.md

@@ -20,7 +20,7 @@
 
 You can easily create a new Windows-based Azure virtual machine (VM) using a Resource Manager template with Azure PowerShell or the Azure CLI. This template creates a single virtual machine running Windows in a new virtual network with a single subnet in a new resource group.
 
-![](./media/virtual-machines-create-windows-powershell-rm-template/windowsvm.png)
+![](./media/virtual-machines-create-windows-powershell-resource-manager-template/windowsvm.png)
 
 Before you dive in, make sure you have Azure, PowerShell, and Azure CLI configured and ready to go.
 
@@ -324,9 +324,9 @@ You would see something like this:
 
 [Azure Resource Manager Overview](resource-group-overview.md)
 
-[Create a Windows virtual machine with Azure Resource Manager and PowerShell](virtual-machines-create-windows-powershell-rm.md)
+[Create a Windows virtual machine with Azure Resource Manager and PowerShell](virtual-machines-create-windows-powershell-resource-manager.md)
 
-[Create a Windows virtual machine with PowerShell and Azure Service Manager](virtual-machines-create-windows-powershell-sm.md)
+[Create a Windows virtual machine with PowerShell and Azure Service Manager](virtual-machines-create-windows-powershell-service-manager.md)
 
 [Virtual machines documentation](http://azure.microsoft.com/documentation/services/virtual-machines/)
 

articles/virtual-machines-create-windows-powershell-rm.md → articles/virtual-machines-create-windows-powershell-resource-manager.md

@@ -126,9 +126,9 @@ Here is an example of you might see:
 
 [Azure Resource Manager Overview](resource-group-overview.md)
 
-[Create a Windows virtual machine with a Resource Manager template and PowerShell](virtual-machines-create-windows-powershell-rm-template-simple.md)
+[Create a Windows virtual machine with a Resource Manager template and PowerShell](virtual-machines-create-windows-powershell-resource-manager-template-simple.md)
 
-[Create a Windows virtual machine with PowerShell and Azure Service Manager](virtual-machines-create-windows-powershell-sm.md)
+[Create a Windows virtual machine with PowerShell and Azure Service Manager](virtual-machines-create-windows-powershell-service-manager.md)
 
 [Virtual machines documentation](http://azure.microsoft.com/documentation/services/virtual-machines/)
 

articles/virtual-machines-create-windows-powershell-sm.md → articles/virtual-machines-create-windows-powershell-service-manager.md

@@ -128,9 +128,9 @@ Here is an example of what running the command set looks like.
 
 ## Additional Resources
 
-[Create a Windows virtual machine with Azure Resource Manager and PowerShell](virtual-machines-create-windows-powershell-rm.md)
+[Create a Windows virtual machine with Azure Resource Manager and PowerShell](virtual-machines-create-windows-powershell-resource-manager.md)
 
-[Create a Windows virtual machine with a Resource Manager template and PowerShell](virtual-machines-create-windows-powershell-rm-template-simple.md)
+[Create a Windows virtual machine with a Resource Manager template and PowerShell](virtual-machines-create-windows-powershell-resource-manager-template-simple.md)
 
 [Virtual machines documentation](http://azure.microsoft.com/documentation/services/virtual-machines/)
 

articles/virtual-machines-linux-use-vmaccess-reset-password-or-ssh.md

@@ -1,6 +1,6 @@
 <properties 
 	pageTitle="How to Use VMAccess for Linux Virtual Machines" 
-	description="How to use the VMAccess extension for Linux to reset passwords and SSH keys, to resent SSH configurations, and delete Linux users" 
+	description="How to use the Azure Preview Portal or the VMAccess extension for Linux to reset passwords and SSH keys, to reset SSH configurations, and delete Linux users." 
 	services="virtual-machines" 
 	documentationCenter="" 
 	authors="KBDAzure" 
@@ -13,29 +13,42 @@
 	ms.tgt_pltfrm="vm-linux" 
 	ms.devlang="na" 
 	ms.topic="article" 
-	ms.date="03/24/2015" 
+	ms.date="05/07/2015" 
 	ms.author="kathydav"/>
 
 # How to Reset a Password or SSH for Linux Virtual Machines #
 
-If you can't connect to a Linux virtual machine because of a forgotten password, an incorrect Secure Shell (SSH) key, or a problem with the SSH configuration, use the VMAccessForLinux extension to reset the password or SSH key or fix the SSH configuration. 
+If you can't connect to a Linux virtual machine because of a forgotten password, an incorrect Secure Shell (SSH) key, or a problem with the SSH configuration, use the Azure Preview Portal or the  VMAccessForLinux extension to reset the password or SSH key or fix the SSH configuration. 
 
-## Requirements
+## Azure Preview Portal
+
+To reset the SSH configuration in the [Azure Preview Portal](https://portal.azure.com), click **Browse** > **Virtual machines** > *your Linux virtual machine* > **Reset Remote Access**. Here is an example.
+
+![](./media/virtual-machines-linux-use-vmaccess-reset-password-or-ssh/Portal-RDP-Reset-Linux.png)
+
+To reset the name and password of the user account with sudo privileges or the SSH public key in the [Azure Preview Portal](https://portal.azure.com), click **Browse** > **Virtual machines** > *your Linux virtual machine* > **All settings** > **Password reset**. Here is an example.
+
+![](./media/virtual-machines-linux-use-vmaccess-reset-password-or-ssh/Portal-PW-Reset-Linux.png)
+
+
+## Azure CLI and PowerShell
+
+You will need the following:
 
 - Microsoft Azure Linux Agent version 2.0.5 or later. Most Linux images in the Virtual Machine gallery include version 2.0.5. To find out which version is installed, run **waagent -version**. To update the agent, follow the instructions in the [Azure Linux Agent User Guide].
-- Azure Cross-Platform Command-Line Interface (CLI). For details on setting up the Cross-Platform CLI, see [Install and Configure the Azure Cross-Platform Command-Line Interface](xplat-cli.md).
+- Azure Command-Line Interface (CLI). For details on setting up the Azure CLI, see [Install and Configure the Azure Cross-Platform Command-Line Interface](xplat-cli.md).
 - Azure PowerShell. You'll use commands in the Set-AzureVMExtension cmdlet to automatically load and configure the VMAccessForLinux extension. For details on setting up Azure PowerShell, see [How to install and configure Azure PowerShell].
 - A new password or set of SSH keys, if you want to reset either one. You don't need these if you want to reset the SSH configuration. 
 
 ### No installation needed
 
 The VMAccess extension doesn't need to be installed before you can use it. As long as the Linux Agent is installed on the virtual machine, the extension is loaded automatically when you run an Azure PowerShell command that uses the **Set-AzureVMExtension** cmdlet. 
 
-## Use the Cross-Platform CLI
+## Use the Azure CLI
 
-With the Cross-Platform CLI, you will be able to use the **azure** command from your command-line interface (Bash, Terminal, Command prompt) to access commands. Run **azure vm extension set –help** for detailed extension usage.
+With the Azure CLI, you will be able to use the **azure** command from your command-line interface (Bash, Terminal, Command prompt) to access commands. Run **azure vm extension set –help** for detailed extension usage.
 
-With the Cross-Platform CLI, you can do the following tasks:
+With the Azure CLI, you can do the following tasks:
 
 + [Reset the password](#pwresetcli)
 + [Reset the SSH key](#sshkeyresetcli)

articles/virtual-machines-sharepoint-infrastructure-services.md

@@ -1,6 +1,6 @@
 <properties 
 	pageTitle="SharePoint farms hosted in Azure infrastructure services" 
-	description="Get to the key topics that describe how to set up a dev/test or production SharePoint 2013 farm in Azure infrastructure services." 
+	description="Get to the key topics that describe how to set up a dev/test or production SharePoint 2013 farm in Azure. infrastructure services." 
 	documentationCenter="" 
 	services="virtual-machines"
 	authors="JoeDavies-MSFT" 
@@ -26,7 +26,7 @@ You can use the [SharePoint Server Farm](virtual-machines-sharepoint-farm-azure-
 
 The automatically-created environment consists of three servers for a domain controller, a SQL server, and the SharePoint server in a cloud-only Azure Virtual Network.
 
-## Highly-available SharePoint dev/test farm
+## High-availability SharePoint dev/test farm
 
 You can also use the [SharePoint Server Farm](virtual-machines-sharepoint-farm-azure-preview.md) template in the Azure Preview Portal to create a high-availability SharePoint dev/test farm for an Internet-facing SharePoint web site.
 
@@ -36,9 +36,9 @@ The automatically-created environment consisting of nine servers in a cloud-only
 
 With the [SharePoint intranet farm in a hybrid cloud dev/test environment](virtual-networks-setup-sharepoint-hybrid-cloud-testing.md), you create a simulated hybrid cloud configuration that hosts a simple, two-tier SharePoint farm, which you can use to test an intranet SharePoint farm hosted in Azure from your location on the Internet.
 
-## Highly-available, intranet SharePoint production farm
+## High-availability, intranet SharePoint production farm
 
-With [Deploying SharePoint 2013 with SQL Server AlwaysOn Availability Groups in Azure](virtual-machines-workload-intranet-sharepoint-overview.md), you build out a production-ready, highly-available, intranet SharePoint Server 2013 farm in Azure.
+With [Deploying SharePoint 2013 with SQL Server AlwaysOn Availability Groups in Azure](virtual-machines-workload-intranet-sharepoint-overview.md), you build out a production-ready, high-availability, intranet SharePoint Server 2013 farm in Azure.
 
 ## Additional Resources
 

articles/virtual-machines-windows-reset-password.md

@@ -1,6 +1,6 @@
 <properties 
 	pageTitle="How to Reset a Password or the Remote Desktop Service for Windows Virtual Machines" 
-	description="Quickly reset a local administrator password or the Remote Desktop Service for Windows Virtual Machines using PowerShell commands." 
+	description="Quickly reset a local administrator password or the Remote Desktop Service for Windows virtual machines using the Azure Preview Portal or PowerShell commands." 
 	services="virtual-machines" 
 	documentationCenter="" 
 	authors="JoeDavies-MSFT" 
@@ -13,14 +13,26 @@
 	ms.tgt_pltfrm="na" 
 	ms.devlang="na" 
 	ms.topic="article" 
-	ms.date="03/25/2015" 
+	ms.date="05/07/2015" 
 	ms.author="josephd"/>
 
 # How to Reset a Password or the Remote Desktop Service for Windows Virtual Machines
 
-If you can't connect to a Windows virtual machine because of a forgotten password or a problem with the Remote Desktop service configuration, use the VMAccess extension to reset the local administrator password or reset the Remote Desktop service configuration.
+If you can't connect to a Windows virtual machine because of a forgotten password or a problem with the Remote Desktop service configuration, use the Azure Preview Portal or the VMAccess extension to reset the local administrator password or reset the Remote Desktop service configuration.
+
+## Azure Preview Portal
+
+To reset the Remote Desktop service in the [Azure Preview Portal](https://portal.azure.com), click **Browse** > **Virtual machines** > *your Windows virtual machine* > **Reset Remote Access**. Here is an example. 
+
+
+![](./media/virtual-machines-windows-reset-password/Portal-RDP-Reset-Windows.png)
+
+To reset the name and password of the local administrator account in the [Azure Preview Portal](https://portal.azure.com), click **Browse** > **Virtual machines** > *your Windows virtual machine* > **All settings** > **Password reset**. Here is an example.
+
+![](./media/virtual-machines-windows-reset-password/Portal-PW-Reset-Windows.png)
+
 
-## Requirements
+## VMAccess Extension and PowerShell
 
 Before you begin, you'll need the following:
 

articles/virtual-machines-workload-intranet-sharepoint-farm.md

@@ -0,0 +1,121 @@
+<properties 
+	pageTitle="Azure Infrastructure Services Workload: Intranet SharePoint Farm" 
+	description="Learn about the value of an intranet SharePoint farm deployed in Azure, how to set up a dev/test environment, and how to deploy a high-availability production configuration." 
+	services="virtual-machines" 
+	documentationCenter="" 
+	authors="JoeDavies-MSFT" 
+	manager="timlt" 
+	editor=""/>
+
+<tags 
+	ms.service="virtual-machines" 
+	ms.workload="infrastructure-services" 
+	ms.tgt_pltfrm="vm-linux" 
+	ms.devlang="na" 
+	ms.topic="article" 
+	ms.date="05/07/2015" 
+	ms.author="josephd"/>
+
+# Azure Infrastructure Services Workload: Intranet SharePoint Farm
+
+Set up your first or next SharePoint farm in Microsoft Azure and take advantage of ease of configuration and the ability to quickly expand the farm to include new capacity or optimization of key functionality. Many SharePoint farms grow from a standard, highly-available, three-tier configuration to a farm with possibly a dozen or more servers optimized for performance or separate roles, such as distributed caching or search.
+
+With the Virtual Machines and Virtual Network features of Azure infrastructure services, you can quickly deploy and run a SharePoint farm that is transparently connected to your on-premises network. For example, you can set this up.
+
+![](./media/virtual-machines-workload-intranet-sharepoint-farm/workload-spsqlao.png)
+
+Because the Azure Virtual Network is an extension of your on-premises network with all of the correct naming and traffic routing in place, your users will access it in the same way as if it were located in an on-premises datacenter.
+
+This configuration allows you to easily expand the SharePoint farm by adding new Azure virtual machines in which the ongoing costs of both hardware and maintenance are lower than running an equivalent farm in your datacenter.
+
+Hosting an intranet SharePoint farm in Azure infrastructure services is an example of a line of business application. For an overview, see the [Line of Business Applications architecture blueprint](http://msdn.microsoft.com/dn630664). 
+
+Your next step is to set up a dev/test intranet SharePoint farm hosted in Azure.
+
+## Create a dev/test intranet SharePoint farm hosted in Azure
+
+You have a few choices for creating a dev/test environment for a SharePoint farm hosted in Azure:
+
+- Cloud-only virtual network
+- Cross-premises virtual network
+
+You can create these dev/test environments for free with your [MSDN subscription](http://azure.microsoft.com/pricing/member-offers/msdn-benefits/) or an [Azure Trial Subscription](http://azure.microsoft.com/pricing/free-trial/).
+
+### Cloud-only virtual network
+
+A cloud-only virtual network is not connected to an on-premises network. If you just want to quickly create a basic or high-availability SharePoint farm, see [SharePoint Server Farm](virtual-machines-sharepoint-farm-azure-preview.md). Here is the basic SharePoint farm configuration.
+
+![](./media/virtual-machines-workload-intranet-sharepoint-farm/SPFarm_Basic.png)
+
+### Cross-premises virtual network
+
+A cross-premises virtual network is connected to an on-premises network with a site-to-site VPN or ExpressRoute connection. If you want to create a dev/test environment that mimics the final configuration and experiment with accessing the SharePoint server and performing remote administration over a VPN connection, see [Set up a SharePoint intranet farm in a hybrid cloud for testing](virtual-networks-setup-sharepoint-hybrid-cloud-testing.md). 
+
+![](./media/virtual-machines-workload-intranet-sharepoint-farm/CreateSPFarmHybridCloud.png)
+
+Your next step is to create a high-availability intranet SharePoint farm in Azure.
+
+## Deploy an intranet SharePoint farm hosted in Azure
+
+The baseline, representative configuration for a functional, high-availability intranet SharePoint farm in Azure looks like this.
+
+![](./media/virtual-machines-workload-intranet-sharepoint-farm/workload-spsqlao.png)
+
+This consists of:
+
+- An intranet SharePoint farm with two servers at the web, application, and database tiers.
+- SQL Server AlwaysOn Availability Groups configuration with two SQL servers and a majority node computer in a cluster.
+- Active Directory in the virtual network with two replica domain controllers.
+
+To see this configuration as an infographic, see [SharePoint with SQL Server AlwaysOn](http://go.microsoft.com/fwlink/?LinkId=394788).
+
+### Bill of materials
+
+This baseline configuration requires the following set of Azure services and components:
+
+- Nine virtual machines
+- Four extra data disks for the domain controllers and SQL servers
+- Three cloud services
+- Four availability sets
+- One cross-premises virtual network
+- One storage account
+- One Azure subscription
+
+### Deployment phases
+
+To deploy this configuration, use the following process:
+
+- Phase 1: Configure Azure 
+
+	Use the Azure Management Portal and Azure PowerShell to create a storage account, cloud services, and a cross-premises virtual network. For the detailed configuration steps, see [Phase 1](virtual-machines-workload-intranet-sharepoint-phase1.md).
+
+- Phase 2: Configure the domain controllers 
+
+	Configure two Active Directory replica domain controllers and DNS settings for the virtual network. For the detailed configuration steps, see [Phase 2](virtual-machines-workload-intranet-sharepoint-phase2.md).
+
+- Phase 3: Configure the SQL Server infrastructure.  
+
+	Prepare the SQL Server virtual machines for use with SharePoint and create the SQL Server cluster. For the detailed configuration steps, see [Phase 3](virtual-machines-workload-intranet-sharepoint-phase3.md).
+
+- Phase 4: Configure the SharePoint servers.
+
+	Configure the four SharePoint virtual machines for a new SharePoint farm. For the detailed configuration, see [Phase 4](virtual-machines-workload-intranet-sharepoint-phase4.md).
+
+- Phase 5: Create an AlwaysOn Availability Group. 
+
+	Prepare the SharePoint databases, create an AlwaysOn Availability Group, and then add the SharePoint databases to it. For the detailed configuration steps, see [Phase 5](virtual-machines-workload-intranet-sharepoint-phase5.md).
+
+Once configured, you can expand this SharePoint farm with guidance from [Microsoft Azure Architectures for SharePoint 2013](http://technet.microsoft.com/library/dn635309.aspx).
+
+## Additional resources
+
+[SharePoint farms hosted in Azure infrastructure services](virtual-machines-sharepoint-infrastructure-services.md)
+
+[Deploying SharePoint with SQL Server AlwaysOn Availability Groups in Azure](virtual-machines-workload-deploy-spsqlao-overview.md)
+
+[Set up a SharePoint intranet farm in a hybrid cloud for testing](virtual-networks-setup-sharepoint-hybrid-cloud-testing.md)
+
+[Microsoft Azure Architectures for SharePoint 2013](https://technet.microsoft.com/library/dn635309.aspx)
+
+[SharePoint with SQL Server AlwaysOn Infographic](http://go.microsoft.com/fwlink/?LinkId=394788)
+