Merge branch 'master' into islubin-patch-9

islubin · web-flow · commit 36499fd4e3f7 · 2019-06-25T15:03:13.000-07:00
diff --git a/skype/skype-ps/skype/Grant-CsTeamsAppPermissionPolicy.md b/skype/skype-ps/skype/Grant-CsTeamsAppPermissionPolicy.md
@@ -9,6 +9,12 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
+As an admin, you can use app permission policies to enable or block specific apps for your users.  Learn more about the App Permission Policies: https://docs.microsoft.com/en-us/microsoftteams/teams-app-permission-policies.
+
+**We require that all creation and modification of app setup polices (not including the assignment or removal of policies from users) happens in the Microsoft Teams & Skype for Business Admin Center to ensure that the policy matches your expectations for the end user experience.**
+
+You can use this cmdlet to assign a specific custom policy to a user.
+
 ## SYNTAX
 
 ### Identity (Default)
@@ -24,16 +30,20 @@ Grant-CsTeamsAppPermissionPolicy [-PolicyName] <String> [-Tenant <System.Guid>]
 ```
 
 ## DESCRIPTION
-{{Fill in the Description}}
+As an admin, you can use app permission policies to enable or block specific apps for your users.  Learn more about the App Permission Policies: https://docs.microsoft.com/en-us/microsoftteams/teams-app-permission-policies.
+
+**We require that all creation and modification of app setup polices (not including the assignment or removal of policies from users) happens in the Microsoft Teams & Skype for Business Admin Center to ensure that the policy matches your expectations for the end user experience.**
+
+You can use this cmdlet to assign a specific custom policy to a user.
 
 ## EXAMPLES
 
 ### Example 1
 ```powershell
-PS C:\> {{ Add example code here }}
+PS C:\> Grant-CsTeamsAppPermissionPolicy -Identity "Ken Myer" -PolicyName StudentAppPermissionPolicy
 ```
 
-{{ Add example description here }}
+In this example, a user with identity "Ken Myer" is being assigned the StudentAppPermissionPolicy
 
 ## PARAMETERS
 
@@ -53,8 +63,7 @@ Accept wildcard characters: False
 ```
 
 ### -DomainController
-{{Fill DomainController Description}}
-
+Do not use.
 ```yaml
 Type: Fqdn
 Parameter Sets: (All)
@@ -68,7 +77,7 @@ Accept wildcard characters: False
 ```
 
 ### -Global
-{{Fill Global Description}}
+Resets the values in the global policy to match those in the provided (PolicyName) policy.  Note that this means all users with no explicit policy assigned will have these new policy settings.
 
 ```yaml
 Type: SwitchParameter
@@ -83,7 +92,7 @@ Accept wildcard characters: False
 ```
 
 ### -Identity
-{{Fill Identity Description}}
+The user to whom the policy should be assigned.
 
 ```yaml
 Type: UserIdParameter
@@ -98,7 +107,6 @@ Accept wildcard characters: False
 ```
 
 ### -PassThru
-{{Fill PassThru Description}}
 
 ```yaml
 Type: SwitchParameter
@@ -113,7 +121,7 @@ Accept wildcard characters: False
 ```
 
 ### -PolicyName
-{{Fill PolicyName Description}}
+The name of the custom policy that is being assigned to the user.  To remove a specific assignment and fall back to the default tenant policy, you can assign to $Null.
 
 ```yaml
 Type: String
@@ -128,7 +136,7 @@ Accept wildcard characters: False
 ```
 
 ### -Tenant
-{{Fill Tenant Description}}
+Do not use.
 
 ```yaml
 Type: System.Guid
diff --git a/skype/skype-ps/skype/New-CsTeamsAppPermissionPolicy.md b/skype/skype-ps/skype/New-CsTeamsAppPermissionPolicy.md
@@ -9,19 +9,21 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
+As an admin, you can use app permission policies to enable or block specific apps for your users.  Learn more about the App Setup Policies: https://docs.microsoft.com/en-us/microsoftteams/teams-app-permission-policies.
+
+The existence of this cmdlet is being documented for completeness, but do not use this cmdlet.  **We require that all creation and modification of app permission polices (not including the assignment or removal of policies from users) happens in the Microsoft Teams & Skype for Business Admin Center to ensure that the policy matches your expectations for the end user experience.**
+
 ## SYNTAX
 
 ## DESCRIPTION
-{{Fill in the Description}}
+As an admin, you can use app permission policies to enable or block specific apps for your users.  Learn more about the App Setup Policies: https://docs.microsoft.com/en-us/microsoftteams/teams-app-permission-policies.
+
+The existence of this cmdlet is being documented for completeness, but do not use this cmdlet.  **We require that all creation and modification of app permission polices (not including the assignment or removal of policies from users) happens in the Microsoft Teams & Skype for Business Admin Center to ensure that the policy matches your expectations for the end user experience.**
 
 ## EXAMPLES
 
 ### Example 1
-```powershell
-PS C:\> {{ Add example code here }}
-```
-
-{{ Add example description here }}
+Intentionally omitted.
 
 ## PARAMETERS
 
diff --git a/skype/skype-ps/skype/Remove-CsTeamsAppPermissionPolicy.md b/skype/skype-ps/skype/Remove-CsTeamsAppPermissionPolicy.md
@@ -9,25 +9,123 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
+As an admin, you can use app permission policies to enable or block specific apps for your users.  Learn more about the App Permission Policies: https://docs.microsoft.com/en-us/microsoftteams/teams-app-permission-policies.
+
+**We require that all creation and modification of app permission polices (not including the assignment or removal of policies from users) happens in the Microsoft Teams & Skype for Business Admin Center to ensure that the policy matches your expectations for the end user experience.**
+
+This cmdlet allows you to remove app permission policies that have been created within your organization.  If you run Remove-CsTeamsAppPermissionPolicy on the Global policy, it will be reset to the defaults provided for new organizations.
+
 ## SYNTAX
 
+```
+Remove-CsTeamsAppSetupPolicy [-Tenant <Guid>] [-Identity] <XdsIdentity> [-Force] [-WhatIf] [-Confirm]
+ [<CommonParameters>]
+```
+
 ## DESCRIPTION
-{{Fill in the Description}}
+As an admin, you can use app permission policies to enable or block specific apps for your users.  Learn more about the App Permission Policies: https://docs.microsoft.com/en-us/microsoftteams/teams-app-permission-policies.
+
+**We require that all creation and modification of app permission polices (not including the assignment or removal of policies from users) happens in the Microsoft Teams & Skype for Business Admin Center to ensure that the policy matches your expectations for the end user experience.**
+
+This cmdlet allows you to remove app permission policies that have been created within your organization.  If you run Remove-CsTeamsAppPermissionPolicy on the Global policy, it will be reset to the defaults provided for new organizations.
 
 ## EXAMPLES
 
 ### Example 1
 ```powershell
-PS C:\> {{ Add example code here }}
+PS C:\> Remove-CsTeamsAppPermissionPolicy -Identity SalesPolicy
 ```
 
-{{ Add example description here }}
+Deletes a custom policy that has already been created in the organization.
 
 ## PARAMETERS
 
+### -Identity
+Unique identifier for the policy to be removed.
+To "remove" the global policy, use the following syntax: `-Identity global`.
+(Note that the global policy cannot actually be removed.  Instead, all the properties in that policy will be reset to their default values.) To remove a per-user policy, use syntax similar to this: `-Identity "SalesDepartmentPolicy"`.
+You cannot use wildcards when specifying a policy Identity.
+
+```yaml
+Type: XdsIdentity
+Parameter Sets: (All)
+Aliases: 
+Applicable: Skype for Business Online
+
+Required: True
+Position: 2
+Default value: None
+Accept pipeline input: True (ByPropertyName)
+Accept wildcard characters: False
+```
+
+### -Force
+Suppresses all non-fatal errors.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: 
+Applicable: Skype for Business Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -WhatIf
+Describes what would happen if you executed the command without actually executing the command.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: wi
+Applicable: Skype for Business Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Confirm
+Prompts you for confirmation before executing the command.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases: cf
+Applicable: Skype for Business Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Tenant
+Internal Microsoft use only.
+
+```yaml
+Type: Guid
+Parameter Sets: (All)
+Aliases: 
+Applicable: Skype for Business Online
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable.
-For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+For more information, see about_CommonParameters (https://go.microsoft.com/fwlink/?LinkID=113216).
 
 ## INPUTS
 
diff --git a/skype/skype-ps/skype/Set-CsUser.md b/skype/skype-ps/skype/Set-CsUser.md
@@ -59,6 +59,13 @@ In Example 2, all the users in the Finance department have their accounts enable
 In this command, the `Get-CsUser` cmdlet and the LdapFilter parameter are first used to return a collection of all the users who work in the Finance department.
 That information is then piped to the `Set-CsUser` cmdlet, which enables Enterprise Voice for each account in the collection.
 
+### -------------------------- Example 3 --------------------------
+```
+Set-CsUser -Identity "Pilar Ackerman" –LineUri "tel:+123456789"
+```
+
+In Example 3, the `Set-CsUser` cmdlet is used to modify the user account with the Identity Pilar Ackerman.
+In this case, the account is modified to set the phone number assigned to the user settings its LineUri property.
 
 ## PARAMETERS
 
