diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationAccount.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationAccount.md
index b50f047e45..637cf43649 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationAccount.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationAccount.md
@@ -23,7 +23,7 @@ Get-AzureAutomationAccount [-Name <String>] [-Location <String>] [-Profile <Azur
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationAccount** cmdlet gets the Microsoft Azure Automation accounts for your subscription.
 An Automation account is a container for Automation resources that is isolated from the resources of other Automation accounts.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationCertificate.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationCertificate.md
index eda3b77ec8..6e55aa5cf5 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationCertificate.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationCertificate.md
@@ -29,7 +29,7 @@ Get-AzureAutomationCertificate -Name <String> -AutomationAccountName <String> [-
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationCertificate** cmdlet gets one or more Microsoft Azure Automation certificates.
 By default, all certificates are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationConnection.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationConnection.md
index 41390ce84f..1b348ab704 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationConnection.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationConnection.md
@@ -35,7 +35,7 @@ Get-AzureAutomationConnection -ConnectionTypeName <String> -AutomationAccountNam
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationConnection** cmdlet gets one or more Microsoft Azure Automation connections.
 By default, all connections are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationCredential.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationCredential.md
index 0ad1146d4f..6694ef06a1 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationCredential.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationCredential.md
@@ -29,7 +29,7 @@ Get-AzureAutomationCredential -Name <String> -AutomationAccountName <String> [-P
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationCredential** cmdlet gets one or more Microsoft Azure Automation credentials.
 By default, all credentials are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationJob.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationJob.md
index aaf9e6b13e..714e95dd62 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationJob.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationJob.md
@@ -36,7 +36,7 @@ Get-AzureAutomationJob -RunbookName <String> [-Status <String>] [-StartTime <Dat
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationJob** cmdlet gets one or more runbook jobs in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationJobOutput.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationJobOutput.md
index d539ac8303..41f54f215a 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationJobOutput.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationJobOutput.md
@@ -23,7 +23,7 @@ Get-AzureAutomationJobOutput -Id <Guid> [-Stream <StreamType>] [-StartTime <Date
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationJobOutput** cmdlet gets the output of a Microsoft Azure Automation job.
 
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationModule.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationModule.md
index cf04f96dc2..747c6f068d 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationModule.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationModule.md
@@ -29,7 +29,7 @@ Get-AzureAutomationModule -Name <String> -AutomationAccountName <String> [-Profi
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationModule** cmdlet gets one or more Microsoft Azure Automation modules.
 By default, all modules are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbook.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbook.md
index 6ec514ee26..a0342a842d 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbook.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbook.md
@@ -29,7 +29,7 @@ Get-AzureAutomationRunbook -Name <String> -AutomationAccountName <String> [-Prof
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationRunbook** cmdlet gets one or more Microsoft Azure Automation runbooks.
 By default, all runbooks are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbookDefinition.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbookDefinition.md
index 6556e7b53c..d6d84743b0 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbookDefinition.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationRunbookDefinition.md
@@ -23,7 +23,7 @@ Get-AzureAutomationRunbookDefinition -Name <String> [-Slot <String>] -Automation
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationRunbookDefinition** cmdlet gets the draft definition, the published definition, or both definitions of an Azure Automation runbook.
 By default, the published version is returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationSchedule.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationSchedule.md
index 28594d804a..80de56db08 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationSchedule.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationSchedule.md
@@ -29,7 +29,7 @@ Get-AzureAutomationSchedule -Name <String> -AutomationAccountName <String> [-Pro
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationSchedule** cmdlet gets a Microsoft Azure Automation schedule.
 
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationScheduledRunbook.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationScheduledRunbook.md
index 6ee0e0f0e3..a312f36e8d 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationScheduledRunbook.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationScheduledRunbook.md
@@ -48,7 +48,7 @@ Get-AzureAutomationScheduledRunbook -ScheduleName <String> -AutomationAccountNam
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationScheduledRunbook** gets one or more Azure Automation runbooks and associated schedules.
 By default, all scheduled runbooks are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureAutomationVariable.md b/azuresmps-4.0.0/Azure/Get-AzureAutomationVariable.md
index 3cb0b332d3..5f0b814960 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureAutomationVariable.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureAutomationVariable.md
@@ -29,7 +29,7 @@ Get-AzureAutomationVariable -Name <String> -AutomationAccountName <String> [-Pro
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Get-AzureAutomationVariable** cmdlet gets one or more Microsoft Azure Automation variables.
 By default, all variables are returned.
diff --git a/azuresmps-4.0.0/Azure/Get-AzureSBAuthorizationRule.md b/azuresmps-4.0.0/Azure/Get-AzureSBAuthorizationRule.md
index 73aa5744f8..36259f3842 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureSBAuthorizationRule.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureSBAuthorizationRule.md
@@ -31,7 +31,7 @@ Get-AzureSBAuthorizationRule [-Name <String>] [-Permission <AccessRights[]>] -Na
 ## DESCRIPTION
 Gets Service bus authorization rules.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/Get-AzureSBLocation.md b/azuresmps-4.0.0/Azure/Get-AzureSBLocation.md
index 56348d4d39..021371b1b1 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureSBLocation.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureSBLocation.md
@@ -25,7 +25,7 @@ To get the version of the module you're using, in the Azure PowerShell console,
 
 The **Get-AzureSBLocation** cmdlet returns the locations from which the Service Bus is available.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/Get-AzureSBNamespace.md b/azuresmps-4.0.0/Azure/Get-AzureSBNamespace.md
index c82a79c113..93d4d3c1b9 100644
--- a/azuresmps-4.0.0/Azure/Get-AzureSBNamespace.md
+++ b/azuresmps-4.0.0/Azure/Get-AzureSBNamespace.md
@@ -26,7 +26,7 @@ To get the version of the module you're using, in the Azure PowerShell console,
 
 The **Get-AzureSBNamespace** cmdlet returns the Service Bus service namespaces associated with the current subscription.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationAccount.md b/azuresmps-4.0.0/Azure/New-AzureAutomationAccount.md
index e2d99d0bed..d138358a68 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationAccount.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationAccount.md
@@ -22,7 +22,7 @@ New-AzureAutomationAccount -Name <String> -Location <String> [-Profile <AzureSMP
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationAccount** cmdlet creates a new account in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationCertificate.md b/azuresmps-4.0.0/Azure/New-AzureAutomationCertificate.md
index 885a870d37..21c811521f 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationCertificate.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationCertificate.md
@@ -23,7 +23,7 @@ New-AzureAutomationCertificate -Name <String> [-Description <String>] [-Password
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationCertificate** cmdlet creates a certificate in Microsoft Azure Automation.
 You provide the path to a certificate file to upload.
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationConnection.md b/azuresmps-4.0.0/Azure/New-AzureAutomationConnection.md
index 25dfe2a3a7..0bc724db8d 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationConnection.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationConnection.md
@@ -23,7 +23,7 @@ New-AzureAutomationConnection -Name <String> -ConnectionTypeName <String> -Conne
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationConnection** cmdlet creates a connection in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationCredential.md b/azuresmps-4.0.0/Azure/New-AzureAutomationCredential.md
index ea5e60a555..940fdaa172 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationCredential.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationCredential.md
@@ -23,7 +23,7 @@ New-AzureAutomationCredential -Name <String> [-Description <String>] -Value <PSC
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationCredential** cmdlet creates a credential as a **PSCredential** object in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationModule.md b/azuresmps-4.0.0/Azure/New-AzureAutomationModule.md
index e055854d25..6802b01cbe 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationModule.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationModule.md
@@ -23,7 +23,7 @@ New-AzureAutomationModule -Name <String> -ContentLink <Uri> [-Tags <IDictionary>
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationModule** cmdlet imports a module into Azure Automation.
 A module is a compressed file, with a .zip extension, that contains a folder which includes one of the following file types:
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationRunbook.md b/azuresmps-4.0.0/Azure/New-AzureAutomationRunbook.md
index ec0f52bf62..03009d2a1a 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationRunbook.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationRunbook.md
@@ -30,7 +30,7 @@ New-AzureAutomationRunbook -Path <String> [-Description <String>] [-Tags <String
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationRunbook** cmdlet creates a new, empty Microsoft Azure Automation runbook.
 Specify a name to create a new runbook.
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationSchedule.md b/azuresmps-4.0.0/Azure/New-AzureAutomationSchedule.md
index e2265c6ce5..f757c57265 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationSchedule.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationSchedule.md
@@ -38,7 +38,7 @@ New-AzureAutomationSchedule -Name <String> -StartTime <DateTimeOffset> [-Descrip
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationSchedule** cmdlet creates a schedule in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureAutomationVariable.md b/azuresmps-4.0.0/Azure/New-AzureAutomationVariable.md
index 3df0e2d9c4..204893f7d5 100644
--- a/azuresmps-4.0.0/Azure/New-AzureAutomationVariable.md
+++ b/azuresmps-4.0.0/Azure/New-AzureAutomationVariable.md
@@ -23,7 +23,7 @@ New-AzureAutomationVariable -Name <String> -Encrypted <Boolean> [-Description <S
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **New-AzureAutomationVariable** cmdlet creates a variable in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureSBAuthorizationRule.md b/azuresmps-4.0.0/Azure/New-AzureSBAuthorizationRule.md
index fa42197210..6ba98a77d1 100644
--- a/azuresmps-4.0.0/Azure/New-AzureSBAuthorizationRule.md
+++ b/azuresmps-4.0.0/Azure/New-AzureSBAuthorizationRule.md
@@ -31,7 +31,7 @@ New-AzureSBAuthorizationRule -Name <String> [-Permission <AccessRights[]>] -Name
 ## DESCRIPTION
 The **New-AzureSBAuthorizationRule** cmdlet creates a Service Bus authorization rule.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/New-AzureSBNamespace.md b/azuresmps-4.0.0/Azure/New-AzureSBNamespace.md
index 8db8fb15f4..374bf8652e 100644
--- a/azuresmps-4.0.0/Azure/New-AzureSBNamespace.md
+++ b/azuresmps-4.0.0/Azure/New-AzureSBNamespace.md
@@ -26,7 +26,7 @@ To get the version of the module you're using, in the Azure PowerShell console,
 
 The **New-AzureSBNamespace** cmdlet creates a service namespace for use with Service Bus in Azure.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/Publish-AzureAutomationRunbook.md b/azuresmps-4.0.0/Azure/Publish-AzureAutomationRunbook.md
index 9a55fdd9cd..ccbb07c23d 100644
--- a/azuresmps-4.0.0/Azure/Publish-AzureAutomationRunbook.md
+++ b/azuresmps-4.0.0/Azure/Publish-AzureAutomationRunbook.md
@@ -23,7 +23,7 @@ Publish-AzureAutomationRunbook -Name <String> -AutomationAccountName <String> [-
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Publish-AzureAutomationRunbook** cmdlet publishes a runbook for use in the production environment of Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Register-AzureAutomationScheduledRunbook.md b/azuresmps-4.0.0/Azure/Register-AzureAutomationScheduledRunbook.md
index ebdfeb7d12..324025230b 100644
--- a/azuresmps-4.0.0/Azure/Register-AzureAutomationScheduledRunbook.md
+++ b/azuresmps-4.0.0/Azure/Register-AzureAutomationScheduledRunbook.md
@@ -30,7 +30,7 @@ Register-AzureAutomationScheduledRunbook -RunbookName <String> -ScheduleName <St
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Register-AzureAutomationScheduledRunbook** cmdlet associates a runbook with a schedule.
 The runbook starts based on the schedule you specify using the *ScheduleName* parameter.
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationAccount.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationAccount.md
index 2639f47086..0499a34052 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationAccount.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationAccount.md
@@ -22,7 +22,7 @@ Remove-AzureAutomationAccount -Name <String> [-Force] [-Profile <AzureSMProfile>
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationAccount** cmdlet removes an account from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationCertificate.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationCertificate.md
index a2a19b1012..8db93f89c9 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationCertificate.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationCertificate.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationCertificate -Name <String> [-Force] -AutomationAccountName
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationAccount** cmdlet removes a certificate from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnection.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnection.md
index f3da7f1893..44f2c2bfc6 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnection.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnection.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationConnection -Name <String> [-Force] -AutomationAccountName
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationConnection** cmdlet removes a connection from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnectionType.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnectionType.md
index fc82f7491b..eafff0ba56 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnectionType.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationConnectionType.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationConnectionType -Name <String> [-Force] -AutomationAccountN
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationConnectionType** cmdlet removes an Azure Automation connection type.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationCredential.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationCredential.md
index f67fe32753..c25aa6575a 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationCredential.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationCredential.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationCredential -Name <String> [-Force] -AutomationAccountName
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationCredential** cmdlet removes a credential from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationModule.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationModule.md
index 33ca5e9721..341b09befd 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationModule.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationModule.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationModule -Name <String> [-Force] -AutomationAccountName <Str
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationModule** cmdlet removes an Automation account from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationRunbook.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationRunbook.md
index a1f8fa67ff..82e027fe29 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationRunbook.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationRunbook.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationRunbook -Name <String> [-Force] -AutomationAccountName <St
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationRunbook** cmdlet removes a runbook from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationSchedule.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationSchedule.md
index 5dc76a1381..dd6a09af05 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationSchedule.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationSchedule.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationSchedule -Name <String> [-Force] -AutomationAccountName <S
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationSchedule** cmdlet deletes a schedule from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureAutomationVariable.md b/azuresmps-4.0.0/Azure/Remove-AzureAutomationVariable.md
index d766bb5287..b52dc0b40f 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureAutomationVariable.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureAutomationVariable.md
@@ -23,7 +23,7 @@ Remove-AzureAutomationVariable -Name <String> [-Force] -AutomationAccountName <S
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Remove-AzureAutomationVariable** cmdlet removes a variable from Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureSBAuthorizationRule.md b/azuresmps-4.0.0/Azure/Remove-AzureSBAuthorizationRule.md
index 11290cfc5d..bda3960377 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureSBAuthorizationRule.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureSBAuthorizationRule.md
@@ -30,7 +30,7 @@ Remove-AzureSBAuthorizationRule -Name <String> -Namespace <String> [-PassThru] [
 ## DESCRIPTION
 Removes existing Service Bus authorization rule.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/Remove-AzureSBNamespace.md b/azuresmps-4.0.0/Azure/Remove-AzureSBNamespace.md
index b0be02606d..5ff777a842 100644
--- a/azuresmps-4.0.0/Azure/Remove-AzureSBNamespace.md
+++ b/azuresmps-4.0.0/Azure/Remove-AzureSBNamespace.md
@@ -26,7 +26,7 @@ To get the version of the module you're using, in the Azure PowerShell console,
 
 The **Remove-AzureSBNamespace** cmdlet removes a service namespace for Service Bus.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/Resume-AzureAutomationJob.md b/azuresmps-4.0.0/Azure/Resume-AzureAutomationJob.md
index 86afeb6ccf..d8b5acb4ce 100644
--- a/azuresmps-4.0.0/Azure/Resume-AzureAutomationJob.md
+++ b/azuresmps-4.0.0/Azure/Resume-AzureAutomationJob.md
@@ -23,7 +23,7 @@ Resume-AzureAutomationJob -Id <Guid> -AutomationAccountName <String> [-Profile <
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Resume-AzureAutomationJob** cmdlet resumes a suspended Microsoft Azure Automation job.
 Use the *Id* parameter to specify the suspended job.
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationCertificate.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationCertificate.md
index 26496d6ea4..25e6de901d 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationCertificate.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationCertificate.md
@@ -24,7 +24,7 @@ Set-AzureAutomationCertificate -Name <String> [-Description <String>] [-Password
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationCertificate** cmdlet modifies the configuration of a certificate in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationConnectionFieldValue.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationConnectionFieldValue.md
index 89c0d95400..47920b3013 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationConnectionFieldValue.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationConnectionFieldValue.md
@@ -23,7 +23,7 @@ Set-AzureAutomationConnectionFieldValue -Name <String> -ConnectionFieldName <Str
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationConnectionFieldValue** cmdlet modifies the value for a field for a connection in Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationCredential.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationCredential.md
index 62a0a66055..fae03edf36 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationCredential.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationCredential.md
@@ -23,7 +23,7 @@ Set-AzureAutomationCredential -Name <String> [-Description <String>] [-Value <PS
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationCredential** cmdlet modifies a credential as a **PSCredential** object in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationModule.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationModule.md
index 5a4f23501b..d188be0000 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationModule.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationModule.md
@@ -24,7 +24,7 @@ Set-AzureAutomationModule -Name <String> [-Tags <IDictionary>] [-ContentLinkUri
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationModule** cmdlet imports a new version of a module or changes the configuration of the module in Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbook.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbook.md
index 7cd7655b73..de326081f7 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbook.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbook.md
@@ -23,7 +23,7 @@ Set-AzureAutomationRunbook -Name <String> [-Description <String>] [-Tags <String
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationRunbook** cmdlet modifies the configuration of a Microsoft Azure Automation runbook.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbookDefinition.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbookDefinition.md
index 9311025832..dbe62a42e8 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbookDefinition.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationRunbookDefinition.md
@@ -23,7 +23,7 @@ Set-AzureAutomationRunbookDefinition -Name <String> -Path <String> [-Overwrite]
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationRunbookDefinition** cmdlet updates the draft definition of a Microsoft Azure Automation runbook.
 Specify a Windows PowerShell script (.ps1) file that contains a runbook that becomes the draft runbook.
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationSchedule.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationSchedule.md
index b5447a04aa..a33fe7c482 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationSchedule.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationSchedule.md
@@ -23,7 +23,7 @@ Set-AzureAutomationSchedule -Name <String> [-IsEnabled <Boolean>] [-Description
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationSchedule** cmdlet modifies a schedule in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureAutomationVariable.md b/azuresmps-4.0.0/Azure/Set-AzureAutomationVariable.md
index 43ead1df36..31b9a97177 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureAutomationVariable.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureAutomationVariable.md
@@ -30,7 +30,7 @@ Set-AzureAutomationVariable -Name <String> -Description <String> -AutomationAcco
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Set-AzureAutomationVariable** cmdlet modifies the value or description of a variable in Microsoft Azure Automation.
 
diff --git a/azuresmps-4.0.0/Azure/Set-AzureSBAuthorizationRule.md b/azuresmps-4.0.0/Azure/Set-AzureSBAuthorizationRule.md
index ea6e7005fb..8fcbd0b681 100644
--- a/azuresmps-4.0.0/Azure/Set-AzureSBAuthorizationRule.md
+++ b/azuresmps-4.0.0/Azure/Set-AzureSBAuthorizationRule.md
@@ -31,7 +31,7 @@ Set-AzureSBAuthorizationRule -Name <String> [-Permission <AccessRights[]>] -Name
 ## DESCRIPTION
 Updates existing Service Bus authorization rule.
 
-[!INCLUDE [sb-deprecation.md](../include/sb-deprecation.md)]
+[!INCLUDE [sb-deprecation.md](../../includes/sb-deprecation.md)]
 
 ## EXAMPLES
 
diff --git a/azuresmps-4.0.0/Azure/Start-AzureAutomationRunbook.md b/azuresmps-4.0.0/Azure/Start-AzureAutomationRunbook.md
index eaaeebc8c2..37d7c172ab 100644
--- a/azuresmps-4.0.0/Azure/Start-AzureAutomationRunbook.md
+++ b/azuresmps-4.0.0/Azure/Start-AzureAutomationRunbook.md
@@ -23,7 +23,7 @@ Start-AzureAutomationRunbook -Name <String> [-Parameters <IDictionary>] [-RunOn
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Start-AzureAutomationRunbook** cmdlet starts a Microsoft Azure Automation runbook job.
 Specify the ID or name of a runbook.
diff --git a/azuresmps-4.0.0/Azure/Stop-AzureAutomationJob.md b/azuresmps-4.0.0/Azure/Stop-AzureAutomationJob.md
index 4f67dd7ef3..e798d289ca 100644
--- a/azuresmps-4.0.0/Azure/Stop-AzureAutomationJob.md
+++ b/azuresmps-4.0.0/Azure/Stop-AzureAutomationJob.md
@@ -23,7 +23,7 @@ Stop-AzureAutomationJob -Id <Guid> -AutomationAccountName <String> [-Profile <Az
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Stop-AzureAutomationJob** cmdlet stops a Microsoft Azure Automation job.
 Specify a running automation job.
diff --git a/azuresmps-4.0.0/Azure/Suspend-AzureAutomationJob.md b/azuresmps-4.0.0/Azure/Suspend-AzureAutomationJob.md
index 421ca83c35..a3cd0b2357 100644
--- a/azuresmps-4.0.0/Azure/Suspend-AzureAutomationJob.md
+++ b/azuresmps-4.0.0/Azure/Suspend-AzureAutomationJob.md
@@ -23,7 +23,7 @@ Suspend-AzureAutomationJob -Id <Guid> -AutomationAccountName <String> [-Profile
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Suspend-AzureAutomationJob** cmdlet suspends a Microsoft Azure Automation job.
 Specify a running Automation job.
diff --git a/azuresmps-4.0.0/Azure/Unregister-AzureAutomationScheduledRunbook.md b/azuresmps-4.0.0/Azure/Unregister-AzureAutomationScheduledRunbook.md
index 87c62b5e55..87fad84121 100644
--- a/azuresmps-4.0.0/Azure/Unregister-AzureAutomationScheduledRunbook.md
+++ b/azuresmps-4.0.0/Azure/Unregister-AzureAutomationScheduledRunbook.md
@@ -30,7 +30,7 @@ Unregister-AzureAutomationScheduledRunbook -RunbookName <String> -ScheduleName <
 
 ## DESCRIPTION
 
-[!INCLUDE [aa-deprecation](../include/aa-deprecation.md)]
+[!INCLUDE [aa-deprecation](../../includes/aa-deprecation.md)]
 
 The **Unregister-AzureAutomationScheduledRunbook** cmdlet removes the association between a Microsoft Azure Automation runbook and a schedule, which stops the runbook from starting when the schedule fires.
 
diff --git a/docs-conceptual/azps-14.2.0/azureps-in-docker.md b/docs-conceptual/azps-14.2.0/azureps-in-docker.md
index a3c5e566a3..562c6a0e9f 100644
--- a/docs-conceptual/azps-14.2.0/azureps-in-docker.md
+++ b/docs-conceptual/azps-14.2.0/azureps-in-docker.md
@@ -35,13 +35,13 @@ PowerShell session.
 1. Download the latest azure-powershell image.
 
    ```console
-   docker pull mcr.microsoft.com/azure-powershell:mariner-2
+   docker pull mcr.microsoft.com/azure-powershell:azurelinux-3.0
    ```
 
 1. Run the azure-powershell container in interactive mode:
 
    ```console
-   docker run -it mcr.microsoft.com/azure-powershell:mariner-2 pwsh
+   docker run -it mcr.microsoft.com/azure-powershell:azurelinux-3.0 pwsh
    ```
 
 # [arm64](#tab/arm64)
@@ -49,13 +49,13 @@ PowerShell session.
 1. Download the latest azure-powershell image.
 
    ```console
-   docker pull mcr.microsoft.com/azure-powershell:mariner-2-arm64
+   docker pull mcr.microsoft.com/azure-powershell:azurelinux-3.0-arm64
    ```
 
 1. Run the azure-powershell container in interactive mode:
 
    ```console
-   docker run -it mcr.microsoft.com/azure-powershell:mariner-2-arm64 pwsh
+   docker run -it mcr.microsoft.com/azure-powershell:azurelinux-3.0-arm64 pwsh
    ```
 
 ---
@@ -71,13 +71,13 @@ The following command deletes the Docker container when you no longer need it.
 # [amd64](#tab/amd64)
 
 ```console
-docker rmi mcr.microsoft.com/azure-powershell:mariner-2
+docker rmi mcr.microsoft.com/azure-powershell:azurelinux-3.0
 ```
 
 # [arm64](#tab/arm64)
 
 ```console
-docker rmi mcr.microsoft.com/azure-powershell:mariner-2-arm64
+docker rmi mcr.microsoft.com/azure-powershell:azurelinux-3.0-arm64
 ```
 
 ---
diff --git a/azuresmps-4.0.0/include/aa-deprecation.md b/includes/aa-deprecation.md
similarity index 89%
rename from azuresmps-4.0.0/include/aa-deprecation.md
rename to includes/aa-deprecation.md
index 97e88f5e4b..2a395712d8 100644
--- a/azuresmps-4.0.0/include/aa-deprecation.md
+++ b/includes/aa-deprecation.md
@@ -1,8 +1,7 @@
 ---
-author: georgewallace
-ms.author: gwallace
 ms.topic: include
 ---
+
 > [!IMPORTANT]
 > This PowerShell command for Azure Automation is longer supported as of **01/23/2020**. The
 > Azure Service Management model is deprecated for Azure Automation and was disabled on that
diff --git a/azuresmps-4.0.0/include/sb-deprecation.md b/includes/sb-deprecation.md
similarity index 100%
rename from azuresmps-4.0.0/include/sb-deprecation.md
rename to includes/sb-deprecation.md
index c5241024f6..79c1cb629a 100644
--- a/azuresmps-4.0.0/include/sb-deprecation.md
+++ b/includes/sb-deprecation.md
@@ -2,7 +2,7 @@
 title: Service Bus deprecation notice
 ms.topic: include
 ---
+
 > [!IMPORTANT]
 > The Service Management REST API for Service Bus will be retired by **November 1, 2021**. Go to the [deprecation of Azure Service Manager](https://docs.microsoft.com/azure/service-bus-messaging/deprecate-service-bus-management) for more information about the retirement of the API.
 > This Azure Service Management PowerShell cmdlet for Service Bus will no longer be supported as of November 1, 2021. Please migrate to the new [Azure PowerShell cmdlets](https://docs.microsoft.com/powershell/module/az.servicebus/)
-