Merge branch 'master' into patch-42

Author: Techwriter40

exchange/exchange-ps/exchange/encryption-and-certificates/Get-OMEConfiguration.md

@@ -38,10 +38,10 @@ This example returns a summary list of all OME configurations in the organizatio
 
 ### -------------------------- Example 2 --------------------------
 ```
-Get-OMEConfiguration -Identity "OME Configuration" | Format-List
+Get-OMEConfiguration | Format-List
 ```
 
-This example returns detailed information for the default OME configuration named OME Configuration.
+This example returns detailed information for all OME configurations in the organization.
 
 ## PARAMETERS
 

exchange/exchange-ps/exchange/encryption-and-certificates/New-OMEConfiguration.md

@@ -22,6 +22,7 @@ New-OMEConfiguration [-Identity] <OrganizationIdParameter>
  [-BackgroundColor <String>]
  [-DisclaimerText <String>]
  [-EmailText <String>]
+ [-ExternalMailExpiryInDays <Int32>]
  [-Image <Byte[]>] 
  [-IntroductionText <String>]
  [-OTPEnabled <$true | $false>]
@@ -113,6 +114,23 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ExternalMailExpiryInDays 
+This parameter is only available with a Microsoft 365 Advanced Message Encryption subscription.
+
+The ExternalMailExpiryInDays parameter specifies the number of days that the encrypted message is available to external recipients in the Microsoft 365 portal. A valid value is an integer from 0 to 730. The value 0 means the messages will never expire. The default value is 0.
+
+```yaml
+Type: String
+Parameter Sets: Int32
+Aliases:
+Applicable: Exchange Online
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Image
 The Image parameter identifies and uploads an image that will be displayed in the email message and in the Office 365 portal.
 

exchange/exchange-ps/exchange/encryption-and-certificates/Set-OMEConfiguration.md

@@ -25,6 +25,7 @@ Set-OMEConfiguration [-Identity] <OMEConfigurationIdParameter>
  [-BackgroundColor <String>]
  [-DisclaimerText <String>]
  [-EmailText <String>]
+ [-ExternalMailExpiryInDays <Int32>]
  [-Image <Byte[]>]
  [-IntroductionText <String>]
  [-OTPEnabled <$true | $false>]
@@ -118,6 +119,23 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -ExternalMailExpiryInDays 
+This parameter is only available with a Microsoft 365 Advanced Message Encryption subscription.
+
+The ExternalMailExpiryInDays parameter specifies the number of days that the encrypted message is available to external recipients in the Microsoft 365 portal. A valid value is an integer from 0 to 730. The value 0 means the messages will never expire. The default value is 0.
+
+```yaml
+Type: String
+Parameter Sets: Int32
+Aliases:
+Applicable: Exchange Online
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Image
 The Image parameter identifies and uploads an image that will be displayed in the email message and in the Office 365 portal.
 

exchange/exchange-ps/exchange/users-and-groups/Set-User.md

@@ -117,6 +117,8 @@ The Identity parameter specifies the user that you want to modify. You can use a
 
 - GUID
 
+- UserPrincipalName
+
 ```yaml
 Type: UserIdParameter
 Parameter Sets: (All)

skype/docs-conceptual/index.md

@@ -2,7 +2,7 @@
 localization_priority: Normal
 ---
 
-#Skype for Business cmdlet reference
+# Skype for Business cmdlet reference
 
 Welcome to the Skype for Business PowerShell cmdlet help references. The Skype for Business cmdlets provide the command line interface for server and service administration and management.
 

skype/skype-ps/skype/New-CsAutoAttendantCallHandlingAssociation.md

@@ -11,7 +11,7 @@ ms.reviewer:
 # New-CsAutoAttendantCallHandlingAssociation
 
 ## SYNOPSIS
-Use the New-CsAutoAttendantCallHandlingAssociation cmdlet to create a new call handling association.
+Use the `New-CsAutoAttendantCallHandlingAssociation` cmdlet to create a new call handling association.
 
 ## SYNTAX
 
@@ -20,14 +20,14 @@ New-CsAutoAttendantCallHandlingAssociation -CallFlowId <String> -ScheduleId <Str
 ```
 
 ## DESCRIPTION
-The New-CsAutoAttendantCallHandlingAssociation cmdlet creates a new call handling association to be used with the Auto Attendant (AA) service. The OAA service uses call handling associations to determine which call flow to execute when a specific schedule is in effect.
+The `New-CsAutoAttendantCallHandlingAssociation` cmdlet creates a new call handling association to be used with the Auto Attendant (AA) service. The OAA service uses call handling associations to determine which call flow to execute when a specific schedule is in effect.
 
 ## EXAMPLES
 
 ### -------------------------- Example 1 --------------------------
 ```powershell
 $tr = New-CsOnlineTimeRange -Start 09:00 -End 17:00
-$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr)
+$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr) -TuesdayHours @($tr) -WednesdayHours @($tr) -ThursdayHours @($tr) -FridayHours @($tr)
 $scheduleId = $schedule.Id
 
 $menuPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt "To reach your party by name, enter it now, followed by the pound sign."
@@ -38,7 +38,7 @@ $callFlowId = $callFlow.Id
 $callHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type AfterHours -ScheduleId $scheduleId -CallFlowId $callFlowId
 ```
 
-This example creates the following
+This example creates the following:
 
 - a new after-hours schedule
 - a new after-hours call flow
@@ -47,7 +47,7 @@ This example creates the following
 ### -------------------------- Example 2 --------------------------
 ```powershell
 $tr = New-CsOnlineTimeRange -Start 09:00 -End 17:00
-$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr)
+$schedule = New-CsOnlineSchedule -Name "Business Hours" -WeeklyRecurrentSchedule -MondayHours @($tr) -TuesdayHours @($tr) -WednesdayHours @($tr) -ThursdayHours @($tr) -FridayHours @($tr)
 $scheduleId = $schedule.Id
 
 $menuPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt "To reach your party by name, enter it now, followed by the pound sign."
@@ -58,7 +58,7 @@ $callFlowId = $callFlow.Id
 $disabledCallHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type AfterHours -ScheduleId $scheduleId -CallFlowId $callFlowId -Disable
 ```
 
-This example creates the following
+This example creates the following:
 
 - a new after-hours schedule
 - a new after-hours call flow
@@ -79,7 +79,7 @@ $callFlowId = $callFlow.Id
 $callHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type Holiday -ScheduleId $scheduleId -CallFlowId $callFlowId
 ```
 
-This example creates the following
+This example creates the following:
 
 - a new holiday schedule
 - a new holiday call flow
@@ -94,7 +94,7 @@ You can create a call flow by using the [`New-CsAutoAttendantCallFlow`](New-CsAu
 
 
 ```yaml
-Type: System.String
+Type: String
 Parameter Sets: (All)
 Aliases:
 Applicable: Skype for Business Online
@@ -162,9 +162,18 @@ Accept wildcard characters: False
 ```
 
 ### -Tenant
+Globally unique identifier (GUID) of the tenant account whose external user communication policy are being created. For example:
+
+-Tenant "38aad667-af54-4397-aaa7-e94c79ec2308"
+
+You can return your tenant ID by running this command:
+
+Get-CsTenant | Select-Object DisplayName, TenantID
+
+If you are using a remote session of Windows PowerShell and are connected only to Skype for Business Online you do not have to include the Tenant parameter. Instead, the tenant ID will automatically be filled in for you based on your connection information. The Tenant parameter is primarily for use in a hybrid deployment.
 
 ```yaml
-Type: System.Guid
+Type: Guid
 Parameter Sets: (All)
 Aliases:
 Applicable: Skype for Business Online

skype/skype-ps/skype/Remove-CsTeamsMeetingPolicy.md

@@ -11,7 +11,7 @@ ms.reviewer:
 # Remove-CsTeamsMeetingPolicy
 
 ## SYNOPSIS
-Remove-CsTeamsMeetingPolicy \[-Identity\] \<XdsIdentity\> \[-Tenant \<guid\>\] \[-Force\] \[-WhatIf\] \[-Confirm\] \[\<CommonParameters\>\]
+The `CsTeamsMeetingPolicy` cmdlets removes a previously created TeamsMeetingPolicy.
 
 ## SYNTAX
 
@@ -21,7 +21,7 @@ Remove-CsTeamsMeetingPolicy [-Tenant <Guid>] [-Identity] <XdsIdentity> [-Force]
 ```
 
 ## DESCRIPTION
-Deletes a previously created TeamsMeetingPolicy.  Any users with no explicitly assigned policies will then fall back to the default policy in the organization.  You cannot delete the global policy from the organization. 
+Deletes a previously created TeamsMeetingPolicy. Any users with no explicitly assigned policies will then fall back to the default policy in the organization. You cannot delete the global policy from the organization. If you want to remove policies currently assigned to one or more users, you should assign a different policy to them before.
 
 ## EXAMPLES
 
@@ -50,6 +50,7 @@ Accept wildcard characters: False
 ```
 
 ### -Force
+The Force switch specifies whether to suppress warning and confirmation messages. It can be useful in scripting to suppress interactive prompts. If the Force switch isn't provided in the command, you're prompted for administrative input if required.
 
 ```yaml
 Type: SwitchParameter
@@ -64,7 +65,7 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-Unique identifier for the teams meeting policy to be removed. To remove the global policy, use this syntax: -Identity global. (Note that the global policy cannot actually be removed. Instead, all the policy properties will be reset to their default values.) To remove a custom policy, use this syntax: -Identity StudentMeetingPolicy .
+Unique identifier for the teams meeting policy to be removed. To remove the global policy, use this syntax: -Identity global. (Note that the global policy cannot actually be removed. Instead, all the policy properties will be reset to their default values.) To remove a custom policy, use this syntax: -Identity StudentMeetingPolicy.
 
 ```yaml
 Type: XdsIdentity
@@ -79,6 +80,15 @@ Accept wildcard characters: False
 ```
 
 ### -Tenant
+Globally unique identifier (GUID) of the tenant account whose external user communication policy are being created. For example:
+
+-Tenant "38aad667-af54-4397-aaa7-e94c79ec2308"
+
+You can return your tenant ID by running this command:
+
+Get-CsTenant | Select-Object DisplayName, TenantID
+
+If you are using a remote session of Windows PowerShell and are connected only to Skype for Business Online you do not have to include the Tenant parameter. Instead, the tenant ID will automatically be filled in for you based on your connection information. The Tenant parameter is primarily for use in a hybrid deployment.
 
 ```yaml
 Type: Guid

skype/skype-ps/skype/Set-CsOnlineVoicemailUserSettings.md

@@ -24,8 +24,6 @@ Set-CsOnlineVoicemailUserSettings -Identity <String> [-VoicemailEnabled <Boolean
 The Set-CsOnlineVoicemailUserSettings cmdlet lets tenant admin modify the online voicemail user settings of a specific user in the organization. New online voicemail user settings of the user would be returned after executing.
 For example, tenant admin could enable/disable voicemail, change voicemail prompt language, modify out-of-office voicemail greeting settings, or setup simple call answer rules. Only those properties that tenant admin have actually provided with be modified. If an online voicemail user setting was not set by tenant admin, it would remain the old value after this cmdlet has been executed.
 
-**NOTE** 
-- **This cmdlet is currently available to PREVIEW customers only.** 
 
 ## EXAMPLES