Skip to content

Commit 4569b60

Browse files
authored
Merge branch 'master' into patch-38
2 parents 5eba3ae + 5194bb0 commit 4569b60

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

sharepoint/docs-conceptual/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Find out how to manage SharePoint Server and SharePoint Online using PowerShell
119119
<h3>SharePoint Online</h3>
120120
<p><a href="/powershell/sharepoint/sharepoint-online/connect-sharepoint-online?view=sharepoint-ps">Connect to SharePoint Online</a></p>
121121
<p><a href="/powershell/sharepoint/sharepoint-online/introduction-sharepoint-online-management-shell?view=share">Introduction to the SharePoint Online Management Shell</a></p>
122-
<p><a href="https://technet.microsoft.com/%3Cspan%20class="x x-first x-last">en-us/library/fp161362(v=office.16).aspx">Office 365 PowerShell for SharePoint Online</a></p>
122+
<p><a href="https://technet.microsoft.com/library/fp161362(v=office.16).aspx">Office 365 PowerShell for SharePoint Online</a></p>
123123
</div>
124124
</div>
125125
</div>

sharepoint/docs-conceptual/overview.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For a list of the SharePoint PnP cmdlets, see [SharePoint PnP cmdlets](sharepoin
2121
Verify that you have the following administrative permissions:
2222

2323
* You must be assigned SharePoint administrator role.
24-
 For more information, see [Default administrative roles and user groups](https://support.office.com/en-us/article/Default-SharePoint-Groups-13BB2B6B-DD8C-447E-B71B-0E4BB9EFE1D3?ui=en-US&rs=en-US&ad=US) and [About the SharePoint admin role in Microsoft 365](https://docs.microsoft.com/sharepoint/sharepoint-admin-role).
24+
 For more information, see [Default administrative roles and user groups](https://support.office.com/article/Default-SharePoint-Groups-13BB2B6B-DD8C-447E-B71B-0E4BB9EFE1D3?ui=en-US&rs=en-US&ad=US) and [About the SharePoint admin role in Microsoft 365](https://docs.microsoft.com/sharepoint/sharepoint-admin-role).
2525

2626
**IMPORTANT:** You can use a specific group of PowerShell with SharePoint Online. For more information, see [Office 365 PowerShell for SharePoint Online](https://technet.microsoft.com/library/fp161362(v=office.16).aspx).
2727

@@ -35,18 +35,18 @@ The TechNet Scripting Center includes many resources to help you learn the basic
3535

3636
|**Page**|**Description**|
3737
|------------------|------------------|
38-
|[Windows PowerShell Documentation on TechNet](https://docs.microsoft.com/en-us/powershell/scripting/powershell-scripting?view=powershell-5.1)|This section of the TechNet Library contains web copies of the core PowerShell Get-Help topics. The section also has web copies of the PowerShell Getting Started document, the PowerShell.exe help, and a PowerShell primer.|
39-
|[Scripting With Windows PowerShell](https://technet.microsoft.com/en-us/scriptcenter/dd742419.aspx)| The home page for PowerShell scripting learning resources.|
40-
|[Windows PowerShell Owner's Manual](https://technet.microsoft.com/en-us/library/ee221100.aspx)|Web-based guide for getting started with PowerShell.|
41-
|[Windows PowerShell Quick Reference](https://www.microsoft.com/en-us/download/details.aspx?id=30002)|Downloadable copy of the Quick Reference document that is installed with PowerShell.|
38+
|[Windows PowerShell Documentation on TechNet](https://docs.microsoft.com/powershell/scripting/powershell-scripting?view=powershell-5.1)|This section of the TechNet Library contains web copies of the core PowerShell Get-Help topics. The section also has web copies of the PowerShell Getting Started document, the PowerShell.exe help, and a PowerShell primer.|
39+
|[Scripting With Windows PowerShell](https://technet.microsoft.com/scriptcenter/dd742419.aspx)| The home page for PowerShell scripting learning resources.|
40+
|[Windows PowerShell Owner's Manual](https://technet.microsoft.com/library/ee221100.aspx)|Web-based guide for getting started with PowerShell.|
41+
|[Windows PowerShell Quick Reference](https://www.microsoft.com/download/details.aspx?id=30002)|Downloadable copy of the Quick Reference document that is installed with PowerShell.|
4242

4343
As you read these resources, consider that the following concepts and cmdlets are useful ones to learn before you use PowerShell for SharePoint Server:
4444

4545
* [Get-Command](https://go.microsoft.com/fwlink/p/?LinkId=171069)
4646
* [Get-Member](https://go.microsoft.com/fwlink/p/?LinkId=171070)
4747
* [Get-Help](https://go.microsoft.com/fwlink/p/?LinkId=171068)
4848
* [Aliasing](https://go.microsoft.com/fwlink/p/?LinkId=113207)
49-
* [Piping and the Pipeline in Windows PowerShell](https://technet.microsoft.com/en-us/library/ee176927.aspx)
49+
* [Piping and the Pipeline in Windows PowerShell](https://technet.microsoft.com/library/ee176927.aspx)
5050
* [Cmdlet Parameter Sets](https://msdn.microsoft.com/library/dd878348(VS.85).aspx)
51-
* [Foreach-Object](https://technet.microsoft.com/en-us/library/ee176828.aspx)
52-
* [Where-Object](https://technet.microsoft.com/en-us/library/ee177028.aspx)
51+
* [Foreach-Object](https://technet.microsoft.com/library/ee176828.aspx)
52+
* [Where-Object](https://technet.microsoft.com/library/ee177028.aspx)

skype/skype-ps/skype/New-CsTenantDialPlan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Accept wildcard characters: False
202202
The SimpleName parameter is a display name for the tenant dial plan.
203203
This name must be unique among all tenant dial plans within the Skype for Business Server deployment.
204204

205-
This string can be up to 256 characters long.
205+
This string can be up to 49 characters long.
206206
Valid characters are alphabetic or numeric characters, hyphen (-), dot (.) and parentheses (()).
207207

208208
This parameter must contain a value.

skype/skype-ps/skype/Set-CsTeamsMeetingPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ Aliases:
499499

500500
Required: False
501501
Position: Named
502-
Default value: DisabledUserOveride
502+
Default value: DisabledUserOverride
503503
Accept pipeline input: False
504504
Accept wildcard characters: False
505505
```

skype/skype-ps/skype/Test-CsEffectiveTenantDialPlan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.reviewer:
1212
# Test-CsEffectiveTenantDialPlan
1313

1414
## SYNOPSIS
15-
Use the `Test-CsEffectiveTenantDialPlan` cmdlet to test a tenant dial plan.
15+
Use the Test-CsEffectiveTenantDialPlan cmdlet to test a tenant dial plan.
1616

1717
## SYNTAX
1818

@@ -151,7 +151,7 @@ Accept wildcard characters: False
151151
```
152152
153153
### -TenantScopeOnly
154-
{{Fill TenantScopeOnly Description}}
154+
Runs the test only against Tenant-level dial plans (does not take into account Service Level Dial Plans).
155155
156156
```yaml
157157
Type: SwitchParameter

0 commit comments

Comments
 (0)