Skip to content

Commit 11d9347

Browse files
authored
Merge branch 'master' into patch-212
2 parents 891bba5 + 48fd7f2 commit 11d9347

File tree

6 files changed

+15
-76
lines changed

6 files changed

+15
-76
lines changed

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

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ To use the older, less secure remote PowerShell connection instructions that [wi
2525

2626
To use the older Exchange Online Remote PowerShell Module to connect to Security & Compliance Center PowerShell using MFA, see [V1 module - Connect to Security & Compliance Center PowerShell using MFA](v1-module-mfa-connect-to-scc-powershell.md). Note that this older version of the module will eventually be retired.
2727

28+
> [!NOTE]
29+
> Currently, you can't use the EXO V2 module to connect to Security & Compliance Center PowerShell in GCC High or DoD environments. Instead, use the older instructions at [Basic auth - Connect to Security & Compliance Center PowerShell](basic-auth-connect-to-scc-powershell.md) or [V1 module - Connect to Security & Compliance Center PowerShell using MFA](v1-module-mfa-connect-to-scc-powershell.md).
30+
2831
## What do you need to know before you begin?
2932

3033
- The requirements for installing and using the EXO V2 module are described in [Install and maintain the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module).
@@ -60,18 +63,6 @@ If you account uses multi-factor authentication, use the steps in this section.
6063
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.outlook.de/PowerShell-LiveID -AzureADAuthorizationEndPointUri https://login.microsoftonline.de/common
6164
```
6265

63-
**This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
64-
65-
```powershell
66-
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
67-
```
68-
69-
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
70-
71-
```powershell
72-
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
73-
```
74-
7566
For detailed syntax and parameter information, see [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
7667

7768
> [!NOTE]
@@ -119,18 +110,6 @@ If your account doesn't use multi-factor authentication, use the steps in this s
119110
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.outlook.de/
120111
```
121112

122-
**This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
123-
124-
```powershell
125-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
126-
```
127-
128-
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
129-
130-
```powershell
131-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
132-
```
133-
134113
For detailed syntax and parameter information, see [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-exchangeonline).
135114

136115
> [!NOTE]

exchange/exchange-ps/exchange/Connect-IPPSSession.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ The AzureADAuthorizationEndpointUri parameter specifies the Azure AD Authorizati
6868

6969
- For Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC, don't use this parameter.
7070
- For Security & Compliance Center PowerShell in Office 365 Germany, use the value <https://login.microsoftonline.de/common> for this parameter.
71-
- For Security & Compliance Center PowerShell in Microsoft 365 GCC High and Microsoft 365 DoD, use the value <https://login.microsoftonline.us/common> for this parameter.
7271

7372
```yaml
7473
Type: String
@@ -103,8 +102,6 @@ The ConnectionUri parameter specifies the connection endpoint for the remote Pow
103102
104103
- For Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC, don't use this parameter.
105104
- For Security & Compliance Center PowerShell in Office 365 Germany, use the value <https://ps.compliance.protection.outlook.de/PowerShell-LiveID> for this parameter.
106-
- For Security & Compliance Center PowerShell in Microsoft 365 GCC High, use the value <https://ps.compliance.protection.office365.us/powershell-liveid/> for this parameter.
107-
- For Security & Compliance Center PowerShell in Microsoft 365 DoD, use the value <https://l5.ps.compliance.protection.office365.us/powershell-liveid/> for this parameter.
108105
- For Exchange Online Protection PowerShell in standalone EOP organizations without Exchange Online mailboxes, use the value <https://ps.protection.outlook.com/powershell-liveid/> for this parameter.
109106
110107
```yaml

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOSite.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ Get-SPOSite -Identity https://contoso.sharepoint.com/sites/research | Select Inf
109109

110110
This example returns the InformationSegments associated to the site.
111111

112+
### -----------------------EXAMPLE 7-----------------------------
113+
114+
```powershell
115+
Get-SPOSite -Filter { Url -like "contoso.sharepoint.com/sites/18" }
116+
```
117+
118+
This example uses server side filtering to return sites matching 18.
119+
112120
## PARAMETERS
113121

114122
### -Detailed
@@ -170,7 +178,7 @@ Accept wildcard characters: False
170178
171179
### -Filter
172180
173-
Specifies the script block of the server-side filter to apply. The type must be a valid filter name and value must be in the form `{$_PropertyName <operator> "filterValue"}`. Valid operators are as follows: eq, ne, like, notlike.
181+
Specifies the script block of the server-side filter to apply. The type must be a valid filter name and value must be in the form `{ PropertyName <operator> "filterValue"}`. Valid operators are as follows: -eq, -ne, -like, -notlike.
174182
Currently, you can filter by these properties: Owner, Template, LockState, Url.
175183

176184
> [!NOTE]

sharepoint/sharepoint-ps/sharepoint-server/Mount-SPContentDatabase.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ms.reviewer:
1616

1717
Attaches an existing content database to the farm.
1818

19+
NOTE: Please be aware that if a content database that does not exists is specified, it will be created by this cmdlet.
1920

2021

2122
## SYNTAX
@@ -32,6 +33,7 @@ Mount-SPContentDatabase [-Name] <String> [-WebApplication] <SPWebApplicationPipe
3233
## DESCRIPTION
3334
The Mount-SPContentDatabase cmdlet attaches an existing content database to the farm.
3435
If the database being mounted requires an upgrade, this cmdlet will cause the database to be upgraded.
36+
NOTE: Please be aware that if a content database that does not exists is specified, it will be created by this cmdlet.
3537

3638
The default behavior of this cmdlet causes an upgrade of the schema of the database and initiates upgraded builds for all site collections within the specified content database if required.
3739
To prevent initiation of upgraded builds of site collections, use the NoB2BSiteUpgrade parameter.
@@ -401,4 +403,3 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
401403
## NOTES
402404

403405
## RELATED LINKS
404-

skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Grant-CsTeamsUpgradePolicy [-Identity] <UserIdParameter>] [-PolicyName] <string>
2222
```
2323

2424
## DESCRIPTION
25-
TeamsUpgradePolicy allows administrators to manage the transition from Skype for Business to Teams. As an organization with Skype for Business starts to adopt Teams, administrators can manage the user experience in their organization using the concept of coexistence "mode". Mode defines in which client incoming chats and calls land as well as in what service (Teams or Skype for Business) new meetings are scheduled in. Mode also governs what functionality is avaiable in the Teams client. Finally, prior to upgrading to TeamsOnly mode administrators can use TeamsUpgradePolicy to trigger notifications in the Skype for Business client to inform users of the pending upgrade.
25+
TeamsUpgradePolicy allows administrators to manage the transition from Skype for Business to Teams. As an organization with Skype for Business starts to adopt Teams, administrators can manage the user experience in their organization using the concept of coexistence "mode". Mode defines in which client incoming chats and calls land as well as in what service (Teams or Skype for Business) new meetings are scheduled in. Mode also governs what functionality is available in the Teams client. Finally, prior to upgrading to TeamsOnly mode administrators can use TeamsUpgradePolicy to trigger notifications in the Skype for Business client to inform users of the pending upgrade.
2626

2727
This cmdlet enables admins to apply TeamsUpgradePolicy to either individual users or to set the default for the entire organization.
2828

teams/teams-ps/teams/Get-TeamHelp.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)