Merge branch 'master' into ATPDocs

Author: chrisda

.gitattributes

@@ -0,0 +1,14 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

.openpublishing.publish.config.json

@@ -174,6 +174,35 @@
         "mapping/monikerMapping.json"
       ]
     },
+    {
+      "docset_name": "spmt-ps",
+      "build_source_folder": "spmt",
+      "build_output_subfolder": "spmt-ps",
+      "locale": "en-us",
+      "monikers": [],
+      "moniker_ranges": [],
+      "open_to_public_contributors": true,
+      "type_mapping": {
+        "Conceptual": "Content",
+        "ManagedReference": "Content",
+        "RestApi": "Content",
+        "AzurePsModulePage": "Content"
+      },
+      "build_entry_point": "docs",
+      "template_folder": "_themes",
+      "version": 0,
+      "customized_template_paths": [
+        "_dependentPackages/azurecli.plugins/azurecli"
+      ],
+      "customized_tasks": {
+        "docset_prebuild": [
+          "_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
+        ]
+      },
+      "monikerPath": [
+        "mapping/monikerMapping.json"
+      ]
+    },
     {
       "docset_name": "whiteboard-ps",
       "build_source_folder": "whiteboard",

README.md

@@ -5,7 +5,7 @@ A repository to hold the help reference content for Office PowerShell cmdlets. T
 ![Contribution and Consumption model for Office PowerShell reference content](images/contrib-consumption-model.png)
 
 # Learn How To Contribute
-Anyone who is interested can contribute to the Microsoft Office PowerShell reference topics. 
+Anyone who is interested can contribute to the Microsoft Office PowerShell reference topics.
 When you contribute your work will go directly into the Microsoft Office products and show up in Get-Help for the given Office cmdlet.
 
 > Notice that if you are looking into contributing for the **PnP PowerShell cmdlets**, their documentation is automatically generated from the code and you should be submitting your change towards the original code at https://github.com/SharePoint/PnP-powershell. See for example how the attributes are used in the code for the [Get-PnPList](https://github.com/SharePoint/PnP-PowerShell/blob/master/Commands/Lists/GetList.cs) cmdlet.
@@ -73,4 +73,4 @@ Microsoft's general trademark guidelines can be found at http://go.microsoft.com
 Privacy information can be found at https://privacy.microsoft.com/en-us/
 
 Microsoft and any contributors reserve all others rights, whether under their respective copyrights, patents,
-or trademarks, whether by implication, estoppel or otherwise.
+or trademarks, whether by implication, estoppel or otherwise.

exchange/docs-conceptual/exchange-eop/connect-to-exchange-online-protection-powershell.md

@@ -15,66 +15,66 @@ description: "Use remote PowerShell to connect to an Exchange Online Protection
 # Connect to Exchange Online Protection PowerShell
 
 Exchange Online Protection PowerShell allows you to manage your Exchange Online Protection settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online Protection. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online Protection cmdlets into your local Windows PowerShell session so that you can use them.
-  
+
 ## What do you need to know before you begin?
 
 - Estimated time to complete: 5 minutes
-    
+
 - You can use the following versions of Windows:
-    
+
   - Windows 10
-    
+
   - Windows 8.1
-    
+
   - Windows Server 2016
-    
+
   - Windows Server 2012 or Windows Server 2012 R2
-    
-  - Windows 7 Service Pack 1 (SP1)\*
-    
-  - Windows Server 2008 R2 SP1\*
-    
-  \* You need to install the Microsoft.NET Framework 4.5 or later and then either the Windows Management Framework 3.0 or the Windows Management Framework 4.0. For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868) and [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757) or [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344).
-    
-- Windows PowerShell needs to be configured to run scripts, and by default, it isn't. You get the following error when you try to connect:
-    
-     `Files cannot be loaded because running scripts is disabled on this system. Provide a valid certificate with which to sign the files.`
-    
+
+  - Windows 7 Service Pack 1 (SP1)<sup>*</sup>
+
+  - Windows Server 2008 R2 SP1<sup>*</sup>
+
+    <sup>*</sup> For older versions of Windows, you need to install the Microsoft.NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
+
+ - Windows PowerShell needs to be configured to run scripts, and by default, it isn't. You'll get the following error when you try to connect:
+
+    `Files cannot be loaded because running scripts is disabled on this system. Provide a valid certificate with which to sign the files.`
+
     To enable Windows PowerShell to run signed scripts, run the following command in an elevated Windows PowerShell window (a Windows PowerShell window you open by selecting **Run as administrator**):
-    
-  ```
-  Set-ExecutionPolicy RemoteSigned
-  ```
+
+    ```
+    Set-ExecutionPolicy RemoteSigned
+    ```
 
     You need to configure this setting only once on your computer, not every time you connect.
-    
+
 > [!TIP]
-> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Server](https://go.microsoft.com/fwlink/p/?linkId=60612), [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351). 
-  
+> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Server](https://go.microsoft.com/fwlink/p/?linkId=60612), [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351).
+
 ## Connect to Exchange Online Protection
 
 1. On your local computer, open Windows PowerShell and run the following command:
-    
-   ```
-   $UserCredential = Get-Credential
-   ```
+
+    ```
+    $UserCredential = Get-Credential
+    ```
 
     In the **Windows PowerShell Credential Request** dialog box, type your work or school account and password, and then click **OK**.
-    
+
 2. Run the following command:
-    
+
     ```
     $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
     ```
 
-     **Notes**:
-    
-   - For Office 365 Germany, use the  _ConnectionUri_ value: `https://ps.protection.outlook.de/powershell-liveid/`
-    
-   - For Exchange Online Protection subscriptions that are Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), use the  _ConnectionUri_ value: `https://outlook.office365.com/powershell-liveid/`
-    
+    **Notes**:
+
+   - For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.protection.outlook.de/powershell-liveid/`
+
+   - For Exchange Online Protection subscriptions that are Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), use the _ConnectionUri_ value: `https://outlook.office365.com/powershell-liveid/`
+
 3. Run the following command:
-    
+
    ```
    Import-PSSession $Session
    ```
@@ -93,27 +93,27 @@ After Step 3, the Exchange Online Protection cmdlets are imported into your loca
 If you receive errors, check the following requirements:
   
 - A common problem is an incorrect password. Run the three steps again and pay close attention to the user name and password you enter in Step 1.
-    
+
 - To help prevent denial-of-service (DoS) attacks, you're limited to three open remote PowerShell connections to your Exchange Online Protection organization.
-    
+
 - TCP port 80 traffic needs to be open between your local computer and Office 365. It's probably open, but it's something to consider if your organization has a restrictive Internet access policy.
 
 - The **New-PSSession** command (Step 2) might fail to connect if your client IP address changes during the connection request. This can happen if your organization uses a source network address translation (SNAT) pool that contains multiple IP addresses. The connection error looks like this:
 
-   `The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
+    `The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
 
-   To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Exchange Online Protection PowerShell endpoint.
+    To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Exchange Online Protection PowerShell endpoint.
 
 ## See also
 
 The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more information about these cmdlets, see the following topics.
   
 - [Get-Credential](https://go.microsoft.com/fwlink/p/?LinkId=389618)
-    
+
 - [New-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389621)
-    
+
 - [Import-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389619)
-    
+
 - [Remove-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389620)
-    
+
 - [Set-ExecutionPolicy](https://go.microsoft.com/fwlink/p/?LinkId=389623)

exchange/docs-conceptual/exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md

@@ -16,106 +16,105 @@ description: "Learn how to use remote PowerShell to connect to Exchange Online."
 
 # Connect to Exchange Online PowerShell
 Exchange Online PowerShell allows you to manage your Exchange Online settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online cmdlets into your local Windows PowerShell session so that you can use them.
-  
+
 > [!IMPORTANT]
 > If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). If you're an Exchange Online Protection (EOP) standalone customer, and you're using the service to protect on-premises mailboxes, use the connection instructions in the topic [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you. 
-  
+
 ## What do you need to know before you begin?
 
 - Estimated time to complete: 5 minutes
-    
+
 - You can use the following versions of Windows:
-    
+
   - Windows 10
-    
+
   - Windows 8.1
-    
+
   - Windows Server 2016
-    
+
   - Windows Server 2012 or Windows Server 2012 R2
-    
-  - Windows 7 Service Pack 1 (SP1)\*
-    
-  - Windows Server 2008 R2 SP1\*
-    
-    \* You need to install the Microsoft.NET Framework 4.5 or later and then either the Windows Management Framework 3.0 or the Windows Management Framework 4.0. For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868) and[Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757) or[Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344).
-    
-- Windows PowerShell needs to be configured to run scripts, and by default, it isn't. You get the following error when you try to connect:
-    
-     `Files cannot be loaded because running scripts is disabled on this system. Provide a valid certificate with which to sign the files.`
-    
-    To enable Windows PowerShell to run signed scripts, run the following command in an elevated Windows PowerShell window (a Windows PowerShell window you open by selecting **Run as administrator**):
-    
+
+  - Windows 7 Service Pack 1 (SP1)<sup>*</sup>
+
+  - Windows Server 2008 R2 SP1<sup>*</sup>
+
+    <sup>*</sup> For older versions of Windows, you need to install the Microsoft.NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
+
+- Windows PowerShell needs to be configured to run scripts, and by default, it isn't. You'll get the following error when you try to connect:
+
+  `Files cannot be loaded because running scripts is disabled on this system. Provide a valid certificate with which to sign the files.`
+
+  To enable Windows PowerShell to run signed scripts, run the following command in an elevated Windows PowerShell window (a Windows PowerShell window you open by selecting **Run as administrator**):
+
   ```
   Set-ExecutionPolicy RemoteSigned
   ```
 
-    You need to configure this setting only once on your computer, not every time you connect.
-    
-    
+  You need to configure this setting only once on your computer, not every time you connect.
+
 > [!TIP]
 > Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351). 
-  
+
 ## Connect to Exchange Online PowerShell
 
 1. On your local computer, open Windows PowerShell and run the following command.
-    
+
     ```
     $UserCredential = Get-Credential
     ```
    In the **Windows PowerShell Credential Request** dialog box, type your work or school account and password, and then click **OK**.
-    
+
 2. Run the following command.
-    
+
    ```
-   $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://outlook.office365.com/powershell-liveid/ -Credential $UserCredential -Authentication  Basic -AllowRedirection
+   $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://outlook.office365.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
    ```
 
     **Notes**:
-    
-    - For Office 365 operated by 21Vianet, use the  _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
-    
-    - For Office 365 Germany, use the  _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
-    
+
+    - For Office 365 operated by 21Vianet, use the _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
+
+    - For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
+
 3. Run the following command.
-    
+
     ```
     Import-PSSession $Session
     ```
 
 > [!NOTE]
 > Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command. 
-  
-  ```
-  Remove-PSSession $Session
-  ```
+
+```
+Remove-PSSession $Session
+```
 
 ## How do you know this worked?
 
 After Step 3, the Exchange Online cmdlets are imported into your local Windows PowerShell session and tracked by a progress bar. If you don't receive any errors, you connected successfully. A quick test is to run an Exchange Online cmdlet, for example, **Get-Mailbox**, and see the results.
-  
+
 If you receive errors, check the following requirements:
-  
+
 - A common problem is an incorrect password. Run the three steps again and pay close attention to the user name and password you enter in Step 1.
-    
+
 - To help prevent denial-of-service (DoS) attacks, you're limited to three open remote PowerShell connections to your Exchange Online organization.
-    
+
 - The account you use to connect to Exchange Online must be enabled for remote PowerShell. For more information, see [Enable or disable access to Exchange Online PowerShell](../disable-access-to-exchange-online-powershell.md).
-    
+
 - TCP port 80 traffic needs to be open between your local computer and Office 365. It's probably open, but it's something to consider if your organization has a restrictive Internet access policy.
-    
+
 ## See also
 
 The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more information about these cmdlets, see the following topics.
-  
+
 - [Get-Credential](https://go.microsoft.com/fwlink/p/?LinkId=389618)
-    
+
 - [New-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389621)
-    
+
 - [Import-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389619)
-    
+
 - [Remove-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389620)
-    
+
 - [Set-ExecutionPolicy](https://go.microsoft.com/fwlink/p/?LinkId=389623)
-    
+