Backport 2.x updates to 1.8

Author: Stephen Tramer

docs-conceptual/azps-1.8.0/authenticate-azureps.md

@@ -71,17 +71,17 @@ store based on a certificate thumbprint.
 Connect-AzAccount -ServicePrincipal -TenantId $tenantId -CertificateThumbprint <thumbprint>
 ```
 
-In PowerShell 5, the certificate store can be managed and inspected with the [PKI](/powershell/module/pkiclient) module. For PowerShell 6, the process is more complicated. The following scripts show you how to import an existing certificate into the certificate store accessible by PowerShell.
+In PowerShell 5.1, the certificate store can be managed and inspected with the [PKI](/powershell/module/pkiclient) module. For PowerShell Core 6.x and later, the process is more complicated. The following scripts show you how to import an existing certificate into the certificate store accessible by PowerShell.
 
-#### Import a certificate in PowerShell 5
+#### Import a certificate in PowerShell 5.1
 
 ```azurepowershell-interactive
 # Import a PFX
 $credentials = Get-Credential -Message "Provide PFX private key password"
 Import-PfxCertificate -FilePath <path to certificate> -Password $credentials.Password -CertStoreLocation cert:\CurrentUser\My
 ```
 
-#### Import a certificate in PowerShell 6
+#### Import a certificate in PowerShell Core 6.x and later
 
 ```azurepowershell-interactive
 # Import a PFX

docs-conceptual/azps-1.8.0/context-persistence.md

@@ -1,5 +1,5 @@
 ---
-title: Persist user credentials across PowerShell sessions
+title: Persist Azure credentials across PowerShell sessions
 description: Learn how to reuse Azure credentials and other information across multiple PowerShell sessions.
 author: sptramer
 ms.author: sttramer
@@ -8,7 +8,7 @@ ms.devlang: powershell
 ms.topic: conceptual
 ms.date: 12/13/2018
 ---
-# Persist user credentials across PowerShell sessions
+# Persist Azure user credentials across PowerShell sessions
 
 Azure PowerShell offers a feature called **Azure Context Autosave**, which gives the following features:
 

docs-conceptual/azps-1.8.0/install-az-ps.md

@@ -19,7 +19,7 @@ are supported.
 
 Azure PowerShell works with PowerShell 5.1 or higher on Windows, or PowerShell Core 6.x and later on
 all platforms. If you aren't sure if you have PowerShell, or are on macOS or Linux,
-[install the latest PowerShell Core](/powershell/scripting/install/installing-powershell#powershell-core).
+[install the latest version of PowerShell Core](/powershell/scripting/install/installing-powershell#powershell-core).
 
 To check your PowerShell version, run the command:
 
@@ -95,12 +95,17 @@ across PowerShell sessions, see [Persist user credentials across PowerShell sess
 
 ## Update the Azure PowerShell module
 
-You can update your Azure PowerShell installation by running [Update-Module](/powershell/module/powershellget/update-module). This command does __not__ uninstall older versions.
+Because of how the Az module is package, the [Update-Module](/powershell/module/powershellget/update-module)
+command won't update your installation correctly. Az is technically a meta-module, encompassing all of
+the submodules that contain cmdlets to interact with Azure services. That means that to update the
+Azure PowerShell module, you will need to __reinstall__, rather than just __update__. This is done in the
+same way as installing, but you may need to add the `-Force` argument:
 
-```powershell-interactive
-Update-Module -Name Az
+```powershell
+Install-Module -Name Az -AllowClobber -Force
 ```
 
+Although this can overwrite installed modules, you may still have older versions left on your system.
 To learn how to remove old versions of Azure PowerShell from your system, see [Uninstall the Azure PowerShell module](uninstall-az-ps.md).
 
 ## Use multiple versions of Azure PowerShell

docs-conceptual/azps-1.8.0/migrate-az-1.0.0.md

@@ -186,15 +186,15 @@ The tools for these services are no longer actively supported.  Customers are en
 ### Windows PowerShell 5.1 and .NET 4.7.2
 
 Using Az with PowerShell 5.1 for Windows requires the installation of .NET Framework 4.7.2. Using PowerShell
-Core 6.x or later does not have a .NET Framework dependency.
+Core 6.x or later does not require .NET Framework.
 
 ### Temporary removal of User login using PSCredential
 
-Due to changes in the authentication flow for .NET Standard, we are temporarily removing user login via PSCredential. This capability will be re-introduced in the 1/15/2019 release for Windows PowerShell 5.1. This is discussed in detail in [this GitHub issue.](https://github.com/Azure/azure-powershell/issues/7430)
+Due to changes in the authentication flow for .NET Standard, we are temporarily removing user login via PSCredential. This capability will be re-introduced in the 1/15/2019 release for PowerShell 5.1 for Windows. This is discussed in detail in [this GitHub issue.](https://github.com/Azure/azure-powershell/issues/7430)
 
 ### Default device code login instead of web browser prompt
 
-Due to changes in the authentication flow for .NET Standard, we are using device login as the default login flow during interactive login. Web browser based login will be re-introduced for Windows PowerShell 5.1 as the default in the 1/15/2019 release. At that time, users will be able to choose device login using a Switch parameter.
+Due to changes in the authentication flow for .NET Standard, we are using device login as the default login flow during interactive login. Web browser based login will be re-introduced for PowerShell 5.1 for Windows as the default in the 1/15/2019 release. At that time, users will be able to choose device login using a Switch parameter.
 
 ## Module breaking changes
 
@@ -207,7 +207,7 @@ This section details specific breaking changes for individual modules and cmdlet
   - Set-AzureRmApiManagementHostnames
   - Update-AzureRmApiManagementDeployment
   - Import-AzureRmApiManagementHostnameCertificate
-  - Use **Set-AzApiManagement** cmdlet to set these properites instead
+  - Use **Set-AzApiManagement** cmdlet to set these properties instead
 - Removed the following properties:
   - Removed property `PortalHostnameConfiguration`, `ProxyHostnameConfiguration`, `ManagementHostnameConfiguration` and `ScmHostnameConfiguration` of type `PsApiManagementHostnameConfiguration` from `PsApiManagementContext`. Instead use `PortalCustomHostnameConfiguration`, `ProxyCustomHostnameConfiguration`, `ManagementCustomHostnameConfiguration` and `ScmCustomHostnameConfiguration` of type `PsApiManagementCustomHostNameConfiguration`.
   - Removed property `StaticIPs` from PsApiManagementContext. The property has been split into `PublicIPAddresses` and `PrivateIPAddresses`.
@@ -259,8 +259,8 @@ This section details specific breaking changes for individual modules and cmdlet
   New-AzDataLakeStoreAccount -Tag @{TagName="TagValue"}
   ```
 
-- Removed deprecated properties ```Identity```, ```EncryptionState```, ```EncrypotionProvisioningState```, ```EncryptionConfig```, ```FirewallState```, ```FirewallRules```, ```VirtualNetworkRules```, ```TrustedIdProviderState```, ```TrustedIdProviders```, ```DefaultGroup```, ```NewTier```, ```CurrentTier```, ```FirewallAllowAzureIps``` from ```PSDataLakeStoreAccountBasic``` object.  Any script that 
-uses the ```PSDatalakeStoreAccount``` returned from ```Get-AzDataLakeStoreAccount``` should not reference these properties.
+- Removed deprecated properties `Identity`, `EncryptionState`, `EncryptionProvisioningState`, `EncryptionConfig`, `FirewallState`, `FirewallRules`, `VirtualNetworkRules`, `TrustedIdProviderState`, `TrustedIdProviders`, `DefaultGroup`, `NewTier`, `CurrentTier`, `FirewallAllowAzureIps` from `PSDataLakeStoreAccountBasic` object.  Any script that 
+uses the `PSDatalakeStoreAccount` returned from `Get-AzDataLakeStoreAccount` should not reference these properties.
 
 ### Az.KeyVault (previously AzureRM.KeyVault)
 
@@ -299,7 +299,7 @@ uses the ```PSDatalakeStoreAccount``` returned from ```Get-AzDataLakeStoreAccoun
 - Removed deprecated `EnableVmProtection` property from `PSVirtualNetwork` object
 - Removed deprecated `Set-AzVirtualNetworkGatewayVpnClientConfig` cmdlet
 
-Scripts shoudl no longer make processing decisions based on the values fo these fields.
+Scripts should no longer make processing decisions based on the values fo these fields.
 
 ### Az.OperationalInsights (previously AzureRM.OperationalInsights)
 
@@ -342,7 +342,7 @@ Scripts shoudl no longer make processing decisions based on the values fo these
 ### Az.ServiceFabric (previously AzureRM.ServiceFabric)
 
 - The following cmdlet return types have been changed:
-  - The property `SerivceTypeHealthPolicies` of type `ApplicationHealthPolicy` has been removed.
+  - The property `ServiceTypeHealthPolicies` of type `ApplicationHealthPolicy` has been removed.
   - The property `ApplicationHealthPolicies` of type `ClusterUpgradeDeltaHealthPolicy` has been removed.
   - The property `OverrideUserUpgradePolicy` of type `ClusterUpgradePolicy` has been removed.
   - These changes affect the following cmdlets:

docs-conceptual/azps-1.8.0/new-azureps-module-az.md

@@ -36,7 +36,7 @@ _Verb_-`Az`_Noun_ form. Previously, cmdlet names were not only longer, there wer
 in cmdlet names.
 
 The number of modules was also reduced: Some modules which worked with the same services have been rolled
-together, and magement plane and data plane cmdlets are now contained all within single modules for their
+together, and management plane and data plane cmdlets are now contained all within single modules for their
 services. For those of you who manually manage dependencies and imports, this makes things much simpler.
 
 By making these important changes that required building a new Azure PowerShell module, the team has

docs-conceptual/azps-1.8.0/overview.md

@@ -19,8 +19,8 @@ Azure PowerShell is also available on Azure Cloud Shell.
 ## About the new Az module
 
 This documentation describes the new Az module for Azure PowerShell. This new module is written from the
-ground up in .NET Standard. Using .NET Standard allows Azure PowerShell to run under PowerShell 5 on Windows
-or PowerShell 6 on any platform. The Az module is now the intended way to interact with Azure through PowerShell.
+ground up in .NET Standard. Using .NET Standard allows Azure PowerShell to run under PowerShell 5.1 on Windows
+or PowerShell Core 6.x and later on any platform. The Az module is now the intended way to interact with Azure through PowerShell.
 AzureRM will continue to get bug fixes, but no longer receive new features.
 
 Learn the full details about the new module, including how commands have been renamed and the maintenance
@@ -38,8 +38,8 @@ The [AzureRM documentation](/powershell/azure/azurerm) is also available.
 
 ## Run or install
 
-You can install Azure PowerShell on PowerShell 5.1 or higher on Windows, PowerShell 6 on any platform, or run
-in Azure Cloud Shell.
+You can install Azure PowerShell on PowerShell 5.1 or higher on Windows, PowerShell Core 6.x and later on
+any platform, or run in Azure Cloud Shell.
 
 * To run in your browser with Azure Cloud Shell, see [Quickstart for PowerShell in Azure Cloud Shell](/azure/cloud-shell/quickstart-powershell).
 * To install Azure PowerShell on your system, see [Install Azure PowerShell](install-az-ps.md).

docs-conceptual/azps-1.8.0/uninstall-az-ps.md

@@ -145,7 +145,7 @@ part of the `Az.Accounts` module. This removes _all_ AzureRM modules from your m
 Uninstall-AzureRm
 ```
 
-If you can't successfully run the `Uninstall-AzureRM` command, use the [`Uninstall-AllModules` script](#uninstall-script) provided in this article, with the following invocation:
+If you can't successfully run the `Uninstall-AzureRM` command, use the [`Uninstall-AllModules` script](#uninstall-script) provided in this article with the following invocation:
 
 ```powershell-interactive
 $versions = (Get-InstalledModule AzureRM -AllVersions | Select-Object Version)