Merge branch 'master' into EDM-deniseb

Author: chrisda

sharepoint/sharepoint-ps/sharepoint-server/Set-SPTrustedRootAuthority.md

@@ -32,7 +32,7 @@ Set-SPTrustedRootAuthority [-Identity] <SPTrustedRootAuthorityPipeBind>
 
 ## DESCRIPTION
 The `Set-SPTrustedRootAuthority` cmdlet creates a new trusted root authority.
-If a certificate file is used, the certificate must be an X509 certificate with private keys, otherwise an exception is raised.
+If a certificate file is used, the certificate must be an X509 certificate without private keys, otherwise an exception is raised.
 
 For permissions and the most current information about Windows PowerShell for SharePoint Products, see the online documentation at [SharePoint Server Cmdlets](https://docs.microsoft.com/powershell/sharepoint/sharepoint-server/sharepoint-server-cmdlets).
 
@@ -41,8 +41,9 @@ For permissions and the most current information about Windows PowerShell for Sh
 
 ### ------------------EXAMPLE------------------
 ```
-C:\PS>$cert = Get-PfxCertificate C:\LiveIDSigningCert.pfx
-Get - SPTrustedRootAuthority -Name "WFEFarm1" | Set- SPTrustedRootAuthority -Certificate $cert
+C:\PS>$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2
+$cert.Import('C:\LiveIDSigningCert.pfx')
+Get-SPTrustedRootAuthority -Name "WFEFarm1" | Set-SPTrustedRootAuthority -Certificate $cert
 ```
 
 This example updates the certificate of the trusted root authority WFEFarm1.

sharepoint/sharepoint-ps/sharepoint-server/Split-SPScaleOutDatabase.md

@@ -43,7 +43,7 @@ For permissions and the most current information about Windows PowerShell for Sh
 
 ## EXAMPLES
 
-### ---------------EXAMPLE---------------
+### ---------------EXAMPLE 1---------------
 ```
 $databases = Get-SPScaleOutDatabase -ServiceApplication $serviceApplication
 $database = $databases[0]
@@ -52,7 +52,19 @@ Split-SPScaleOutDatabase -NewDatabaseName Database2 -NewDatabaseServer MyDatabas
 
 This example creates a new scale-out database named Database2 on the MyDatabaseServer database server  in the given service application.
 
-The example also moves 30 percent of the data from the upper side of the data range in the first scale-out database of the given service application.
+The example also moves 30% of the data from the upper side of the data range in the first scale-out database of the given service application.
+
+### ---------------EXAMPLE 2---------------
+
+```
+$ssa = Get-SPEnterpriseSearchServiceApplication
+
+$newReportingDb = "Search_AnalyticsReporting2"
+$reportingDb = Get-SPScaleOutDatabase -SearchApplication $ssa
+Split-SPServerScaleOutDatabase -SourceServiceApplication $ssa -SourceDatabase $reportingDb -NewDatabaseName $newReportingDb -SourcePercentage 33
+
+```
+This example scales out the Search Analytics database, moving 33% of data to the new databases.
 
 ## PARAMETERS
 

skype/skype-ps/skype/New-CsAutoAttendant.md

@@ -203,6 +203,54 @@ We can see when we ran the Get-CsOnlineSchedule cmdlet at the end, to get the _C
 
 Removing an association between an AA and a schedule is as simple as deleting the CallHandlingAssociation of that schedule in the AA you want to modify. Please refer to [Set-CsAutoAttendant](Set-CsAutoAttendant.md) cmdlet documentation for examples on how to do that.
 
+### -------------------------- Example 4 --------------------------
+```powershell
+$aaName = "Main Auto Attendant"
+$language = "en-US"
+$greetingText = "Welcome to Contoso"
+$mainMenuText = "To reach your party by name, say it now. To talk to Sales, please press 1. To talk to User2 press 2. Please press 0 for operator"
+$afterHoursText = "Sorry Contoso is closed. Please call back during week days from 7AM to 8PM. Goodbye!"
+$tz = "Romance Standard Time"
+$operatorId = (Get-CsOnlineUser -Identity "sip:[email protected]").ObjectId
+$user1Id = (Get-CsOnlineUser -Identity "sip:[email protected]").ObjectId
+$salesCQappinstance = (Get-CsOnlineUser -Identity "[email protected]").ObjectId # one of the application instances associated to the Call Queue
+$tr1 = New-CsOnlineTimeRange -Start 07:00 -End 20:00
+
+# After hours
+$afterHoursSchedule = New-CsOnlineSchedule -Name "After Hours" -WeeklyRecurrentSchedule -MondayHours @($tr1) -TuesdayHours @($tr1) -WednesdayHours @($tr1) -ThursdayHours @($tr1) -FridayHours @($tr1) -Complement
+$afterHoursGreetingPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt $afterHoursText
+$afterHoursMenuOption = New-CsAutoAttendantMenuOption -Action DisconnectCall -DtmfResponse Automatic
+$afterHoursMenu = New-CsAutoAttendantMenu -Name "AA menu1" -MenuOptions @($afterHoursMenuOption)
+$afterHoursCallFlow = New-CsAutoAttendantCallFlow -Name "After Hours" -Menu $afterHoursMenu -Greetings @($afterHoursGreetingPrompt)
+$afterHoursCallHandlingAssociation = New-CsAutoAttendantCallHandlingAssociation -Type AfterHours -ScheduleId $afterHoursSchedule.Id -CallFlowId $afterHoursCallFlow.Id
+
+# Business hours menu options
+$operator = New-CsAutoAttendantCallableEntity -Identity $operatorId -Type User
+$sales = New-CsAutoAttendantCallableEntity -Identity $salesCQappinstance -Type applicationendpoint
+$user1 = New-CsAutoAttendantCallableEntity -Identity $user1Id -Type User
+$menuOption0 = New-CsAutoAttendantMenuOption -Action TransferCallToOperator -DtmfResponse Tone0 -CallTarget $operator
+$menuOption1 = New-CsAutoAttendantMenuOption -Action TransferCallToTarget -DtmfResponse Tone1 -CallTarget $sales
+$menuOption2 = New-CsAutoAttendantMenuOption -Action TransferCallToTarget -DtmfResponse Tone2 -CallTarget $user1
+
+# Business hours menu
+$greetingPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt $greetingText
+$menuPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt $mainMenuText
+$menu = New-CsAutoAttendantMenu -Name "AA menu2" -Prompts @($menuPrompt) -EnableDialByName -MenuOptions @($menuOption0,$menuOption1,$menuOption2)
+$callFlow = New-CsAutoAttendantCallFlow -Name "Default" -Menu $menu -Greetings $greetingPrompt
+```
+
+This example creates a new AA named _Main auto attendant_ that has the following properties:
+
+- It sets a default call flow.
+- It sets an after-hours call flow.
+- It sets a business hours options.
+- It references a call queue as a menu option.
+- The default language is en-US.
+- The time zone is set to Romance Standard.
+- It sets user1 as operator.
+- It has user2 also as a menu option.
+- The Auto Attendant is voice enabled.
+
 ## PARAMETERS
 
 ### -Name