Skip to content

Commit bb6110a

Browse files
chrisdachrisda
committed
Merge branch 'main' into SafeAttach-chrisda
2 parents a4b9862 + 1a11232 commit bb6110a

File tree

946 files changed

+10236
-9685
lines changed

Some content is hidden

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

946 files changed

+10236
-9685
lines changed

‎.openpublishing.publish.config.json

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
"build_entry_point": "docs",
4646
"template_folder": "_themes",
4747
"version": 0,
48-
"customized_tasks": {
49-
"docset_prebuild": [
50-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
51-
]
52-
},
5348
"monikerPath": [
5449
"mapping/monikerMapping.json"
5550
]
@@ -71,15 +66,7 @@
7166
},
7267
"build_entry_point": "docs",
7368
"template_folder": "_themes",
74-
"version": 0,
75-
"customized_tasks": {
76-
"docset_prebuild": [
77-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
78-
]
79-
},
80-
"monikerPath": [
81-
"mapping/monikerMapping.json"
82-
]
69+
"version": 0
8370
},
8471
{
8572
"docset_name": "skype-ps",
@@ -125,15 +112,7 @@
125112
},
126113
"build_entry_point": "docs",
127114
"template_folder": "_themes",
128-
"version": 0,
129-
"customized_tasks": {
130-
"docset_prebuild": [
131-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
132-
]
133-
},
134-
"monikerPath": [
135-
"mapping/monikerMapping.json"
136-
]
115+
"version": 0
137116
},
138117
{
139118
"docset_name": "teams-ps",
@@ -179,15 +158,7 @@
179158
},
180159
"build_entry_point": "docs",
181160
"template_folder": "_themes",
182-
"version": 0,
183-
"customized_tasks": {
184-
"docset_prebuild": [
185-
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
186-
]
187-
},
188-
"monikerPath": [
189-
"mapping/monikerMapping.json"
190-
]
161+
"version": 0
191162
},
192163
{
193164
"docset_name": "whiteboard-ps",
@@ -220,7 +191,7 @@
220191
"notification_subscribers": [],
221192
"sync_notification_subscribers": [],
222193
"branches_to_filter": [],
223-
"git_repository_branch_open_to_public_contributors": "master",
194+
"git_repository_branch_open_to_public_contributors": "main",
224195
"skip_source_output_uploading": false,
225196
"need_preview_pull_request": true,
226197
"enable_incremental_build": false,
@@ -229,7 +200,7 @@
229200
{
230201
"path_to_root": "_themes",
231202
"url": "https://github.com/Microsoft/templates.docs.msft",
232-
"branch": "master",
203+
"branch": "main",
233204
"branch_mapping": {}
234205
}
235206
],

‎.openpublishing.redirection.json

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6674,6 +6674,111 @@
66746674
"source_path": "exchange/virtual-folder/exchange/Import-ContactList.md",
66756675
"redirect_url": "https://support.microsoft.com/office/import-contacts-to-outlook-bb796340-b58a-46c1-90c7-b549b8f3c5f8",
66766676
"redirect_document_id": false
6677+
},
6678+
{
6679+
"source_path": "staffhub/docs-conceptual/index.md",
6680+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6681+
"redirect_document_id": false
6682+
},
6683+
{
6684+
"source_path": "staffhub/docs-conceptual/intro.md",
6685+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6686+
"redirect_document_id": false
6687+
},
6688+
{
6689+
"source_path": "staffhub/docs-conceptual/overview.md",
6690+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6691+
"redirect_document_id": false
6692+
},
6693+
{
6694+
"source_path": "staffhub/staffhub-ps/staffhub/Add-StaffHubMember.md",
6695+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6696+
"redirect_document_id": false
6697+
},
6698+
{
6699+
"source_path": "staffhub/staffhub-ps/staffhub/Add-StaffHubShift.md",
6700+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6701+
"redirect_document_id": false
6702+
},
6703+
{
6704+
"source_path": "staffhub/staffhub-ps/staffhub/Add-StaffHubTeam.md",
6705+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6706+
"redirect_document_id": false
6707+
},
6708+
{
6709+
"source_path": "staffhub/staffhub-ps/staffhub/Connect-StaffHub.md",
6710+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6711+
"redirect_document_id": false
6712+
},
6713+
{
6714+
"source_path": "staffhub/staffhub-ps/staffhub/Get-StaffHubMember.md",
6715+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6716+
"redirect_document_id": false
6717+
},
6718+
{
6719+
"source_path": "staffhub/staffhub-ps/staffhub/Get-StaffHubShifts.md",
6720+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6721+
"redirect_document_id": false
6722+
},
6723+
{
6724+
"source_path": "staffhub/staffhub-ps/staffhub/Get-StaffHubTeamsForTenant.md",
6725+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6726+
"redirect_document_id": false
6727+
},
6728+
{
6729+
"source_path": "staffhub/staffhub-ps/staffhub/Get-StaffHubUsersForTenant.md",
6730+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6731+
"redirect_document_id": false
6732+
},
6733+
{
6734+
"source_path": "staffhub/staffhub-ps/staffhub/Import-StaffHubMember.md",
6735+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6736+
"redirect_document_id": false
6737+
},
6738+
{
6739+
"source_path": "staffhub/staffhub-ps/staffhub/Import-StaffHubShift.md",
6740+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6741+
"redirect_document_id": false
6742+
},
6743+
{
6744+
"source_path": "staffhub/staffhub-ps/staffhub/Import-StaffHubTeam.md",
6745+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6746+
"redirect_document_id": false
6747+
},
6748+
{
6749+
"source_path": "staffhub/staffhub-ps/staffhub/Remove-StaffHubMember.md",
6750+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6751+
"redirect_document_id": false
6752+
},
6753+
{
6754+
"source_path": "staffhub/staffhub-ps/staffhub/Remove-StaffHubUser.md",
6755+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6756+
"redirect_document_id": false
6757+
},
6758+
{
6759+
"source_path": "staffhub/staffhub-ps/staffhub/staffhub.md",
6760+
"redirect_url": "/microsoftteams/expand-teams-across-your-org/shifts-for-teams-landing-page",
6761+
"redirect_document_id": false
6762+
},
6763+
{
6764+
"source_path": "exchange/virtual-folder/exchange/Get-RMSTrustedPublishingDomain.md",
6765+
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/#encryption-and-certificates",
6766+
"redirect_document_id": false
6767+
},
6768+
{
6769+
"source_path": "exchange/virtual-folder/exchange/Import-RMSTrustedPublishingDomain.md",
6770+
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/#encryption-and-certificates",
6771+
"redirect_document_id": false
6772+
},
6773+
{
6774+
"source_path": "exchange/virtual-folder/exchange/Remove-RMSTrustedPublishingDomain.md",
6775+
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/#encryption-and-certificates",
6776+
"redirect_document_id": false
6777+
},
6778+
{
6779+
"source_path": "exchange/virtual-folder/exchange/Set-RMSTrustedPublishingDomain.md",
6780+
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/#encryption-and-certificates",
6781+
"redirect_document_id": false
66776782
}
66786783
]
66796784
}

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
**Short URL: aka.ms/office-powershell**
2-
31
# Overview
42

3+
**Short URL**: <https://aka.ms/office-powershell>
4+
55
This repository holds reference content of Office PowerShell cmdlets for help purpose. The expert knowledge around Office PowerShell is distributed among customers, MVPs, partners, product teams, support, and other community members. Consumers have various preferences when consuming knowledge such as a website, PowerShell Get-Help, Windows app, iOS app, Android app, and others. The following diagram illustrates the point.
66

77
![Contribution and Consumption model for Office PowerShell reference content.](images/contrib-consumption-model.png)

0 commit comments

Comments
 (0)