Merge branch 'master' into master

tiburd · web-flow · commit 740a195bf94f · 2021-08-19T08:41:51.000-07:00
diff --git a/exchange/exchange-ps/exchange/New-DlpComplianceRule.md b/exchange/exchange-ps/exchange/New-DlpComplianceRule.md
@@ -421,9 +421,9 @@ Accept wildcard characters: False
 ```
 
 ### -ContentContainsSensitiveInformation
-The ContentContainsSensitiveInformation parameter specifies a condition for the rule that's based on a sensitive information type match in content. The rule is applied to content that contains the specified sensitive information type.
+The ContentContainsSensitiveInformation parameter specifies a condition for the rule that's based on a sensitive information type match in content. The rule is applied to content that contains the specified sensitive information type. In addition to sensitive information type, the parameter can also be applied to files that contain sensitivity labels.
 
-This parameter uses the basic syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`.
+This parameter uses the basic syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`. Example for sensitivity label: `labels = @(@{name ="Confidential"; type ="Sensitivity";})`
 
 Use the Get-DLPSensitiveInformationType cmdlet to list the sensitive information types for your organization. For more information on sensitive information types, see [What the sensitive information types in Exchange look for](https://docs.microsoft.com/exchange/what-the-sensitive-information-types-in-exchange-look-for-exchange-online-help).
 
@@ -776,9 +776,9 @@ Accept wildcard characters: False
 ```
 
 ### -ExceptIfContentContainsSensitiveInformation
-The ExceptIfContentContainsSensitiveInformation parameter specifies an exception for the rule that's based on a sensitive information type match in content. The rule isn't applied to content that contains the specified sensitive information type.
+The ExceptIfContentContainsSensitiveInformation parameter specifies an exception for the rule that's based on a sensitive information type match in content. The rule isn't applied to content that contains the specified sensitive information type. In addition to sensitive information type, the parameter can also be applied to files that contain sensitivity labels.
 
-This parameter uses the following syntax: `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`.
+This parameter uses the basic syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`. Example for sensitivity label: `labels = @(@{name ="Confidential"; type ="Sensitivity";})`
 
 Use the Get-DLPSensitiveInformationType cmdlet to list the sensitive information types for your organization. For more information on sensitive information types, see [What the sensitive information types in Exchange look for](https://docs.microsoft.com/exchange/what-the-sensitive-information-types-in-exchange-look-for-exchange-online-help).
 
diff --git a/exchange/exchange-ps/exchange/New-MigrationBatch.md b/exchange/exchange-ps/exchange/New-MigrationBatch.md
@@ -1375,9 +1375,15 @@ Accept wildcard characters: False
 ```
 
 ### -TargetArchiveDatabases
-The TargetArchiveDatabases parameter specifies the database where the archive mailboxes specified in the migration batch will be migrated to.
+The TargetArchiveDatabases parameter specifies the database where the archive mailboxes specified in the migration batch will be migrated to. You can use any value that uniquely identifies the database. For example:
 
-You can also specify multiple databases for the value of this parameter. The migration service selects one database as the target database to move the archive mailbox to. For example: -TargetArchiveDatabases @(MBXDB01,MBXDB02,MBXDB03)
+- Name
+- Distinguished name (DN)
+- GUID
+
+You can enter multiple values separated by commas. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
+
+When you enter multiple values, the migration service selects one database as the target database to move the archive mailbox to.
 
 You can only use this parameter for local moves and remote move migrations.
 
@@ -1395,17 +1401,20 @@ Accept wildcard characters: False
 ```
 
 ### -TargetDatabases
-The TargetDatabases parameter specifies the identity of the database that you're moving mailboxes to. You can use the following values:
+The TargetDatabases parameter specifies the identity of the database that you're moving mailboxes to. You can use any value that uniquely identifies the database. For example:
 
-- Database GUID
-- Database name
+- Name
+- Distinguished name (DN)
+- GUID
 
-If you don't specify the TargetDatabases parameter for a local move, the cmdlet uses the automatic mailbox distribution logic to select the database.
+You can enter multiple values separated by commas. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
 
-You can also specify multiple databases for the value of this parameter. The migration service will select one as the target database to move the mailbox to. For example: -TargetDatabases @(MBXDB01,MBXDB02,MBXDB03)
+When you enter multiple values, the migration service selects one database as the target database to move the mailbox to.
 
 You can only use this parameter for local moves and remote move migrations.
 
+If you don't use this parameter for a local move, the cmdlet uses the automatic mailbox distribution logic to select the database.
+
 ```yaml
 Type: MultiValuedProperty
 Parameter Sets: Local, Onboarding, Offboarding
diff --git a/exchange/exchange-ps/exchange/Set-DlpComplianceRule.md b/exchange/exchange-ps/exchange/Set-DlpComplianceRule.md
@@ -394,9 +394,9 @@ Accept wildcard characters: False
 ```
 
 ### -ContentContainsSensitiveInformation
-The ContentContainsSensitiveInformation parameter specifies a condition for the rule that's based on a sensitive information type match in content. The rule is applied to content that contains the specified sensitive information type.
+The ContentContainsSensitiveInformation parameter specifies a condition for the rule that's based on a sensitive information type match in content. The rule is applied to content that contains the specified sensitive information type. In addition to sensitive information type, the parameter can also be applied to files that contain sensitivity labels.
 
-This parameter uses the basic syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`.
+This parameter uses the basic syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`. Example for sensitivity label: `labels = @(@{name ="Confidential"; type ="Sensitivity";})`
 
 Use the Get-DLPSensitiveInformationType cmdlet to list the sensitive information types for your organization. For more information on sensitive information types, see [What the sensitive information types in Exchange look for](https://docs.microsoft.com/exchange/what-the-sensitive-information-types-in-exchange-look-for-exchange-online-help).
 
@@ -709,9 +709,9 @@ Accept wildcard characters: False
 ```
 
 ### -ExceptIfContentContainsSensitiveInformation
-The ExceptIfContentContainsSensitiveInformation parameter specifies an exception for the rule that's based on a sensitive information type match in content. The rule isn't applied to content that contains the specified sensitive information type.
+The ExceptIfContentContainsSensitiveInformation parameter specifies an exception for the rule that's based on a sensitive information type match in content. The rule isn't applied to content that contains the specified sensitive information type. In addition to sensitive information type, the parameter can also be applied to files that contain sensitivity labels.
 
-This parameter uses the following syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`.
+This parameter uses the basic syntax `@(@{Name="SensitiveInformationType1";[minCount="Value"],@{Name="SensitiveInformationType2";[minCount="Value"],...)`. For example, `@(@{Name="U.S. Social Security Number (SSN)"; minCount="2"},@{Name="Credit Card Number"})`. Example for sensitivity label: `labels = @(@{name ="Confidential"; type ="Sensitivity";})`
 
 Use the Get-DLPSensitiveInformationType cmdlet to list the sensitive information types for your organization. For more information on sensitive information types, see [What the sensitive information types in Exchange look for](https://docs.microsoft.com/exchange/what-the-sensitive-information-types-in-exchange-look-for-exchange-online-help).
 
diff --git a/exchange/exchange-ps/exchange/Set-ExternalInOutlook.md b/exchange/exchange-ps/exchange/Set-ExternalInOutlook.md
@@ -76,7 +76,9 @@ Accept wildcard characters: False
 ```
 
 ### -AllowList
-The AllowList parameter specifies exceptions to external sender identification in supported versions of Outlook. Messages received from the specified senders or senders in the specified domains don't receive native External sender identification. Valid values are domains (contoso.com) or email addresses (admin@contoso.com).
+The AllowList parameter specifies exceptions to external sender identification in supported versions of Outlook. Messages received from the specified senders or senders in the specified domains don't receive native External sender identification. The allow list uses the `5322.From` address (also known as the **From** address or P2 sender).
+
+Valid values are an individual domain (contoso.com), a domain and all subdomains (*.contoso.com) or email addresses (admin@contoso.com).
 
 To enter multiple values and overwrite any existing entries, use the following syntax: `Value1,Value2,...ValueN`. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
 
diff --git a/exchange/exchange-ps/exchange/Set-OrganizationConfig.md b/exchange/exchange-ps/exchange/Set-OrganizationConfig.md
@@ -83,6 +83,7 @@ Set-OrganizationConfig -ShortenEventScopeDefault <ShortenEventScopeMode>
  [-ExternalInOutlookEnabled <Boolean>]
  [-FindTimeAttendeeAuthenticationEnabled <Boolean>]
  [-FindTimeAutoScheduleDisabled <Boolean>]
+ [-FindTimeLockPollForAttendeesEnabled <Boolean>]
  [-FindTimeOnlineMeetingOptionDisabled <Boolean>]
  [-FocusedInboxOn <Boolean>]
  [-HierarchicalAddressBookRoot <UserContactGroupIdParameter>]
@@ -1892,6 +1893,29 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -FindTimeLockPollForAttendeesEnabled
+This parameter is available only in the cloud-based service.
+
+The FindTimeLockPollForAttendeesEnabled controls whether the **Lock poll for attendees** setting is managed by the organization. Valid values are:
+
+- $true: **Lock poll for attendees** is on. Attendees will not be able to suggest new times or edit other attendees. The meeting organizer can't turn off this setting (always on).
+- $false: By default, **Lock poll for attendees** is off (initial default) or on (the user saved settings from last poll), but the meeting organizer is allowed to turn the setting off or on to allow or prevent attendees from suggesting new times or editing attendees.
+
+For more information about FindTime, see [How to create a FindTime poll](https://support.microsoft.com/office/4dc806ed-fde3-4ea7-8c5e-b5d1fddab4a6).
+
+```yaml
+Type: Boolean
+Parameter Sets: ShortenEventScopeParameter
+Aliases:
+Applicable: Exchange Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -FindTimeOnlineMeetingOptionDisabled
 This parameter is available only in the cloud-based service.
 
@@ -2949,7 +2973,10 @@ Accept wildcard characters: False
 ```
 
 ### -SendFromAliasEnabled
-This parameter is available only in the cloud-based service.
+This parameter is available only in the cloud-based service. 
+
+Note: This feature is in Preview and has not yet been officially released. Do not enable it if you are not willing to lose certain functionality or have a degraded experience. 
+An official announcement will be released via the EHLO blog and Message Center in due time.
 
 The SendFromAliasEnabled parameter allows mailbox users to send messages using aliases (proxy addresses). It does this by disabling the rewriting of aliases to their primary SMTP address. This change is implemented in the Exchange Online service. At the same time, Outlook clients are making changes to natively support aliases for sending and receiving messages. Even without an updated client, changes in behavior may be seen for users using any email client as the setting affects all messages sent and received by a mailbox. Valid values are:
 
diff --git a/sharepoint/sharepoint-ps/sharepoint-online/Get-SPOUserAndContentMoveState.md b/sharepoint/sharepoint-ps/sharepoint-online/Get-SPOUserAndContentMoveState.md
@@ -191,7 +191,7 @@ Accept wildcard characters: False
 
 ### -OdbMoveId
 
-Onedrive GUID MoveID that you get when you start a job.
+OneDrive GUID MoveID that you get when you start a job.
 
 ```yaml
 Type: Guid
diff --git a/sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPOrgAssetsLibrary.md b/sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPOrgAssetsLibrary.md
@@ -29,7 +29,7 @@ Add-PnPOrgAssetsLibrary -LibraryUrl <String> [-ThumbnailUrl <String>] [-CdnType
 ```
 
 ## DESCRIPTION
-Adds a given document library as an organizational asset source in your Sharepoint Online Tenant. All organizational asset sources you add must reside in the same site collection. Document libraries specified as organizational asset must be enabled as an Office 365 CDN source, either as private or public. It may take some time before this change will be reflected in the webinterface.
+Adds a given document library as an organizational asset source in your SharePoint Online Tenant. All organizational asset sources you add must reside in the same site collection. Document libraries specified as organizational asset must be enabled as an Office 365 CDN source, either as private or public. It may take some time before this change will be reflected in the webinterface.
 
 ## EXAMPLES
 
diff --git a/sharepoint/sharepoint-ps/sharepoint-pnp/Remove-PnPOrgAssetsLibrary.md b/sharepoint/sharepoint-ps/sharepoint-pnp/Remove-PnPOrgAssetsLibrary.md
@@ -29,7 +29,7 @@ Remove-PnPOrgAssetsLibrary -LibraryUrl <String> [-ShouldRemoveFromCdn <Boolean>]
 ```
 
 ## DESCRIPTION
-Removes a given document library as a organizational asset source based on its server relative URL in your Sharepoint Online Tenant. It will not remove the document library itself. It may take some time before this change will be reflected in the webinterface.
+Removes a given document library as a organizational asset source based on its server relative URL in your SharePoint Online Tenant. It will not remove the document library itself. It may take some time before this change will be reflected in the webinterface.
 
 ## EXAMPLES
 
diff --git a/sharepoint/sharepoint-ps/sharepoint-pnp/Remove-PnPOrgNewsSite.md b/sharepoint/sharepoint-ps/sharepoint-pnp/Remove-PnPOrgNewsSite.md
@@ -28,7 +28,7 @@ Remove-PnPOrgNewsSite -OrgNewsSiteUrl <SitePipeBind> [-Connection <PnPConnection
 ```
 
 ## DESCRIPTION
-Removes a given site from the list of organizational news sites based on its URL in your Sharepoint Online Tenant.
+Removes a given site from the list of organizational news sites based on its URL in your SharePoint Online Tenant.
 
 ## EXAMPLES
 
diff --git a/sharepoint/sharepoint-ps/sharepoint-server/New-SPEnterpriseSearchCrawlContentSource.md b/sharepoint/sharepoint-ps/sharepoint-server/New-SPEnterpriseSearchCrawlContentSource.md
@@ -249,7 +249,7 @@ Accept wildcard characters: False
 
 ### -SharePointCrawlBehavior
 
-Specifies crawl behavior for a sharepoint type content source.
+Specifies crawl behavior for a SharePoint type content source.
 The behavior can be either:
 
 CrawlSites to crawl only particular site collections.
diff --git a/sharepoint/sharepoint-ps/sharepoint-server/Set-SPO365LinkSettings.md b/sharepoint/sharepoint-ps/sharepoint-server/Set-SPO365LinkSettings.md
@@ -85,7 +85,7 @@ Accept wildcard characters: False
 ```
 
 ### -OnedriveDefaultToCloudEnabled
-Sets a flag that indicates whether Local Onedrive is redirected to SPO OneDrive.
+Sets a flag that indicates whether Local OneDrive is redirected to SPO OneDrive.
 
 ```yaml
 Type: Boolean
diff --git a/skype/skype-ps/skype/Get-CsAutoAttendant.md b/skype/skype-ps/skype/Get-CsAutoAttendant.md
@@ -26,14 +26,14 @@ The Get-CsAutoAttendant cmdlet returns information about the AAs in your organiz
 
 ## EXAMPLES
 
-### -------------------------- Example 1 --------------------------
+### Example 1
 ```powershell
 Get-CsAutoAttendant
 ```
 
 This example gets all AAs in the organization.
 
-### -------------------------- Example 2 --------------------------
+### Example 2
 ```powershell
 Get-CsAutoAttendant -Identity "f7a821dc-2d69-5ae8-8525-bcb4a4556093"
 
@@ -57,14 +57,14 @@ Get-CsAutoAttendant -Identity "f7a821dc-2d69-5ae8-8525-bcb4a4556093"
 
 This example gets the AA that has the identity of f7a821dc-2d69-5ae8-8525-bcb4a4556093.
 
-### -------------------------- Example 3 --------------------------
+### Example 3
 ```
 Get-CsAutoAttendant -First 10
 ```
 
 This example gets the first ten auto attendants configured for use in the organization.
 
-### -------------------------- Example 4 --------------------------
+### Example 4
 ```
 Get-CsAutoAttendant -Skip 5 -First 10
 ```
@@ -76,6 +76,7 @@ This example skips initial 5 auto attendants and gets the next 10 AAs configured
 
 ### -Identity
 The identity for the AA to be retrieved. If this parameter is not specified, then all created AAs in the organization are returned.
+If you specify this parameter, you can't specify the other parameters.
 
 ```yaml
 Type: System.String
diff --git a/teams/teams-ps/teams/Get-Team.md b/teams/teams-ps/teams/Get-Team.md
@@ -161,7 +161,7 @@ Accept wildcard characters: False
 ```
 
 ### -MailNickName
-Specify the mailnickname of the team that is being returned.  This is a unique identifier and returns exact match.
+Specify the mailnickname of the team that is being returned. This acts as a filter instead of being an exact match.
 
 ```yaml
 Type: String

-Original file line number
+Diff line change
 ```
 ### -AllowList
 -The AllowList parameter specifies exceptions to external sender identification in supported versions of Outlook. Messages received from the specified senders or senders in the specified domains don't receive native External sender identification. Valid values are domains (contoso.com) or email addresses ([email protected]).
 +The AllowList parameter specifies exceptions to external sender identification in supported versions of Outlook. Messages received from the specified senders or senders in the specified domains don't receive native External sender identification. The allow list uses the `5322.From` address (also known as the **From** address or P2 sender).
++
 +Valid values are an individual domain (contoso.com), a domain and all subdomains (*.contoso.com) or email addresses ([email protected]).
 To enter multiple values and overwrite any existing entries, use the following syntax: `Value1,Value2,...ValueN`. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.