Skip to content

Commit 6abedc9

Browse files
author
Sean Wheeler
committed
Merge branch 'live' of https://github.com/MicrosoftDocs/PowerShell-Docs into staging
2 parents 0175dbb + 725d1cc commit 6abedc9

File tree

6 files changed

+165
-145
lines changed

6 files changed

+165
-145
lines changed

‎.openpublishing.publish.config.json

Lines changed: 150 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,151 @@
11
{
2-
"build_entry_point": "docs",
3-
"enable_incremental_build": true,
4-
"docsets_to_publish": [{
5-
"docset_name": "developer-docs",
6-
"build_source_folder": "developer",
7-
"build_output_subfolder": "developer-docs",
8-
"locale": "en-us",
9-
"monikers": [],
10-
"moniker_ranges": [],
11-
"open_to_public_contributors": true,
12-
"type_mapping": {
13-
"Conceptual": "Content",
14-
"ManagedReference": "Content",
15-
"RestApi": "Content"
16-
},
17-
"build_entry_point": "docs",
18-
"template_folder": "_themes"
19-
},
20-
{
21-
"docset_name": "PowerShell_PowerShell-docs_dsc",
22-
"build_source_folder": "dsc",
23-
"build_output_subfolder": "dsc",
24-
"locale": "en-us",
25-
"open_to_public_contributors": true,
26-
"type_mapping": {
27-
"Conceptual": "Content",
28-
"ManagedReference": "Content",
29-
"RestApi": "Content"
30-
},
31-
"build_entry_point": "docs",
32-
"template_folder": "_themes",
33-
"version": 0
34-
},
35-
{
36-
"docset_name": "PowerShell_PowerShell-docs_gallery",
37-
"build_source_folder": "gallery",
38-
"build_output_subfolder": "gallery",
39-
"locale": "en-us",
40-
"open_to_public_contributors": true,
41-
"type_mapping": {
42-
"Conceptual": "Content",
43-
"ManagedReference": "Content",
44-
"RestApi": "Content"
45-
},
46-
"build_entry_point": "docs",
47-
"template_folder": "_themes",
48-
"version": 0
49-
},
50-
{
51-
"docset_name": "PowerShell_PowerShell-docs_jea",
52-
"build_source_folder": "jea",
53-
"build_output_subfolder": "jea",
54-
"locale": "en-us",
55-
"open_to_public_contributors": true,
56-
"type_mapping": {
57-
"Conceptual": "Content",
58-
"ManagedReference": "Content",
59-
"RestApi": "Content"
60-
},
61-
"build_entry_point": "docs",
62-
"template_folder": "_themes",
63-
"version": 0
64-
},
65-
{
66-
"docset_name": "PowerShell_PowerShell-docs_reference",
67-
"build_source_folder": "reference",
68-
"build_output_subfolder": "reference",
69-
"locale": "en-us",
70-
"open_to_public_contributors": true,
71-
"type_mapping": {
72-
"Conceptual": "Content",
73-
"ManagedReference": "Content",
74-
"RestApi": "Content",
75-
"AzurePSModulePage": "Content"
76-
},
77-
"build_entry_point": "docs",
78-
"template_folder": "_themes",
79-
"version": 0,
80-
"customized_template_paths": [
81-
"_dependentPackages/azurecli.plugins/azurecli"
82-
],
83-
"customized_tasks": {
84-
"docset_prebuild": [
85-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
86-
]
87-
},
88-
"monikerPath": [
89-
"mapping/monikerMapping.json"
90-
]
91-
},
92-
{
93-
"docset_name": "PowerShell_PowerShell-docs_wmf",
94-
"build_source_folder": "wmf",
95-
"build_output_subfolder": "wmf",
96-
"locale": "en-us",
97-
"open_to_public_contributors": true,
98-
"type_mapping": {
99-
"Conceptual": "Content",
100-
"ManagedReference": "Content",
101-
"RestApi": "Content"
102-
},
103-
"build_entry_point": "docs",
104-
"template_folder": "_themes",
105-
"version": 0
106-
}
107-
],
108-
"notification_subscribers": [],
109-
"sync_notification_subscribers": [],
110-
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/PowerShell-Docs",
111-
"git_repository_branch_open_to_public_contributors": "staging",
112-
"skip_source_output_uploading": false,
113-
"need_preview_pull_request": true,
114-
"need_generate_pdf_url_template": false,
115-
"contribution_branch_mappings": {},
116-
"branches_to_filter": [],
117-
"branch_target_mapping": {},
118-
"targets": {},
119-
"dependent_repositories": [{
120-
"path_to_root": "_themes",
121-
"url": "https://github.com/Microsoft/templates.docs.msft",
122-
"branch": "master",
123-
"branch_mapping": {}
124-
},
125-
{
126-
"path_to_root": "powershell-sdk-samples",
127-
"url": "https://github.com/MicrosoftDocs/powershell-sdk-samples",
128-
"branch": "master",
129-
"branch_mapping": {}
130-
}
131-
],
132-
"dependent_packages": [{
133-
"path_to_root": "_dependentPackages/azurecli.plugins",
134-
"id": "opbuild.templates.azurecli",
135-
"version": "latest",
136-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
137-
},
138-
{
139-
"path_to_root": "_dependentPackages/CommonPlugins",
140-
"target_framework": "net45",
141-
"version": "latest",
142-
"id": "Microsoft.OpenPublishing.CommonPlugins",
143-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
144-
}
145-
]
146-
}
2+
"build_entry_point": "docs",
3+
"docsets_to_publish": [
4+
{
5+
"docset_name": "developer-docs",
6+
"build_source_folder": "developer",
7+
"build_output_subfolder": "developer-docs",
8+
"locale": "en-us",
9+
"monikers": [],
10+
"moniker_ranges": [],
11+
"open_to_public_contributors": true,
12+
"type_mapping": {
13+
"Conceptual": "Content",
14+
"ManagedReference": "Content",
15+
"RestApi": "Content"
16+
},
17+
"build_entry_point": "docs",
18+
"template_folder": "_themes"
19+
},
20+
{
21+
"docset_name": "PowerShell_PowerShell-docs_dsc",
22+
"build_source_folder": "dsc",
23+
"build_output_subfolder": "dsc",
24+
"locale": "en-us",
25+
"open_to_public_contributors": true,
26+
"type_mapping": {
27+
"Conceptual": "Content",
28+
"ManagedReference": "Content",
29+
"RestApi": "Content"
30+
},
31+
"build_entry_point": "docs",
32+
"template_folder": "_themes",
33+
"version": 0
34+
},
35+
{
36+
"docset_name": "PowerShell_PowerShell-docs_gallery",
37+
"build_source_folder": "gallery",
38+
"build_output_subfolder": "gallery",
39+
"locale": "en-us",
40+
"open_to_public_contributors": true,
41+
"type_mapping": {
42+
"Conceptual": "Content",
43+
"ManagedReference": "Content",
44+
"RestApi": "Content"
45+
},
46+
"build_entry_point": "docs",
47+
"template_folder": "_themes",
48+
"version": 0
49+
},
50+
{
51+
"docset_name": "PowerShell_PowerShell-docs_jea",
52+
"build_source_folder": "jea",
53+
"build_output_subfolder": "jea",
54+
"locale": "en-us",
55+
"open_to_public_contributors": true,
56+
"type_mapping": {
57+
"Conceptual": "Content",
58+
"ManagedReference": "Content",
59+
"RestApi": "Content"
60+
},
61+
"build_entry_point": "docs",
62+
"template_folder": "_themes",
63+
"version": 0
64+
},
65+
{
66+
"docset_name": "PowerShell_PowerShell-docs_reference",
67+
"build_source_folder": "reference",
68+
"build_output_subfolder": "reference",
69+
"locale": "en-us",
70+
"monikers": [],
71+
"moniker_ranges": [],
72+
"open_to_public_contributors": true,
73+
"type_mapping": {
74+
"Conceptual": "Content",
75+
"ManagedReference": "Content",
76+
"RestApi": "Content",
77+
"AzurePSModulePage": "Content"
78+
},
79+
"build_entry_point": "docs",
80+
"template_folder": "_themes",
81+
"version": 0,
82+
"customized_template_paths": [
83+
"_dependentPackages/azurecli.plugins/azurecli"
84+
],
85+
"customized_tasks": {
86+
"docset_prebuild": [
87+
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
88+
]
89+
},
90+
"monikerPath": [
91+
"mapping/monikerMapping.json"
92+
]
93+
},
94+
{
95+
"docset_name": "PowerShell_PowerShell-docs_wmf",
96+
"build_source_folder": "wmf",
97+
"build_output_subfolder": "wmf",
98+
"locale": "en-us",
99+
"open_to_public_contributors": true,
100+
"type_mapping": {
101+
"Conceptual": "Content",
102+
"ManagedReference": "Content",
103+
"RestApi": "Content"
104+
},
105+
"build_entry_point": "docs",
106+
"template_folder": "_themes",
107+
"version": 0
108+
}
109+
],
110+
"notification_subscribers": [],
111+
"sync_notification_subscribers": [],
112+
"branches_to_filter": [],
113+
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/PowerShell-Docs",
114+
"git_repository_branch_open_to_public_contributors": "staging",
115+
"skip_source_output_uploading": false,
116+
"need_preview_pull_request": true,
117+
"enable_incremental_build": true,
118+
"contribution_branch_mappings": {},
119+
"dependent_repositories": [
120+
{
121+
"path_to_root": "_themes",
122+
"url": "https://github.com/Microsoft/templates.docs.msft",
123+
"branch": "master",
124+
"branch_mapping": {}
125+
},
126+
{
127+
"path_to_root": "powershell-sdk-samples",
128+
"url": "https://github.com/MicrosoftDocs/powershell-sdk-samples",
129+
"branch": "master",
130+
"branch_mapping": {}
131+
}
132+
],
133+
"branch_target_mapping": {},
134+
"need_generate_pdf_url_template": false,
135+
"targets": {},
136+
"dependent_packages": [
137+
{
138+
"path_to_root": "_dependentPackages/azurecli.plugins",
139+
"id": "opbuild.templates.azurecli",
140+
"version": "latest",
141+
"nuget_feed": "https://www.myget.org/F/op/api/v2"
142+
},
143+
{
144+
"path_to_root": "_dependentPackages/CommonPlugins",
145+
"target_framework": "net45",
146+
"version": "latest",
147+
"id": "Microsoft.OpenPublishing.CommonPlugins",
148+
"nuget_feed": "https://www.myget.org/F/op/api/v2"
149+
}
150+
]
151+
}

‎reference/3.0/Microsoft.PowerShell.Core/About/about_Operators.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ expressions, and (`-like`, `-notlike`) use wildcards `*`.
5252
Containment comparison operators determine whether a test value appears in a
5353
reference set (`-in`, `-notin`, `-contains`, `-notcontains`).
5454

55+
Type comparison operators (`-is`, `-isnot`) determine whether an object is
56+
of a given type.
57+
5558
Bitwise comparison operators (`-bAND`, `-bOR`, `-bXOR`, `-bNOT`) manipulate
5659
the bit patterns in values.
5760

‎reference/4.0/Microsoft.PowerShell.Core/About/about_Operators.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ expressions, and (`-like`, `-notlike`) use wildcards `*`.
5252
Containment comparison operators determine whether a test value appears in a
5353
reference set (`-in`, `-notin`, `-contains`, `-notcontains`).
5454

55+
Type comparison operators (`-is`, `-isnot`) determine whether an object is
56+
of a given type.
57+
5558
Bitwise comparison operators (`-bAND`, `-bOR`, `-bXOR`, `-bNOT`) manipulate
5659
the bit patterns in values.
5760

‎reference/5.0/Microsoft.PowerShell.Core/About/about_Operators.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ expressions, and (`-like`, `-notlike`) use wildcards `*`.
5252
Containment comparison operators determine whether a test value appears in a
5353
reference set (`-in`, `-notin`, `-contains`, `-notcontains`).
5454

55+
Type comparison operators (`-is`, `-isnot`) determine whether an object is
56+
of a given type.
57+
5558
Bitwise comparison operators (`-bAND`, `-bOR`, `-bXOR`, `-bNOT`) manipulate
5659
the bit patterns in values.
5760

‎reference/5.1/Microsoft.PowerShell.Core/About/about_Operators.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ expressions, and (`-like`, `-notlike`) use wildcards `*`.
5252
Containment comparison operators determine whether a test value appears in a
5353
reference set (`-in`, `-notin`, `-contains`, `-notcontains`).
5454

55+
Type comparison operators (`-is`, `-isnot`) determine whether an object is
56+
of a given type.
57+
5558
Bitwise comparison operators (`-bAND`, `-bOR`, `-bXOR`, `-bNOT`) manipulate
5659
the bit patterns in values.
5760

‎reference/6/Microsoft.PowerShell.Core/About/about_Operators.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ expressions, and (`-like`, `-notlike`) use wildcards `*`.
5151
Containment comparison operators determine whether a test value appears in a
5252
reference set (`-in`, `-notin`, `-contains`, `-notcontains`).
5353

54+
Type comparison operators (`-is`, `-isnot`) determine whether an object is
55+
of a given type.
56+
5457
Bitwise comparison operators (`-bAND`, `-bOR`, `-bXOR`, `-bNOT`) manipulate
5558
the bit patterns in values.
5659

0 commit comments

Comments
 (0)