Merge pull request MicrosoftDocs#1134 from MicrosoftDocs/master

Master to ExMigration

Author: chrisda

exchange/exchange-ps/exchange/advanced-threat-protection/New-SafeLinksRule.md

@@ -36,7 +36,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### -------------------------- Example 1 --------------------------
 ```
-New-SafeAttachmentRule -Name "Research Department URL Rule" -SafeAttachmentPolicy "Research Block URL" -SentToMemberOf "Research Department" -ExceptIfSentToMemberOf "Research Department Managers"
+New-SafeLinksRule -Name "Research Department URL Rule" -SafeAttachmentPolicy "Research Block URL" -SentToMemberOf "Research Department" -ExceptIfSentToMemberOf "Research Department Managers"
 ```
 
 This example creates a new Safe Links rule named Research Department URL Rule with the following conditions:

exchange/exchange-ps/exchange/advanced-threat-protection/Set-SafeLinksRule.md

@@ -34,7 +34,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 
 ### -------------------------- Example 1 --------------------------
 ```
-Set-SafeAttachmentRule -Identity "Engineering Department URL Rule" -ExceptIfRecipientDomainIs fabrikam.com
+Set-SafeLinksRule -Identity "Engineering Department URL Rule" -ExceptIfRecipientDomainIs fabrikam.com
 ```
 
 This example modifies the existing Safe Links Rule named Engineering Department URL Rule to exclude messages sent to the fabrikam.com ___domain.

exchange/exchange-ps/exchange/organization/Set-OrganizationConfig.md

@@ -1440,7 +1440,7 @@ The OAuth2ClientProfileEnabled parameter enables or disables modern authenticati
 
 - $true: Modern authentication is enabled.
 
-- $false: Modern authentication is disabled. This is the default value.
+- $false: Modern authentication is disabled. 
 
 Modern authentication is based on the Active Directory Authentication Library (ADAL) and OAuth 2.0, and enables authentication features like multi-factor authentication (MFA), certificate-based authentication (CBA), and third-party SAML identity providers.
 
@@ -1453,7 +1453,7 @@ Aliases:
 Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Online
 Required: False
 Position: Named
-Default value: None
+Default value: True
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -1975,11 +1975,7 @@ Accept wildcard characters: False
 ### -PerTenantSwitchToESTSEnabled
 This parameter is available only in the cloud-based service.
 
-The PerTenantSwitchToESTSEnabled parameter specifies whether basic authentication requests use the Evolved Security Token Service (ESTS) in an Exchange Online organization. Valid values are:
-
-- $true: Basic authentication requests use ESTS.
-
-- $false: Basic authentication requests don't use ESTS. This is the default value.
+This parameter has been deprecated and is no longer used.
 
 ```yaml
 Type: $true | $false

exchange/exchange-ps/exchange/policy-and-compliance-dlp/Remove-DlpSensitiveInformationTypeRulePackage.md

@@ -31,10 +31,10 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
 
 ### -------------------------- Example 1 --------------------------
 ```
-Remove-DlpSensitiveInformationTypeRulePackage -Identity "Contoso Rule Pack"
+$Rule = Get-DlpSensitiveInformationTypeRulePackage -Identity "Contoso Rule Pack"; $Rule | Remove-DlpSensitiveInformationTypeRulePackage
 ```
 
-This example removes the third-party sensitive information type rule package named Contoso Rule Pack
+This example removes the third-party sensitive information type rule package named Contoso Rule Pack. The first command stores the identity of the rule package in a variable. The second command pipes the variable to the Remove-DlpSensitiveInformationTypeRulePackage cmdlet.
 
 ## PARAMETERS
 

exchange/exchange-ps/exchange/policy-and-compliance/Set-ActivityAlert.md

@@ -217,7 +217,7 @@ Accept wildcard characters: False
 ```
 
 ### -Name
-The Name parameter specifies the unique name of the activity alert. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks (").
+This parameter is reserved for internal Microsoft use.
 
 ```yaml
 Type: String

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

@@ -30,8 +30,8 @@ Set-UnifiedGroup [-Identity] <UnifiedGroupIdParameter>
  [-EmailAddresses <ProxyAddressCollection>] [-ExtensionCustomAttribute1 <MultiValuedProperty>]
  [-ExtensionCustomAttribute2 <MultiValuedProperty>] [-ExtensionCustomAttribute3 <MultiValuedProperty>]
  [-ExtensionCustomAttribute4 <MultiValuedProperty>] [-ExtensionCustomAttribute5 <MultiValuedProperty>]
- [-ForceUpgrade] [-GrantSendOnBehalfTo <MultiValuedProperty>] [-HiddenFromAddressListsEnabled <$true | $false>] 
- [-HideFromExchangeClients <$true | $false>] [-Language <CultureInfo>] [-MailboxRegion <String>] [-MailTip <String>]
+ [-ForceUpgrade] [-GrantSendOnBehalfTo <MultiValuedProperty>] [-HiddenFromAddressListsEnabled <$true | $false>]
+ [-HiddenFromExchangeClientsEnabled <$true | $false>] [-Language <CultureInfo>] [-MailboxRegion <String>] [-MailTip <String>]
  [-MailTipTranslations <MultiValuedProperty>] [-Notes <String>] [-PrimarySmtpAddress <SmtpAddress>]
  [-RejectMessagesFromSendersOrMembers <MultiValuedProperty>]
  [-RequireSenderAuthenticationEnabled <$true | $false>] [-UnifiedGroupWelcomeMessageEnabled] [-WhatIf]
@@ -752,8 +752,8 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -HideFromExchangeClients
-The HideFromExchangeClients parameter specifies whether the Office 365 Group is hidden from Outlook clients connected to Office 365. When this value is set to true, the group will no longer be visible in the Outlook left hand navigation and the group will not resolve when attempting to resolve the address while authoring a new mail message in Outlook. Additionally, the parameter HiddenFromAddressListsEnabled will also be set to true to prevent the group from showing in the Global Address Book (GAL) and Offline Address Book (OAB). Valid values are:
+### -HiddenFromExchangeClientsEnabled
+The HiddenFromExchangeClientsEnabled parameter specifies whether the Office 365 Group is hidden from Outlook clients connected to Office 365. When this value is set to true, the group will no longer be visible in the Outlook left hand navigation and the group will not resolve when attempting to resolve the address while authoring a new mail message in Outlook. Additionally, the property HiddenFromAddressListsEnabled will also be set to true to prevent the group from showing in the Global Address Book (GAL) and Offline Address Book (OAB). Valid values are:
 
 - $true: The Office 365 Group is hidden from Outlook experiences. The group will not be visible in the Outlook left hand navigation and will not be visible in the address book. Additionally, the group name will not resolve when attempting to resolve the address while authoring a new mail message in Outlook. The group can still receive messages, but users can't search for or browse to the group in Outlook or Outlook on the web. Users also can't find the group by using the Discover option in Outlook on the web. 
 

skype/skype-ps/skype/ConvertTo-JsonForPSWS.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # ConvertTo-JsonForPSWS
 
 ## SYNOPSIS
-ConvertTo-JsonForPSWS \[-InputObject\] \<Object\> \[-Depth \<int\>\] \[-Compress\] \[\<CommonParameters\>\]
+Converts an object to a JSON-formatted string for PowerShell Web Services.
 
 ## SYNTAX
 
@@ -17,21 +17,98 @@ ConvertTo-JsonForPSWS [[-InputObject] <Object>] [-Compress] [-Depth <Object>] [-
 ```
 
 ## DESCRIPTION
-{{Fill in the Description}}
+The `ConvertTo-JsonForPSWS` cmdlet converts any object to a string in JavaScript Object Notation (JSON) format for PowerShell Web Services. The properties are converted to field names, the field values are converted to property values, and the methods are removed.
+
+You can then use the `ConvertTo-JsonForPSWS` cmdlet to convert a JSON-formatted string to a JSON object, which is easily managed in Windows PowerShell.
+
+Many web sites use JSON instead of XML to serialize data for communication between servers and web-based apps.
 
 ## EXAMPLES
 
 ### -------------------------- Example 1 --------------------------
 ```
-PS C:\> {{ Add example code here }}
+PS C:\> (Get-UICulture).Calendar | ConvertTo-JsonForPSWS
+{
+    "MinSupportedDateTime":  "\/Date(-62135568000000)\/",
+    "MaxSupportedDateTime":  "\/Date(253402300799999)\/",
+    "AlgorithmType":  "SolarCalendar",
+    "CalendarType":  "Localized",
+    "Eras":  [
+                 1
+             ],
+    "TwoDigitYearMax":  2029,
+    "IsReadOnly":  false
+}
+```
+
+This command uses the `ConvertTo-JsonForPSWS` cmdlet to convert a GregorianCalendar object to a JSON-formatted string for PowerShell Web Services.
+
+### -------------------------- Example 2 --------------------------
+```
+PS C:\> @{Account="User01";Domain="Domain01";Admin="True"} | ConvertTo-JsonForPSWS -Compress
+{"Admin":"True","Account":"User01","Domain":"Domain01"}
+```
+
+This command shows the effect of using the Compress parameter of `ConvertTo-JsonForPSWS`. The compression affects only the appearance of the string, not its validity.
+
+### -------------------------- Example 3 --------------------------
+```
+PS C:\> Get-Date | Select-Object -Property * | ConvertTo-JsonForPSWS
+{
+    "DisplayHint":  {
+                        "value":  2,
+                        "Value":  "DateTime"
+                    },
+    "DateTime":  "domingo, 27 de mayo de 2018 19:01:15",
+    "Date":  "\/Date(1527390000000)\/",
+    "Day":  27,
+    "DayOfWeek":  {
+                      "value":  0,
+                      "Value":  "Sunday"
+                  },
+    "DayOfYear":  147,
+    "Hour":  19,
+    "Kind":  {
+                 "value":  2,
+                 "Value":  "Local"
+             },
+    "Millisecond":  225,
+    "Minute":  1,
+    "Month":  5,
+    "Second":  15,
+    "Ticks":  636630444752251610,
+    "TimeOfDay":  {
+                      "Hours":  19,
+                      "Minutes":  1,
+                      "Seconds":  15,
+                      "Ticks":  684752251610,
+                      "Days":  0,
+                      "Milliseconds":  225,
+                      "TotalDays":  0.79253732825231482,
+                      "TotalHours":  19.020895878055555,
+                      "TotalMilliseconds":  68475225.161,
+                      "TotalMinutes":  1141.2537526833335,
+                      "TotalSeconds":  68475.225161
+                  },
+    "Year":  2018
+}
 ```
 
-{{ Add example description here }}
+This command shows how to use the `ConvertTo-JsonForPSWS` cmdlet to convert an object to a JSON string for PowerShell Web Services.
+
+It uses the `ConvertTo-JsonForPSWS` cmdlet to convert a System.DateTime object from the Get-Date cmdlet to a JSON-formatted string for PowerShell Web Services. The command uses the Select-Object cmdlet to get all () of the properties of the **DateTime* object. The output shows the JSON string that `ConvertTo-JsonForPSWS` returned.
+
+### -------------------------- Example 4 --------------------------
+```
+PS C:\> $JsonSecurityHelp = Get-Content $Pshome\Modules\Microsoft.PowerShell.Security\en-US\Microsoft.PowerShell.Security.dll-Help.xml | ConvertTo-JsonForPSWS
+```
+
+This command uses the `ConvertTo-JsonForPSWS` cmdlet to convert a Windows PowerShell Help file from XML format to JSON format for PowerShell Web Services.
 
 ## PARAMETERS
 
 ### -Compress
-{{Fill Compress Description}}
+Omits white space and indented formatting in the output string.
 
 ```yaml
 Type: SwitchParameter
@@ -47,7 +124,7 @@ Accept wildcard characters: False
 ```
 
 ### -Depth
-{{Fill Depth Description}}
+Specifies how many levels of contained objects are included in the JSON representation. The default value is 2.
 
 ```yaml
 Type: Object
@@ -63,7 +140,9 @@ Accept wildcard characters: False
 ```
 
 ### -InputObject
-{{Fill InputObject Description}}
+Specifies the objects to convert to JSON format. Enter a variable that contains the objects, or type a command or expression that gets the objects. You can also pipe an object to `ConvertTo-JsonForPSWS`.
+
+The InputObject parameter is required, but its value can be null ($Null) or an empty string. When the input object is $Null, `ConvertTo-JsonForPSWS` does not generate any output. When the input object is an empty string, `ConvertTo-JsonForPSWS` returns an empty string.
 
 ```yaml
 Type: Object
@@ -79,7 +158,11 @@ Accept wildcard characters: False
 ```
 
 ### -AsJob
-{{Fill AsJob Description}}
+Indicates that this cmdlet runs as a background job.
+
+When you specify the AsJob parameter, the command immediately returns an object that represents the background job. You can continue to work in the session while the job finishes. The job is created on the local computer and the results from the Skype for Business Online session are automatically returned to the local computer. To get the job results, use the Receive-Job cmdlet.
+
+For more information about Windows PowerShell background jobs, see [about_Jobs](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_jobs?view=powershell-6) and [about_Remote_Jobs](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_remote_jobs?view=powershell-6).
 
 ```yaml
 Type: SwitchParameter
@@ -100,14 +183,15 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 ## INPUTS
 
 ### System.Object
+You can pipe any object to ConvertTo-JsonForPSWS.
 
 ## OUTPUTS
 
-### System.Object
+### System.String
 
 ## NOTES
 
 ## RELATED LINKS
 
-[http://go.microsoft.com/fwlink/?LinkID=217032](http://go.microsoft.com/fwlink/?LinkID=217032)
+[ConvertTo-Json](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.utility/convertto-json?view=powershell-6)
 

skype/skype-ps/skype/Get-CsBusyOptions.md

@@ -8,7 +8,7 @@ schema: 2.0.0
 # Get-CsBusyOptions
 
 ## SYNOPSIS
-{{Fill in the Synopsis}}
+Returns the settings for processing of incoming calls for users who are already engaged in another communication stream. This cmdlet was introduced in Skype for Business Server 2015 June 2016 Cumulative Update.
 
 ## SYNTAX
 
@@ -17,23 +17,29 @@ Get-CsBusyOptions [-Identity] <UserIdParameter> [-PassThru] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
-{{Fill in the Description}}
+This cmdlet retrieves configuration information about Busy Options for a specific user. It returns one of two Action Type options:
+
+* BusyOnBusy - In which new incoming calls will be rejected with a busy signal if the user is busy.
+
+* VoicemailOnBusy - In which new incoming calls will be forwarded to voice mail if the user is busy.
 
 
 ## EXAMPLES
 
 ### -------------------------- Example 1 --------------------------
 ```
-{{ Add example code here }}
+Get-CsBusyOptions -Identity sip:[email protected]
 ```
 
-{{ Add example description here }}
+This example returns the Busy Options setting for "[email protected]".
 
 
 ## PARAMETERS
 
 ### -Identity
-{{Fill Identity Description}}
+Indicates the Identity of the user account to be modified. User Identities can be specified using one of four formats: 1) the user's SIP address; 2) the user's user principal name (UPN); 3) the user's ___domain name and logon name, in the form ___domain\logon (for example, litwareinc\kenmyer) and 4) the user's Active Directory display name (for example, Ken Myer). User Identities can also be referenced by using the user's Active Directory distinguished name.
+
+You can use the asterisk (*) wildcard character when using the display name as the user Identity. For example, the Identity "*Smith" returns all the users who have a display name that ends with the string value "Smith".
 
 ```yaml
 Type: UserIdParameter
@@ -49,7 +55,7 @@ Accept wildcard characters: False
 ```
 
 ### -PassThru
-{{Fill PassThru Description}}
+Returns an object representing the item with which you are working. By default, this cmdlet does not generate any output.
 
 ```yaml
 Type: SwitchParameter
@@ -70,16 +76,21 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
-### Microsoft.Rtc.Management.AD.UserIdParameter
+### 
+Microsoft.Rtc.Management.AD.UserIdParameter object.
 
 
 ## OUTPUTS
 
-### System.Object
+### 
+Microsoft.Rtc.Management.Bob.Cmdlets.ActionType object.
+Microsoft.Rtc.Management.AD.UserIdParameter object.
 
 
 ## NOTES
 
 
 ## RELATED LINKS
+[Remove-CsBusyOptions](https://docs.microsoft.com/en-us/powershell/module/skype/remove-csbusyoptions?view=skype-ps)
 
+[Set-CsBusyOptions](https://docs.microsoft.com/en-us/powershell/module/skype/set-csbusyoptions?view=skype-ps)

skype/skype-ps/skype/Get-CsPushNotificationConfiguration.md

@@ -43,31 +43,15 @@ For example, users can receive notice for events such as these:
 Without the push notification service users would receive these notices only when Skype for Business was in the foreground and serving as the active application.
 
 Administrators have the ability to enable or disable push notifications for iPhone users and/or Windows Phone users.
-(By default, push notifications are disabled for both iPhone users and Windows Phone users.) Administrators can enable or disable push notifications at the global scope by using the Set-CsPushNotificationConfiguration cmdlet.
-They can also create custom push notification settings at the site scope by using the New-CsPushNotificationConfiguration cmdlet.
+(By default, push notifications are disabled for both iPhone users and Windows Phone users.) Administrators can enable or disable push notifications at the global scope by using the `Set-CsPushNotificationConfiguration` cmdlet.
+They can also create custom push notification settings at the site scope by using the `New-CsPushNotificationConfiguration` cmdlet.
 
-The Get-CsPushNotificationConfiguration cmdlet provides a way for you to return information about the push notification configuration settings currently in use in your organization.
+The `Get-CsPushNotificationConfiguration` cmdlet provides a way for you to return information about the push notification configuration settings currently in use in your organization.
 
 
 
 ## EXAMPLES
 
-### -------------------------- EXAMPLE 1 -------------------------- (Lync Server 2013)
-```
-
-```
-
-Example 1 returns information about all the push notification settings configured for use in your organization.
-
-Get-CsPushNotificationConfiguration
-
-### Example 1 (Skype for Business Online)
-```
-PS C:\> {{ Add example code here }}
-```
-
-{{ Add example description here }}
-
 ### -------------------------- Example 1 --------------------------
 ```
 Get-CsPushNotificationConfiguration
@@ -273,4 +257,8 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 
 ## RELATED LINKS
+[Set-CsPushNotificationConfiguration](https://docs.microsoft.com/en-us/powershell/module/skype/set-cspushnotificationconfiguration?view=skype-ps)
+
+[New-CsPushNotificationConfiguration](https://docs.microsoft.com/en-us/powershell/module/skype/new-cspushnotificationconfiguration?view=skype-ps)
 
+[Remove-CsPushNotificationConfiguration](https://docs.microsoft.com/en-us/powershell/module/skype/remove-cspushnotificationconfiguration?view=skype-ps)