Skip to content

Commit 10e3818

Browse files
committed
Merge branch 'master' into chrisda
2 parents 2562828 + 4253895 commit 10e3818

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

exchange/exchange-ps/exchange/mail-flow/Get-MessageTrace.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ The Status parameter filters the results by the delivery status of the message.
236236
237237
- None: The message has no delivery status because it was rejected or redirected to a different recipient.
238238
239+
- GettingStatus: The message is waiting for status update.
240+
239241
- Failed: Message delivery was attempted and it failed or the message was filtered as spam or malware, or by transport rules.
240242
241243
- Pending: Message delivery is underway or was deferred and is being retried.
@@ -244,6 +246,10 @@ The Status parameter filters the results by the delivery status of the message.
244246
245247
- Expanded: There was no message delivery because the message was addressed to a distribution group and the membership of the distribution was expanded.
246248
249+
- Quarantined: The message was quarantined.
250+
251+
- FilteredAsSpam: The message was marked as spam.
252+
247253
```yaml
248254
Type: MultiValuedProperty
249255
Parameter Sets: (All)

sharepoint/docs-conceptual/sharepoint-pnp/sharepoint-pnp-cmdlets.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SharePoint Patterns and Practices (PnP) contains a library of PowerShell command
88

99
![SharePoint Patterns and Practices](https://devofficecdn.azureedge.net/media/Default/PnP/sppnp.png)
1010

11-
_**Applies to:** SharePoint Online, SharePoint 2016, SharePoint 2013_
11+
_**Applies to:** SharePoint Online, SharePoint 2019, SharePoint 2016, SharePoint 2013_
1212

1313
## Installation
1414

@@ -21,6 +21,7 @@ If you main OS is Windows 10, or if you have [PowerShellGet](https://github.com/
2121
|**SharePoint Version**|**Command to install**|
2222
|------------------|------------------|
2323
|SharePoint Online|`Install-Module SharePointPnPPowerShellOnline `|
24+
|SharePoint 2019|`Install-Module SharePointPnPPowerShell2019`|
2425
|SharePoint 2016|`Install-Module SharePointPnPPowerShell2016`|
2526
|SharePoint 2013|`Install-Module SharePointPnPPowerShell2013`|
2627

@@ -29,7 +30,7 @@ If you main OS is Windows 10, or if you have [PowerShellGet](https://github.com/
2930
3031
### Setup files
3132

32-
You can download setup files from the [releases](https://github.com/sharepoint/pnp-powershell/releases) section of the PnP PowerShell repository. These files will up be updated on a monthly basis. Run the install and restart any open instances of PowerShell to use the cmdlets.
33+
You can download setup files from the [releases](https://github.com/pnp/pnp-powershell/releases) section of the PnP PowerShell repository. These files will up be updated on a monthly basis. Run the install and restart any open instances of PowerShell to use the cmdlets.
3334

3435
### Installation script
3536

@@ -38,12 +39,12 @@ This is an alternative for installation on machines that have at least PowerShel
3839
To install the cmdlets you can run the below command which will install PowerShell Package Management and then install the PowerShell Modules from the PowerShell Gallery.
3940

4041
```powershell
41-
Invoke-Expression (New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/sharepoint/PnP-PowerShell/master/Samples/Modules.Install/Install-SharePointPnPPowerShell.ps1')
42+
Invoke-Expression (New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/pnp/PnP-PowerShell/master/Samples/Modules.Install/Install-SharePointPnPPowerShell.ps1')
4243
```
4344

4445
## Updating
4546

46-
Every month a new release will be made available of the PnP PowerShell Cmdlets. If you earlier installed the cmdlets using the setup file, simply download the [latest version](https://github.com/SharePoint/PnP-PowerShell/releases/latest) and run the setup. This will update your existing installation.
47+
Every month a new release will be made available of the PnP PowerShell Cmdlets. If you earlier installed the cmdlets using the setup file, simply download the [latest version](https://github.com/pnp/PnP-PowerShell/releases/latest) and run the setup. This will update your existing installation.
4748

4849
If you have installed the cmdlets using PowerShellGet with `Install-Module` from the PowerShell Gallery then you will be able to use the following command to install the latest updated version:
4950

@@ -87,7 +88,7 @@ At the following links you will find a few videos on how to get started with the
8788

8889
### Setting up credentials
8990

90-
See this [wiki page](https://github.com/SharePoint/PnP-PowerShell/wiki/How-to-use-the-Windows-Credential-Manager-to-ease-authentication-with-PnP-PowerShell) for more information on how to use the Windows Credential Manager to setup credentials that you can use in unattended scripts
91+
See this [wiki page](https://github.com/pnp/PnP-PowerShell/wiki/How-to-use-the-Windows-Credential-Manager-to-ease-authentication-with-PnP-PowerShell) for more information on how to use the Windows Credential Manager to setup credentials that you can use in unattended scripts
9192

9293
## Cmdlet overview
9394

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $scheduleId = $schedule.Id
7474
7575
$menuPrompt = New-CsAutoAttendantPrompt -TextToSpeechPrompt "We are closed for Christmas. Please call back later."
7676
$menuOption = New-CsAutoAttendantMenuOption -DtmfResponse Automatic -Action DisconnectCall
77-
$menu = New-CsAutoAttendantMenu -Name "Christmas Menu" -MenuOptions @($menuOption)
77+
$menu = New-CsAutoAttendantMenu -Name "Christmas Menu" -Prompts @($menuPrompt) -MenuOptions @($menuOption)
7878
$callFlow = New-CsAutoAttendantCallFlow -Name "Christmas" -Greetings @($greeting) -Menu $menu
7979
$callFlowId = $callFlow.Id
8080

skype/skype-ps/skype/New-CsTeamsTranslationRule.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This example creates a rule that adds +1 to any ten digits number. For example,
3535

3636
### Example 2
3737
```powershell
38-
PS C:\> New-CsTeamsTranslationRule -Identity 'StripPlus1' -Pattern '^+1(\d{10})$' -Translation '$1'
38+
PS C:\> New-CsTeamsTranslationRule -Identity 'StripPlus1' -Pattern '^\+1(\d{10})$' -Translation '$1'
3939
```
4040

4141
This example creates a rule that strips +1 from any E.164 eleven digits number. For example, +12065555555 will be translated to 206555555
@@ -56,7 +56,7 @@ This example creates a rule that adds 425555 to any four digits number (converts
5656

5757
### Example 5
5858
```powershell
59-
PS C:\> New-CsTeamsTranslationRule -Identity 'StripE164SeattleAreaCode' -Pattern '^+1206555(\d{4})$' -Translation '$1'
59+
PS C:\> New-CsTeamsTranslationRule -Identity 'StripE164SeattleAreaCode' -Pattern '^\+1206555(\d{4})$' -Translation '$1'
6060
```
6161

6262
This example creates a rule that strips +1206555 from any E.164 ten digits number. For example, +12065555555 will be translated to 5555

skype/skype-ps/skype/New-CsTenantTrustedIPAddress.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ The command shown in Example 1 created the IP address '192.168.0.1' with no desc
4343

4444
###-------------------------- Example 2 --------------------------
4545
```powershell
46-
PS C:\> New-CsTenantTrustedIPAddress -IPAddress "192.168.0.2" -MaskBits "24"
46+
PS C:\> New-CsTenantTrustedIPAddress -IPAddress "192.168.2.0" -MaskBits "24"
4747
```
4848

49-
The command shown in Example 2 created the IP address '192.168.0.2' with no description. The IP address is in IPv4 format, and the maskbits is set to 24.
49+
The command shown in Example 2 created the IP address '192.168.2.0' with no description. The IP address is in IPv4 format, and the maskbits is set to 24.
5050

5151
IPv4 format IP address accepts maskbits from 0 to 32 inclusive.
5252

0 commit comments

Comments
 (0)