Merge branch 'master' into Ex2016CU12

Author: chrisda

.openpublishing.publish.config.json

@@ -265,8 +265,8 @@
       "template_folder": "_themes.pdf"
     }
   },
-  "need_generate_pdf": false,
   "need_generate_intellisense": false,
+  "enable_incremental_build": false,
   "dependent_packages": [
     {
       "path_to_root": "_dependentPackages/azurecli.plugins",

.openpublishing.redirection.json

@@ -0,0 +1,9 @@
+  { 
+  "redirections": [ 
+    {
+       "source_path": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/new-dlpedmsschema.md",
+       "redirect_url": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/new-dlpedmschema.md",
+       "redirect_document_id": true
+    }
+  ] 
+  }

README.md

@@ -1,35 +1,36 @@
-# Short URL: aka.ms/office-powershell
+**Short URL: aka.ms/office-powershell**
 
 # Overview
-This repository holds reference content of Office PowerShell cmdlets for help purpose. The expert knowledge around Office PowerShell is distributed among customers, MVPs, partners, product teams, support, and other community members. Consumers also have various preferences when consuming knowledge such as a website, PowerShell Get-Help, Windows app, iOS app, Android app, and others. The following diagram illustrates the point.
+This repository holds reference content of Office PowerShell cmdlets for help purpose. The expert knowledge around Office PowerShell is distributed among customers, MVPs, partners, product teams, support, and other community members. Consumers have various preferences when consuming knowledge such as a website, PowerShell Get-Help, Windows app, iOS app, Android app, and others. The following diagram illustrates the point.
+
 ![Contribution and Consumption model for Office PowerShell reference content](images/contrib-consumption-model.png)
 
-# Learn How To Contribute
+## Learn How To Contribute
 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.
+Your contributions 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.
 
-# Quick Start
+## Quick Start
 
-## Contribute using the GitHub website
+### Contribute using the GitHub website
 
 [![Image of Quick Start video](images/edit_video_capture.jpg)](https://support.office.com/en-us/article/edit-powershell-cmdlet-in-github-dcd20227-3764-48ce-ad6e-763af8b48daf?ui=en-US&rs=en-US&ad=US)
 
-1. Open your browser, log in to GitHub, and then navigate to https://github.com/microsoftdocs/office-docs-powershell
+1. Open your browser, log in to GitHub, and navigate to https://github.com/microsoftdocs/office-docs-powershell
 2. Browse to the file you want to edit. In this example, we will edit https://github.com/MicrosoftDocs/office-docs-powershell/blob/master/teams/teams-ps/teams/New-Team.md and add a link in the Related Links section.
 3. Click the Edit icon which looks like a pencil in the upper right corner. 
 ![Image of Edit button on Github](images/edit_icon.png)
 
-4. Your browser will then open the file in an edit window. We want to add a link. So we scroll down to the Related Links section and add the link in the correct format.
+4. Your browser will open the file in an edit window. To add a link, we scroll down to the Related Links section and add the link in the correct format.
 ![Image of Edit button on Github](images/add_related_link.png)
 
-**Note** Since you are likely not a maintainer of the Git repository, GitHub will automatically 'Fork' the project into your personal GitHub account. A fork is just an exact copy of the repository in your own account so that you have total access to make edits. You are now 'editing' a copy of the project in your own GitHub account. You can always find it again by looking at your GitHub Repositories in your GitHub Profile (drop-down from your name in the top right).
+**Note** Since you are likely not a maintainer of the Git repository, GitHub will automatically 'Fork' the project into your personal GitHub account. A fork is a copy of the repository in your git account. By forking, you can freely make edits without affecting the original repository. You can always find it again by looking at your GitHub Repositories in your GitHub Profile (drop-down from your name in the top right).
 ![Image of Automatic Fork message on Github](images/auto_fork.png)
 
 5. You can click the Preview changes link to see what the changes will look like.
 
-   **IMPORTANT** The layout of headings and subheadings must follow a very specific schema that is required for PowerShell Get-Help.
+   **IMPORTANT** The layout of headings and subheadings must follow a schema required for PowerShell Get-Help.
    Any deviation will throw errors in the Pull Request. The schema can be found here: https://github.com/PowerShell/platyPS/blob/master/platyPS.schema.md 
 
 6. Once you are satisfied with your work, go to the **Propose file change** area at the bottom of the topic. Enter a title and other description information, and then click **Propose file change**.
@@ -42,9 +43,9 @@ Looking for more in-depth content? Check out the following:
 * [Using more advanced tools with the PowerShell GitHub repo](repo_docs/ADVANCED.md)
 * [Creating content for brand new cmdlets](repo_docs/NEW_CMDLETS.md)
 
-# Microsoft Open Source Code of Conduct
+## Microsoft Open Source Code of Conduct
 
-## Contributing
+### Contributing
 
 This project welcomes contributions and suggestions. Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
@@ -68,7 +69,7 @@ see the [LICENSE](LICENSE) file, and grant you a license to any code in the repo
 Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation
 may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
 The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+Microsoft's general trademark guidelines can be found at https://go.microsoft.com/fwlink/?LinkID=254653.
 
 Privacy information can be found at https://privacy.microsoft.com/en-us/
 

exchange/docfx.json

@@ -67,7 +67,7 @@
     },
     "fileMetadata": {
       "apiPlatform":{
-        "exchange-ps/exchange" : [ "PowerShell" ]
+        "exchange-ps/exchange/**/*.md" : [ "powershell" ]
       }
     },
     "template": [],

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

@@ -116,4 +116,4 @@ The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more
 
 - [Remove-PSSession](https://go.microsoft.com/fwlink/p/?LinkId=389620)
 
-- [Set-ExecutionPolicy](https://go.microsoft.com/fwlink/p/?LinkId=389623)
+- [Set-ExecutionPolicy](https://go.microsoft.com/fwlink/p/?LinkId=389623)

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

@@ -18,7 +18,7 @@ Exchange Online Protection PowerShell is the administrative interface that enabl
 
 - To create a remote PowerShell session to your Exchange Online Protection organization, see [Connect to Exchange Online Protection PowerShell](connect-to-exchange-online-protection-powershell.md).
 
-- For a sample script that lets admins who manage multiple tenants (companies) apply configuration settings to their tenants, see [Sample script for applying EOP settings to multiple tenants](http://technet.microsoft.com/library/e87e84e1-7be0-44bf-a414-d91d60ed8817.aspx).
+- For a sample script that lets admins who manage multiple tenants (companies) apply configuration settings to their tenants, see [Sample script for applying EOP settings to multiple tenants](https://technet.microsoft.com/library/e87e84e1-7be0-44bf-a414-d91d60ed8817.aspx).
 
 - The following introductory video shows you how to connect to and use Exchange Online Protection PowerShell.
 

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

@@ -19,7 +19,7 @@ description: "Learn how to use remote PowerShell to connect to Exchange Online."
 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. 
+> 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). <br/><br/> 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?
 
@@ -47,22 +47,23 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
 
   To require all PowerShell scripts that you download from the internet are signed by a trusted publisher, 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 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 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
-    ```
+   ```
+   $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.
@@ -71,23 +72,25 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
    $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://outlook.office365.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
    ```
 
-    **Notes**:
+   **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 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://outlook.office365.us/powershell-liveid/`
 
-    - For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
-    
-    - If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where the _ProxyAccessType_ value is `IEConfig`, `WinHttpConfig`, or `AutoDetect`.
-      
-      Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
-      
-      For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
+   - If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where the _ProxyAccessType_ value is `IEConfig`, `WinHttpConfig`, or `AutoDetect`.
+
+     Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
+
+     For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
 
 3. Run the following command.
 
-    ```
-    Import-PSSession $Session -DisableNameChecking
-    ```
+   ```
+   Import-PSSession $Session -DisableNameChecking
+   ```
 
 > [!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. 
@@ -108,7 +111,7 @@ If you receive errors, check the following requirements:
 
 - 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.
+- 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
 
@@ -124,5 +127,4 @@ The cmdlets that you use in this topic are Windows PowerShell cmdlets. For more
 
 - [Set-ExecutionPolicy](https://go.microsoft.com/fwlink/p/?LinkId=389623)
 
-For more information about managing Office 365, see [Manage Office 365](https://docs.microsoft.com/en-us/Office365/).
-
+For more information about managing Office 365, see [Manage Office 365](https://docs.microsoft.com/Office365/).