Skip to content

Commit c1f8e1b

Browse files
authored
Merge branch 'master' into patch-2
2 parents 51e5454 + 37841fc commit c1f8e1b

File tree

6 files changed

+21
-24
lines changed

6 files changed

+21
-24
lines changed

exchange/docs-conceptual/connect-to-exchange-online-powershell.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@ If your account uses multi-factor authentication, use the steps in this section.
4949
2. The command that you need to run uses the following syntax:
5050

5151
```powershell
52-
Connect-ExchangeOnline -UserPrincipalName <UPN> -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>]
52+
Connect-ExchangeOnline -UserPrincipalName <UPN> -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>] [-PSSessionOption $ProxyOptions]
5353
```
5454

5555
- _\<UPN\>_ is your account in user principal name format (for example, `navin@contoso.com`).
5656
- When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
5757
- The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/partners).
58+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
5859

5960
**This example connects to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
6061

@@ -118,11 +119,12 @@ If your account doesn't use multi-factor authentication, use the steps in this s
118119
3. The command that you need to run uses the following syntax:
119120

120121
```powershell
121-
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>]
122+
Connect-ExchangeOnline -Credential $UserCredential -ShowProgress $true [-ExchangeEnvironmentName <Value>] [-DelegatedOrganization <String>] [-PSSessionOption $ProxyOptions]
122123
```
123124

124125
- When you use the _ExchangeEnvironmentName_ parameter, you don't need use the _ConnectionUri_ or _AzureADAuthorizationEndPointUrl_ parameters. For more information, see the parameter descriptions in [Connect-ExchangeOnline](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
125126
- The _DelegatedOrganization_ parameter specifies the customer organization that you want to manage as an authorized Microsoft Partner. For more information, see [Partners](https://docs.microsoft.com/office365/servicedescriptions/office-365-platform-service-description/partners).
127+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
126128

127129
**Connect to Exchange Online PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**:
128130

exchange/docs-conceptual/connect-to-exchange-online-protection-powershell.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,12 @@ If your account uses multi-factor authentication, use the steps in this section.
4949
2. The command that you need to run uses the following syntax:
5050

5151
```powershell
52-
Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>] [-AzureADAuthorizationEndPointUri <URL>]
52+
Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>] [-AzureADAuthorizationEndPointUri <URL>] [-PSSessionOption $ProxyOptions]
5353
```
5454

5555
- _\<UPN\>_ is your account in user principal name format (for example, `navin@contoso.com`).
5656
- The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
57+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
5758

5859
**This example connects to Exchange Online Protection PowerShell in a Microsoft 365 organization**:
5960

@@ -99,10 +100,11 @@ If your account doesn't use multi-factor authentication, use the steps in this s
99100
3. The command that you need to run uses the following syntax:
100101

101102
```powershell
102-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri <URL>
103+
Connect-IPPSSession -Credential $UserCredential -ConnectionUri <URL> [-PSSessionOption $ProxyOptions]
103104
```
104105

105-
The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
106+
- The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
107+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
106108

107109
**This example connects to Exchange Online Protection PowerShell in a Microsoft 365 organization**:
108110

exchange/docs-conceptual/connect-to-scc-powershell.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ If your account uses multi-factor authentication, use the steps in this section.
4444
2. The command that you need to run uses the following syntax:
4545

4646
```powershell
47-
Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>]
47+
Connect-IPPSSession -UserPrincipalName <UPN> [-ConnectionUri <URL>] [-PSSessionOption $ProxyOptions]
4848
```
4949

5050
- _\<UPN\>_ is your account in user principal name format (for example, `navin@contoso.com`).
5151
- The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
5252
- When you use the _UserPrincipalName_ parameter, you don't need to use the _AzureADAuthorizationEndpointUri_ parameter in environments that would otherwise require it.
53+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
5354

5455
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
5556

@@ -107,10 +108,11 @@ If your account doesn't use multi-factor authentication, use the steps in this s
107108
3. The command that you need to run uses the following syntax:
108109

109110
```powershell
110-
Connect-IPPSSession -Credential $UserCredential [-ConnectionUri <URL>] [-AzureADAuthorizationEndpointUri <URL>]
111+
Connect-IPPSSession -Credential $UserCredential [-ConnectionUri <URL>] [-AzureADAuthorizationEndpointUri <URL>] [-PSSessionOption $ProxyOptions]
111112
```
112113

113-
The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
114+
- The required _ConnectionUri_ and _AzureADAuthorizationEndPointUrl_ values depend on the nature of your Microsoft 365 organization. For more information, see the parameter descriptions in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
115+
- If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where \<Value\> is `IEConfig`, `WinHttpConfig`, or `AutoDetect`. Then, use the _PSSessionOption_ parameter with the value `$ProxyOptions`. For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
114116

115117
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
116118

exchange/exchange-ps/exchange/Connect-ExchangeOnline.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Connect-ExchangeOnline
2828
[[-ExchangeEnvironmentName] <ExchangeEnvironment>]
2929
[[-PSSessionOption] <PSSessionOption>]
3030
[[-DelegatedOrganization] <String>]
31-
[[-Prefix <String>]]
32-
[[-CommandName <String[]>]]
33-
[[-FormatTypeName <String[]>]]
31+
[[-Prefix] <String>]
32+
[[-CommandName] <String[]>]
33+
[[-FormatTypeName] <String[]>]
3434
[-AppId <String>]
3535
[-BypassMailboxAnchoring]
3636
[-Certificate <X509Certificate2>]

exchange/exchange-ps/exchange/Get-RecoverableItems.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Accept wildcard characters: False
142142
```
143143
144144
### -FilterEndTime
145-
The FilterEndTime specifies the end date/time of the date range.
145+
The FilterEndTime specifies the end date/time of the date range. This parameter uses the LastModifiedTime value of the item.
146146
147147
Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
148148
@@ -186,7 +186,7 @@ Accept wildcard characters: False
186186
```
187187
188188
### -FilterStartTime
189-
The FilterStartTime specifies the start date/time of the date range.
189+
The FilterStartTime specifies the start date/time of the date range. This parameter uses the LastModifiedTime value of the item.
190190
191191
Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
192192

exchange/exchange-ps/exchange/Restore-RecoverableItems.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,9 @@ Restore-RecoverableItems -Identity laura@contoso.com -FilterItemType IPM.Note -S
6767
After using the Get-RecoverableItems cmdlet to verify the existence of the item, this example restores the specified deleted item from the specified mailbox:
6868

6969
- Mailbox: laura@contoso.com
70-
7170
- Item type: Email message
72-
7371
- Message subject: FY18 Accounting
74-
7572
- Location: Recoverable Items\Deletions
76-
7773
- Date range: 2/1/2018 to 2/5/2018
7874

7975
### Example 2
@@ -103,15 +99,10 @@ Restore-RecoverableItems -Identity "malik@contoso.com","lillian@contoso.com" -Fi
10399
In Exchange Online, after using the Get-RecoverableItems cmdlet to verify the existence of the item, this example restores the specified deleted items in the specified mailboxes:
104100

105101
- Mailboxes: malik@contoso.com, lillian@contoso.com
106-
107102
- Item type: Email message
108-
109103
- Message subject: COGS FY17 Review
110-
111104
- Location: Recoverable Items\Deletions
112-
113105
- Date range: 3/15/2019 to 3/25/2019
114-
115106
- Number of mailboxes processed simultaneously: 2
116107

117108
### Example 4
@@ -193,7 +184,7 @@ Accept wildcard characters: False
193184
```
194185
195186
### -FilterEndTime
196-
The FilterEndTime specifies the end date/time of the date range.
187+
The FilterEndTime specifies the end date/time of the date range. This parameter uses the LastModifiedTime value of the item.
197188
198189
Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
199190
@@ -237,7 +228,7 @@ Accept wildcard characters: False
237228
```
238229
239230
### -FilterStartTime
240-
The FilterStartTime specifies the start date/time of the date range.
231+
The FilterStartTime specifies the start date/time of the date range. This parameter uses the LastModifiedTime value of the item.
241232
242233
Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".
243234

0 commit comments

Comments
 (0)