Skip to content

Commit 8c11b86

Browse files
authored
Merge branch 'master' into patch-251
2 parents 6e03823 + 50a9704 commit 8c11b86

File tree

1,299 files changed

+289
-1342
lines changed

Some content is hidden

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

1,299 files changed

+289
-1342
lines changed

exchange/docfx.json

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -52,35 +52,7 @@
5252
"src": "virtual-folder",
5353
"version": "exchange-ps",
5454
"dest": "module"
55-
},
56-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2010", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
57-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2010", "dest": "exchange/exchange-ps" },
58-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2010", "dest": "module" },
59-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2010", "dest": "module/exchange-ps" },
60-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2013", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
61-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2013", "dest": "exchange/exchange-ps" },
62-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2013", "dest": "module" },
63-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2013", "dest": "module/exchange-ps" },
64-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2016", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
65-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2016", "dest": "exchange/exchange-ps" },
66-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2016", "dest": "module" },
67-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2016", "dest": "module/exchange-ps" },
68-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchserver-ps-2019", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
69-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchserver-ps-2019", "dest": "exchange/exchange-ps" },
70-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "exchserver-ps-2019", "dest": "module" },
71-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "exchserver-ps-2019", "dest": "module/exchange-ps" },
72-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "exchonline-ps", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
73-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "exchonline-ps", "dest": "exchange/exchange-ps" },
74-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "exchonline-ps", "dest": "module" },
75-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "exchonline-ps", "dest": "module/exchange-ps" },
76-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "o365scc-ps", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
77-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "o365scc-ps", "dest": "exchange/exchange-ps" },
78-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "o365scc-ps", "dest": "module" },
79-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "o365scc-ps", "dest": "module/exchange-ps" },
80-
{ "files": ["**/*.md"], "src": "docs-conceptual", "version": "eop-ps", "dest": "exchange", "exclude": ["**/obj/**", "**/includes/**", "README.md", "LICENSE", "LICENSE-CODE", "ThirdPartyNotices"] },
81-
{ "files": ["toc.yml"], "src": "docs-conceptual", "version": "eop-ps", "dest": "exchange/exchange-ps" },
82-
{ "files": ["**/*.md"], "src": "exchange-ps", "version": "eop-ps", "dest": "module" },
83-
{ "files": ["toc.yml"], "src": "exchange-ps", "version": "eop-ps", "dest": "module/exchange-ps" }
55+
}
8456
],
8557
"resource": [
8658
{
@@ -93,24 +65,12 @@
9365
"**/obj/**",
9466
"**/includes/**"
9567
]
96-
},
97-
{ "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2010", "exclude": ["**/obj/**", "**/includes/**"] },
98-
{ "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2013", "exclude": ["**/obj/**", "**/includes/**"] },
99-
{ "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2016", "exclude": ["**/obj/**", "**/includes/**"] },
100-
{ "files": ["**/*.png", "**/*.jpg"], "version": "exchserver-ps-2019", "exclude": ["**/obj/**", "**/includes/**"] },
101-
{ "files": ["**/*.png", "**/*.jpg"], "version": "exchonline-ps", "exclude": ["**/obj/**", "**/includes/**"] },
102-
{ "files": ["**/*.png", "**/*.jpg"], "version": "o365scc-ps", "exclude": ["**/obj/**", "**/includes/**"] },
103-
{ "files": ["**/*.png", "**/*.jpg"], "version": "eop-ps", "exclude": ["**/obj/**", "**/includes/**"] }
68+
}
10469
],
10570
"versions": {
106-
"exchange-ps": { "dest": "exchange-ps" },
107-
"exchserver-ps-2010": { "dest": "exchserver-ps-2010" },
108-
"exchserver-ps-2013": { "dest": "exchserver-ps-2013" },
109-
"exchserver-ps-2016": { "dest": "exchserver-ps-2016" },
110-
"exchserver-ps-2019": { "dest": "exchserver-ps-2019" },
111-
"exchonline-ps": { "dest": "exchonline-ps" },
112-
"o365scc-ps": { "dest": "o365scc-ps" },
113-
"eop-ps": { "dest": "eop-ps" }
71+
"exchange-ps": {
72+
"dest": "exchange-ps"
73+
}
11474
},
11575
"overwrite": [],
11676
"externalReference": [],

exchange/exchange-ps/exchange/Add-ADPermission.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-AttachmentFilterEntry.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-AvailabilityAddressSpace.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-ComplianceCaseMember.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-ContentFilterPhrase.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-DatabaseAvailabilityGroupServer.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-DistributionGroupMember.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-FederatedDomain.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-GlobalMonitoringOverride.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-IPAllowListEntry.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-IPAllowListProvider.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-IPBlockListEntry.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-IPBlockListProvider.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-MailboxDatabaseCopy.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-MailboxFolderPermission.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-MailboxPermission.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-ManagementRoleEntry.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-PublicFolderAdministrativePermission.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-PublicFolderClientPermission.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-RecipientPermission.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-ResubmitRequest.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-RoleGroupMember.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-ServerMonitoringOverride.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-UnifiedGroupLinks.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Add-eDiscoveryCaseAdmin.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Clean-MailboxDatabase.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Clear-ActiveSyncDevice.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Clear-MobileDevice.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Clear-TextMessagingAccount.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Compare-TextMessagingVerificationCode.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Complete-MigrationBatch.md

Lines changed: 0 additions & 1 deletion

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

Lines changed: 0 additions & 1 deletion

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

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Connect-Mailbox.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Delete-QuarantineMessage.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Disable-AddressListPaging.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Disable-AntiPhishRule.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Disable-App.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Disable-CmdletExtensionAgent.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Disable-DistributionGroup.md

Lines changed: 0 additions & 1 deletion

exchange/exchange-ps/exchange/Disable-HostedContentFilterRule.md

Lines changed: 0 additions & 1 deletion

0 commit comments

Comments
 (0)