Skip to content

Commit 03697b3

Browse files
KateyanneKateyanne
authored
Merge branch 'master' into master
2 parents 33ba979 + 048babb commit 03697b3

File tree

299 files changed

+3716
-2740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+3716
-2740
lines changed

‎.openpublishing.publish.config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,5 +253,8 @@
253253
"target_framework": "net45",
254254
"version": "latest"
255255
}
256-
]
256+
],
257+
"docs_build_engine": {
258+
"name": "docfx_v3"
259+
}
257260
}

‎.openpublishing.redirection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
{
164164
"source_path": "sharepoint/docs-conceptual/overview.md",
165165
"redirect_url": "https://docs.microsoft.com/powershell/sharepoint",
166-
"redirect_document_id": true
166+
"redirect_document_id": false
167167
},
168168
{
169169
"source_path": "exchange/virtual-folder/exchange/active-directory/Add-ADPermission.md",
@@ -6547,7 +6547,7 @@
65476547
},
65486548
{
65496549
"source_path": "exchange/docs-conceptual/exchange-server/use-update-exchangehelp.md",
6550-
"redirect_url": "https://docs.microsoft.com/powershell/exchange/use-update-exchangehelp.md",
6550+
"redirect_url": "https://docs.microsoft.com/powershell/exchange/use-update-exchangehelp",
65516551
"redirect_document_id": true
65526552
},
65536553
{

‎README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ This brief video also covers how to contribute:
3737

3838
In this example, we'll add a link to the **Related Links** section of a topic. To add the link, scroll down to the **Related Links** section and add the link in the correct format.
3939

40-
![Image of Edit button on Github](images/add_related_link.png)
41-
4240
**Notes**:
4341

4442
- Files in GitHub are written and edited using Markdown language. For help on using Markdown, see [Mastering Markdown](https://guides.github.com/features/mastering-markdown/).

‎exchange/docs-conceptual/app-only-auth-powershell-v2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ If you encounter problems, check the [required permssions](https://docs.microsof
105105

106106
- **Name**: Enter something descriptive.
107107

108-
- **Supported account types**: Select **Accounts in this organizational directory only (Microsoft)**.
108+
- **Supported account types**: Select **Accounts in this organizational directory only (\<YourOrganizationName\> only - Single tenant)**.
109109

110110
- **Redirect URI (optional)**: In the first box, select **Web**. In the second box, enter the URI where the access token is sent.
111111

@@ -133,11 +133,11 @@ You need to assign the API permission `Exchange.ManageAsApp` so the application
133133

134134
5. In the **Select permissions** section that appears on the page, expand **Exchange** and select **Exchange.ManageAsApp**
135135

136-
![Select Exchange API permssions](media/app-only-auth-exchange-manageasapp.png)
136+
![Select Exchange.ManageAsApp permssions](media/app-only-auth-exchange-manageasapp.png)
137137

138138
When you're finished, click **Add permissions**.
139139

140-
6. Back on the **Configured permissions** page that appears, click **Grant admin consent for <\tenant name\>**, and select **Yes** in the dialog that appears.
140+
6. Back on the **Configured permissions** page that appears, click **Grant admin consent for \<tenant name\>**, and select **Yes** in the dialog that appears.
141141

142142
7. Close the flyout when you're finished.
143143

‎exchange/docs-conceptual/basic-auth-connect-to-eop-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: eop
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid:
1212
ROBOTS: NOINDEX

‎exchange/docs-conceptual/basic-auth-connect-to-exo-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: exchange-online
9+
ms.service: exchange-powershell
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
1212
ms.custom:

‎exchange/docs-conceptual/basic-auth-connect-to-scc-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: o365-security-and-compliance
9+
ms.service: exchange-powershell
1010
localization_priority: Normal
1111
ms.assetid:
1212
ROBOTS: NOINDEX

‎exchange/docs-conceptual/cmdlet-property-sets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ manager: dansimp
66
ms.date:
77
ms.audience: Admin
88
ms.topic: article
9-
ms.service: exchange-online
9+
ms.service: exchange-powershell
1010
ms.reviewer: navgupta
1111
localization_priority: Priority
1212
ms.collection: Strat_EX_Admin

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ manager: dansimp
55
ms.date:
66
ms.audience: Admin
77
ms.topic: article
8-
ms.service: exchange-online
8+
ms.service: exchange-powershell
99
ms.reviewer: navgupta
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
@@ -44,8 +44,7 @@ If your account uses multi-factor authentication, use the steps in this section.
4444
Import-Module ExchangeOnlineManagement
4545
```
4646

47-
> [!NOTE]
48-
> If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written. If you haven't already installed the module, you can install and load the latest public version of the module in one step by running the command: `Import-Module -Name ExchangeOnlineManagement`.
47+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
4948

5049
2. The command that you need to run uses the following syntax:
5150

@@ -106,8 +105,7 @@ If your account doesn't use multi-factor authentication, use the steps in this s
106105
Import-Module ExchangeOnlineManagement
107106
```
108107

109-
> [!NOTE]
110-
> If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written. If you haven't already installed the module, you can install and load the latest public version of the module in one step by running the command: `Import-Module -Name ExchangeOnlineManagement`.
108+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
111109

112110
2. Run the following command:
113111

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ manager: dansimp
55
ms.date:
66
ms.audience: Admin
77
ms.topic: article
8-
ms.service: exchange-online
8+
ms.service: exchange-powershell
99
ms.reviewer: navgupta
1010
localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
@@ -44,8 +44,7 @@ If your account uses multi-factor authentication, use the steps in this section.
4444
Import-Module ExchangeOnlineManagement
4545
```
4646

47-
> [!NOTE]
48-
> If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written. If you haven't already installed the module, you can install and load the latest public version of the module in one step by running the command: `Import-Module -Name ExchangeOnlineManagement`.
47+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
4948

5049
2. The command that you need to run uses the following syntax:
5150

@@ -87,8 +86,7 @@ If your account doesn't use multi-factor authentication, use the steps in this s
8786
Import-Module ExchangeOnlineManagement
8887
```
8988

90-
> [!NOTE]
91-
> If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written. If you haven't already installed the module, you can install and load the latest public version of the module in one step by running the command: `Import-Module -Name ExchangeOnlineManagement`.
89+
**Note**: If you've already [installed the EXO V2 module](exchange-online-powershell-v2.md#install-and-maintain-the-exo-v2-module), the previous command will work as written.
9290

9391
2. Run the following command:
9492

0 commit comments

Comments
 (0)