Merge branch 'master' into patch-37

Author: Techwriter40

.openpublishing.publish.config.json

@@ -88,9 +88,9 @@
       ]
     },
     {
-      "docset_name": "teams-ps",
-      "build_source_folder": "teams",
-      "build_output_subfolder": "teams-ps",
+      "docset_name": "staffhub-ps",
+      "build_source_folder": "staffhub",
+      "build_output_subfolder": "staffhub-ps",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
@@ -117,9 +117,38 @@
       ]
     },
     {
-      "docset_name": "staffhub-ps",
-      "build_source_folder": "staffhub",
-      "build_output_subfolder": "staffhub-ps",
+      "docset_name": "exchange-ps",
+      "build_source_folder": "exchange",
+      "build_output_subfolder": "exchange-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": "teams-ps",
+      "build_source_folder": "teams",
+      "build_output_subfolder": "teams-ps",
       "locale": "en-us",
       "monikers": [],
       "moniker_ranges": [],
@@ -173,11 +202,11 @@
     ]
   },
   "need_generate_pdf_url_template": true,
-  "Targets": {  
-    "Pdf": {  
-    "template_folder": "_themes.pdf"  
-    }  
-   },
+  "targets": {
+    "Pdf": {
+      "template_folder": "_themes.pdf"
+    }
+  },
   "need_generate_pdf": false,
   "need_generate_intellisense": false,
   "dependent_packages": [

README.md

@@ -8,6 +8,8 @@ A repository to hold the help reference content for Office PowerShell cmdlets. T
 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.
+
 # Quick Start
 
 ## Contribute using the GitHub website
@@ -22,15 +24,18 @@ When you contribute your work will go directly into the Microsoft Office product
 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.
 ![Image of Edit button on Github](images/add_related_link.png)
 
-**Note** that 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 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 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 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. 
+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.
    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 satisified with your work you submit a Pull Request which asks the maintainer of the main repository (known as Upstream) to pull your edits up. To submit a Pull Request you navigate back to the main repository, https://github.com/microsoftdocs/office-docs-powershell, and click the '''New pull request''' button. You will then request your edits to be pulled up into the main repo. Make sure to click the **compare across forks** link since you are request a pull from the edits you made that reside in your own personal repsitory. To learn more about pull requests and forking, see https://help.github.com/articles/creating-a-pull-request-from-a-fork/.
 
+6. Once you are satisified with your work, go to the **Propose file change** area at the bottom of the topic. Enter a title title and other description informaton and then click **Propose file change**.
+![Image of Propose file change on Github](images/propose_file_change.png)
+
+7. On the next screen, click **Create pull request**.
 
 Looking for more in-depth content? Check out the following:
 * [Frequently Asked Questions (FAQ)](repo_docs/FAQ.md)

exchange/docfx.json

@@ -39,6 +39,7 @@
           "**/*.png",
           "**/*.jpg"
         ],
+        "version": "exchange-ps",
         "exclude": [
           "**/obj/**",
           "**/includes/**"
@@ -59,10 +60,13 @@
       "ms.date" : "09/25/2017",
       "ms.topic" : "reference",
       "ms.service" : "exchange-powershell",
-      "ms.devlang" : "powershell"
+      "ms.devlang" : "powershell",
+      "feedback_system": "GitHub",
+      "feedback_github_repo": "MicrosoftDocs/office-docs-powershell",
+      "feedback_product_url": "https://github.com/MicrosoftDocs/office-docs-powershell/issues"
     },
     "fileMetadata": {},
     "template": [],
     "dest": "exchange-ps"
   }
-}
+}

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

@@ -0,0 +1,113 @@
+---
+title: "Connect to Exchange Online Protection PowerShell"
+ms.author: chrisda
+author: chrisda
+manager: serdars
+ms.date: 7/10/2017
+ms.audience: Admin
+ms.topic: article
+ms.service: eop
+localization_priority: Normal
+ms.assetid: 054e0fd7-d465-4572-93f8-a00a9136e4d1
+description: "Use remote PowerShell to connect to an Exchange Online Protection organization"
+---
+
+# 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.`
+    
+    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.
+    
+> [!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). 
+  
+## Connect to Exchange Online Protection
+
+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://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/`
+    
+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
+   ```
+
+## How do you know this worked?
+
+After Step 3, the Exchange Online Protection 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 Protection cmdlet, for example, **Get-TransportRule**, 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 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.
+    
+## 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-eop/exchange-online-protection-powershell.md

@@ -0,0 +1,29 @@
+---
+title: "Exchange Online Protection PowerShell"
+ms.author: chrisda
+author: chrisda
+manager: serdars
+ms.date: 2/20/2018
+ms.audience: Admin
+ms.topic: article
+ms.service: eop
+localization_priority: Normal
+ms.assetid: f7918a88-774a-405e-945b-bc2f5ee9f748
+description: "Learn about using PowerShell in Exchange Online Protection"
+---
+
+# Exchange Online Protection PowerShell
+
+Exchange Online Protection PowerShell is the administrative interface that enables you to manage your Exchange Online Protection (EOP) organization from the command line. For example, you can use Exchange Online Protection PowerShell to configure mail flow rules (also known as transport rules) and connectors. The following topics provide information about using Exchange Online Protection PowerShell:
+  
+- 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).
+  
+- The following introductory video shows you how to connect to and use Exchange Online Protection PowerShell.
+  
+  **Note:** This video applies to Exchange Online and EOP organizations. When you connect to your organization, be careful to specify the correct URL (_ConnectionUri_ value). The required URL is different for Exchange Online and EOP organizations.
+  
+  [Use Remote PowerShell in EOP](https://videoplayercdn.osi.office.net/hub/?csid=ux-cms-en-us-msoffice&uuid=9cb28006-c2cb-45b6-b72e-eeed8767dee7&AutoPlayVideo=false)
+  
+