Skip to content

Commit 3aa5e5e

Browse files
chrisdachrisda
authored
Merge pull request MicrosoftDocs#1616 from MicrosoftDocs/ExMigration
ExMigration to Master
2 parents 2900fbd + c4fead9 commit 3aa5e5e

File tree

72 files changed

+5225
-1722
lines changed

Some content is hidden

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

72 files changed

+5225
-1722
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ _site/
44
.optemp/
55
_themes*/
66

7+
_dependentPackages/
78
.openpublishing.buildcore.ps1

‎.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,4 +282,4 @@
282282
"nuget_feed": "https://www.myget.org/F/op/api/v2"
283283
}
284284
]
285-
}
285+
}

‎exchange/docfx.json

Lines changed: 270 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,315 @@
22
"build": {
33
"content": [
44
{
5-
"files": ["**/*.md"],
5+
"files": [
6+
"**/*.md",
7+
"toc.yml"
8+
],
69
"src": "docs-conceptual",
7-
"version": "exchange-ps",
10+
"version":"exchserver-ps-2010",
811
"dest": "exchange",
912
"exclude": [
1013
"**/obj/**",
1114
"**/includes/**",
1215
"README.md",
1316
"LICENSE",
1417
"LICENSE-CODE",
15-
"ThirdPartyNotices"]
18+
"ThirdPartyNotices"
19+
]
1620
},
1721
{
18-
"files": ["toc.yml"],
22+
"files": [
23+
"**/*.md",
24+
"toc.yml"
25+
],
1926
"src": "docs-conceptual",
20-
"version": "exchange-ps",
21-
"dest": "exchange/exchange-ps"
27+
"version":"exchserver-ps-2016",
28+
"dest": "exchange",
29+
"exclude": [
30+
"**/obj/**",
31+
"**/includes/**",
32+
"README.md",
33+
"LICENSE",
34+
"LICENSE-CODE",
35+
"ThirdPartyNotices"
36+
]
2237
},
2338
{
24-
"files": ["**/*.md"],
25-
"src": "exchange-ps",
26-
"version": "exchange-ps",
27-
"dest": "module"
28-
},
29-
{
30-
"files": ["toc.yml"],
31-
"src": "exchange-ps",
32-
"version": "exchange-ps",
33-
"dest": "module/exchange-ps"
34-
}
39+
"files": [
40+
"**/*.md",
41+
"toc.yml"
42+
],
43+
"src": "docs-conceptual",
44+
"version":"exchserver-ps-2013",
45+
"dest": "exchange",
46+
"exclude": [
47+
"**/obj/**",
48+
"**/includes/**",
49+
"README.md",
50+
"LICENSE",
51+
"LICENSE-CODE",
52+
"ThirdPartyNotices"
53+
]
54+
},
55+
{
56+
"files": [
57+
"**/*.md",
58+
"toc.yml"
59+
],
60+
"src": "docs-conceptual",
61+
"version":"exchonline-ps",
62+
"dest": "exchange",
63+
"exclude": [
64+
"**/obj/**",
65+
"**/includes/**",
66+
"README.md",
67+
"LICENSE",
68+
"LICENSE-CODE",
69+
"ThirdPartyNotices"
70+
]
71+
},
72+
{
73+
"files": [
74+
"**/*.md",
75+
"toc.yml"
76+
],
77+
"src": "docs-conceptual",
78+
"version":"o365scc-ps",
79+
"dest": "exchange",
80+
"exclude": [
81+
"**/obj/**",
82+
"**/includes/**",
83+
"README.md",
84+
"LICENSE",
85+
"LICENSE-CODE",
86+
"ThirdPartyNotices"
87+
]
88+
},
89+
{
90+
"files": [
91+
"**/*.md",
92+
"toc.yml"
93+
],
94+
"src": "docs-conceptual",
95+
"version":"eop-ps",
96+
"dest": "exchange",
97+
"exclude": [
98+
"**/obj/**",
99+
"**/includes/**",
100+
"README.md",
101+
"LICENSE",
102+
"LICENSE-CODE",
103+
"ThirdPartyNotices"
104+
]
105+
},
106+
{
107+
"files": [
108+
"**/*.md"
109+
],
110+
"src": "exchange-ps/exchange",
111+
"version": "exchserver-ps-2016",
112+
"dest": "module"
113+
},
114+
{
115+
"files": [
116+
"toc.yml"
117+
],
118+
"src": "exchange-ps/exchange/exchserver-ps-2016",
119+
"version": "exchserver-ps-2016",
120+
"dest": "module/exchange-ps"
121+
},
122+
{
123+
"files": [
124+
"**/*.md"
125+
],
126+
"src": "exchange-ps/exchange",
127+
"version": "exchserver-ps-2013",
128+
"dest": "module"
129+
},
130+
{
131+
"files": [
132+
"toc.yml"
133+
],
134+
"src": "exchange-ps/exchange/exchserver-ps-2013",
135+
"version": "exchserver-ps-2013",
136+
"dest": "module/exchange-ps"
137+
},
138+
{
139+
"files": [
140+
"**/*.md"
141+
],
142+
"src": "exchange-ps/exchange",
143+
"version": "eop-ps",
144+
"dest": "module"
145+
},
146+
{
147+
"files": [
148+
"toc.yml"
149+
],
150+
"src": "exchange-ps/exchange/eop-ps",
151+
"version": "eop-ps",
152+
"dest": "module/exchange-ps"
153+
},
154+
{
155+
"files": [
156+
"**/*.md"
157+
],
158+
"src": "exchange-ps/exchange",
159+
"version": "exchonline-ps",
160+
"dest": "module"
161+
},
162+
{
163+
"files": [
164+
"toc.yml"
165+
],
166+
"src": "exchange-ps/exchange/exchonline-ps",
167+
"version": "exchonline-ps",
168+
"dest": "module/exchange-ps"
169+
},
170+
{
171+
"files": [
172+
"**/*.md"
173+
],
174+
"src": "exchange-ps/exchange",
175+
"version": "exchserver-ps-2010",
176+
"dest": "module"
177+
},
178+
{
179+
"files": [
180+
"toc.yml"
181+
],
182+
"src": "exchange-ps/exchange/exchserver-ps-2010",
183+
"version": "exchserver-ps-2010",
184+
"dest": "module/exchange-ps"
185+
},
186+
{
187+
"files": [
188+
"**/*.md"
189+
],
190+
"src": "exchange-ps/exchange",
191+
"version": "o365scc-ps",
192+
"dest": "module"
193+
},
194+
{
195+
"files": [
196+
"toc.yml"
197+
],
198+
"src": "exchange-ps/exchange/o365scc-ps",
199+
"version": "o365scc-ps",
200+
"dest": "module/exchange-ps"
201+
}
35202
],
36203
"resource": [
37204
{
38205
"files": [
39206
"**/*.png",
40207
"**/*.jpg"
41208
],
42-
"version": "exchange-ps",
209+
"version": "exchserver-ps-2010",
210+
"exclude": [
211+
"**/obj/**",
212+
"**/includes/**"
213+
]
214+
},
215+
{
216+
"files": [
217+
"**/*.png",
218+
"**/*.jpg"
219+
],
220+
"version": "o365scc-ps",
221+
"exclude": [
222+
"**/obj/**",
223+
"**/includes/**"
224+
]
225+
},
226+
{
227+
"files": [
228+
"**/*.png",
229+
"**/*.jpg"
230+
],
231+
"version": "exchserver-ps-2016",
232+
"exclude": [
233+
"**/obj/**",
234+
"**/includes/**"
235+
]
236+
},
237+
{
238+
"files": [
239+
"**/*.png",
240+
"**/*.jpg"
241+
],
242+
"version": "exchserver-ps-2013",
243+
"exclude": [
244+
"**/obj/**",
245+
"**/includes/**"
246+
]
247+
},
248+
{
249+
"files": [
250+
"**/*.png",
251+
"**/*.jpg"
252+
],
253+
"version": "eop-ps",
254+
"exclude": [
255+
"**/obj/**",
256+
"**/includes/**"
257+
]
258+
},
259+
{
260+
"files": [
261+
"**/*.png",
262+
"**/*.jpg"
263+
],
264+
"version": "exchonline-ps",
43265
"exclude": [
44266
"**/obj/**",
45267
"**/includes/**"
46268
]
47269
}
48270
],
49271
"versions": {
50-
"exchange-ps": {
51-
"dest": "exchange-ps"
272+
"exchserver-ps-2016": {
273+
"dest": "exchserver-ps-2016"
274+
},
275+
"exchserver-ps-2013": {
276+
"dest": "exchserver-ps-2013"
277+
},
278+
"eop-ps": {
279+
"dest": "eop-ps"
280+
},
281+
"exchonline-ps": {
282+
"dest": "exchonline-ps"
283+
},
284+
"exchserver-ps-2010": {
285+
"dest": "exchserver-ps-2010"
286+
},
287+
"o365scc-ps": {
288+
"dest": "o365scc-ps"
52289
}
53290
},
54291
"overwrite": [],
55292
"externalReference": [],
56293
"globalMetadata": {
57-
"author" : "chrisda",
58-
"ms.author" : "chrisda",
59-
"manager" : "serdars",
60-
"ms.date" : "09/25/2017",
61-
"ms.topic" : "reference",
62-
"ms.service" : "exchange-powershell",
63-
"ms.devlang" : "powershell",
294+
"author": "chrisda",
295+
"ms.author": "chrisda",
296+
"manager": "serdars",
297+
"ms.date": "09/25/2017",
298+
"ms.topic": "reference",
299+
"ms.service": "exchange-powershell",
300+
"ms.devlang": "powershell",
301+
"showPowerShellPicker": "true",
64302
"feedback_system": "GitHub",
65303
"feedback_github_repo": "MicrosoftDocs/office-docs-powershell",
66304
"feedback_product_url": "https://github.com/MicrosoftDocs/office-docs-powershell/issues"
67305
},
68306
"fileMetadata": {
69-
"apiPlatform":{
70-
"exchange-ps/exchange" : [ "PowerShell" ]
307+
"apiPlatform": {
308+
"exchange-ps/exchange": [
309+
"PowerShell"
310+
]
71311
}
72312
},
73313
"template": [],
74-
"dest": "exchange-ps"
314+
"dest": ""
75315
}
76316
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ms.topic: article
99
ms.service: eop
1010
localization_priority: Normal
1111
ms.assetid: 054e0fd7-d465-4572-93f8-a00a9136e4d1
12+
monikerRange: "eop-ps"
1213
description: "Use remote PowerShell to connect to an Exchange Online Protection organization"
1314
---
1415

‎exchange/docs-conceptual/exchange-eop/exchange-online-protection-powershell.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ms.topic: article
99
ms.service: eop
1010
localization_priority: Normal
1111
ms.assetid: f7918a88-774a-405e-945b-bc2f5ee9f748
12+
monikerRange: "eop-ps"
1213
description: "Learn about using PowerShell in Exchange Online Protection"
1314
---
1415

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ localization_priority: Priority
1111
ms.collection: Strat_EX_Admin
1212
ms.custom:
1313
ms.assetid: c8bea338-6c1a-4bdf-8de0-7895d427ee5b
14+
monikerRange: "exchonline-ps"
1415
description: "Learn how to use remote PowerShell to connect to Exchange Online."
1516
---
1617

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ms.topic: article
88
ms.service: exchange-online
99
localization_priority: Normal
1010
ms.assetid: 04dae4ce-34a7-49c5-bf75-11e72452e04a
11+
monikerRange: "exchonline-ps"
1112
description: "Learn how to connect to Exchange Online PowerShell by using multi-factor authentication (MFA)."
1213
---
1314

‎exchange/docs-conceptual/exchange-online/disable-access-to-exchange-online-powershell.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ms.topic: article
99
ms.service: exchange-online
1010
localization_priority: Normal
1111
ms.assetid: f969816a-2607-4655-9d47-9e8767fb5633
12+
monikerRange: "exchonline-ps"
1213
description: "Admins can learn how to enable or disable access to Exchange Online PowerShell for users in their organization"
1314
---
1415

0 commit comments

Comments
 (0)