Skip to content

Commit fe72922

Browse files
JasonGerendJasonGerend
authored
Merge branch 'main' into JasonGerend-patch-1
2 parents 1ad3446 + aa5f1ad commit fe72922

File tree

180 files changed

+22538
-2321
lines changed

Some content is hidden

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

180 files changed

+22538
-2321
lines changed

‎.github/workflows/AutoLabelAssign.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Assign and label PR
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
18+
with:
19+
WorkflowId: ${{ github.event.workflow_run.id }}
20+
OrgRepo: ${{ github.repository }}
21+
secrets:
22+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
23+
24+
label-assign:
25+
name: Run assign and label
26+
needs: [download-payload]
27+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
28+
with:
29+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
30+
AutoAssignUsers: 1
31+
AutoLabel: 1
32+
ExcludedUserList: '["user1", "user2"]'
33+
ExcludedBranchList: '["branch1", "branch2"]'
34+
secrets:
35+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/AutoLabelMsftContributor.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Auto label Microsoft contributors
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
if: github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}

‎.github/workflows/BackgroundTasks.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Save payload data
16+
env:
17+
PayloadJson: ${{ toJSON(github) }}
18+
AccessToken: ${{ github.token }}
19+
run: |
20+
mkdir -p ./pr
21+
echo $PayloadJson > ./pr/PayloadJson.json
22+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
23+
- uses: actions/upload-artifact@v4
24+
with:
25+
name: PayloadJson
26+
path: pr/

‎.github/workflows/LiveMergeCheck.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR can merge into branch
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, edited]
11+
12+
jobs:
13+
14+
live-merge:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/PrFileCount.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: PR file count less than limit
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, labeled, unlabeled, edited]
11+
12+
jobs:
13+
14+
file-count:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ProtectedFiles.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: PR has no protected files
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on: [pull_request_target]
9+
10+
jobs:
11+
12+
protected-files:
13+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
14+
with:
15+
PayloadJson: ${{ toJSON(github) }}
16+
secrets:
17+
AccessToken: ${{ secrets.GITHUB_TOKEN }}

‎.openpublishing.build.ps1

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎ContentOwners.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# Order is important! The last matching pattern has the most precedence.
5+
# So if a pull request only touches javascript files, only these owners
6+
# will be requested to review.
7+
8+
/docset/ @roharwoo
9+

‎TeamsAdmin.png

-6.97 KB
Binary file not shown.

‎cabgen-bootstrap.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ pr: none # Disable pull request triggers.
55

66
resources:
77
repositories:
8-
- repository: templates
8+
- repository: ReferenceAutomation
99
type: git
1010
name: Content CI/ReferenceAutomation
1111
ref: refs/heads/master
1212

1313
extends:
14-
template: PowerShell/cabgen.yml@templates
14+
template: PowerShell/cabgen.yml@ReferenceAutomation

‎docset/docfx.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
{
22
"build": {
33
"content": [
4-
{ "files": [ "toc.yml" ], "src": "bread", "dest": "windows/bread" },
4+
{ "dest": "windows/bread", "files": [ "toc.yml" ], "src": "bread" },
55

6-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "windows" },
7-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "winserver2025-ps" },
8-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "module" },
9-
{ "files": [ "toc.yml" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "module/WindowsServer2025-ps" },
10-
11-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "windows" },
12-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "winserver2022-ps" },
13-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "module" },
14-
{ "files": [ "toc.yml" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "module/WindowsServer2022-ps" },
6+
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps" },
7+
{ "dest": "winserver2025-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps" },
8+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps" },
9+
{ "dest": "module/WindowsServer2025-ps", "files": [ "toc.yml" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps" },
1510

16-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "windows" },
17-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "winserver2019-ps" },
18-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "module" },
19-
{ "files": [ "toc.yml" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "module/WindowsServer2019-ps" },
11+
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps" },
12+
{ "dest": "winserver2022-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps" },
13+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps" },
14+
{ "dest": "module/WindowsServer2022-ps", "files": [ "toc.yml" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps" },
2015

21-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "windows" },
22-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "windows" },
23-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "module" },
24-
{ "files": [ "toc.yml" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "module/WindowsServer2016-ps" },
16+
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps" },
17+
{ "dest": "winserver2019-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps" },
18+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps" },
19+
{ "dest": "module/WindowsServer2019-ps", "files": [ "toc.yml" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps" },
2520

26-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps", "dest": "windows" },
27-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps", "dest": "winserver2012-ps" },
28-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2012-ps", "version": "winserver2012-ps", "dest": "module" },
29-
{ "files": [ "toc.yml" ], "src": "winserver2012-ps", "version": "winserver2012-ps", "dest": "module/winserver2012-ps" },
21+
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps" },
22+
{ "dest": "windows", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps" },
23+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps" },
24+
{ "dest": "module/WindowsServer2016-ps", "files": [ "toc.yml" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps" },
3025

31-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "windows" },
32-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "winserver2012r2-ps" },
33-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "module" },
34-
{ "files": [ "toc.yml" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "module/winserver2012r2-ps" },
26+
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps" },
27+
{ "dest": "winserver2012-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps" },
28+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2012-ps", "version": "winserver2012-ps" },
29+
{ "dest": "module/winserver2012-ps", "files": [ "toc.yml" ], "src": "winserver2012-ps", "version": "winserver2012-ps" },
3530

36-
{ "files": [ "**/*.md" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps", "dest": "mdop" },
37-
{ "files": [ "toc.yml" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps", "dest": "mdop/win-mdop2-ps" },
38-
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "mdop", "version": "win-mdop2-ps", "dest": "module" },
39-
{ "files": [ "toc.yml" ], "src": "mdop", "version": "win-mdop2-ps", "dest": "module/win-mdop2-ps" },
31+
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps" },
32+
{ "dest": "winserver2012r2-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps" },
33+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps" },
34+
{ "dest": "module/winserver2012r2-ps", "files": [ "toc.yml" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps" },
4035

41-
{ "files": [ "**/*.md" ], "src": "virtual-directory-module", "dest": "module" }
36+
{ "dest": "mdop", "files": [ "**/*.md" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps" },
37+
{ "dest": "mdop/win-mdop2-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps" },
38+
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml" ], "src": "mdop", "version": "win-mdop2-ps" },
39+
{ "dest": "module/win-mdop2-ps", "files": [ "toc.yml" ], "src": "mdop", "version": "win-mdop2-ps" },
40+
41+
{ "dest": "module", "files": [ "**/*.md" ], "src": "virtual-directory-module" }
4242
],
4343
"resource": [
4444
{ "files": [ "**/*.png", "**/*.jpg" ], "exclude": [ "**/obj/**", "**/includes/**" ] }
@@ -91,7 +91,7 @@
9191
"garycentric",
9292
"AngelaMotherofDragons",
9393
"dstrome",
94-
"v-dihans",
94+
"v-dihans",
9595
"sdwheeler",
9696
"Stacyrch140",
9797
"v-stsavell",

‎docset/images/compare-changes.png

-30.6 KB
Binary file not shown.

‎docset/images/contribute-link.png

-9.78 KB
Binary file not shown.

‎docset/images/pencil-icon.png

-9.79 KB
Binary file not shown.

‎docset/images/preview-changes.png

-12.8 KB
Binary file not shown.

‎docset/images/propose-file-change.png

-20 KB
Binary file not shown.

‎docset/winserver2012-ps/activedirectory/About/About.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
description: About articles for the ActiveDirectory module.
3+
Help Version: 3.1.0.0
4+
Locale: en-US
5+
ms.date: 07/03/2024
6+
title: About articles
7+
---
8+
# About topics
9+
10+
## Description
11+
12+
About topics cover a range of concepts about PowerShell.
13+
14+
## About Topics
15+
16+
### [about_ActiveDirectory](about_ActiveDirectory.md)
17+
The Active Directory module is a command line interface for managing Active Directory.
18+
19+
### [about_ActiveDirectory_Filter](about_ActiveDirectory_Filter.md)
20+
Describes the syntax and behavior of the search filter supported by the Active Directory module for Windows PowerShell.
21+
22+
### [about_ActiveDirectory_Identity](about_ActiveDirectory_Identity.md)
23+
The Active Directory module for Windows PowerShell objects have a range of identifying attributes that are used for search and retrieval.
24+
25+
### [about_ActiveDirectory_ObjectModel](about_ActiveDirectory_ObjectModel.md)
26+
Describes the object model of the Active Directory module for Windows PowerShell.

‎docset/winserver2012-ps/activedirectory/About/about_ActiveDirectory.md

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
---
2+
title: about_ActiveDirectory
3+
ms.date: 04/22/2013
4+
description: The Active Directory module is a command line interface for managing Active Directory.
5+
Locale: en-US
6+
schema: 2.0.0
7+
---
8+
9+
# about_ActiveDirectory
10+
11+
## SHORT DESCRIPTION
12+
13+
The Active Directory module is a command line interface for managing Active
14+
Directory.
15+
16+
## LONG DESCRIPTION
17+
18+
The Active Directory module for Windows PowerShell is for IT Professionals who
19+
are administering and interfacing with Active Directory. The Active Directory
20+
module provides an efficient way to complete many administrative,
21+
configuration, and diagnostic tasks across Active Directory Domain Services (AD
22+
DS) and Active Directory Lightweight Directory Services (AD LDS) instances in
23+
their environments. The Active Directory module includes a set of Windows
24+
PowerShell cmdlets and a provider. The provider exposes the Active Directory
25+
database through a hierarchical navigation system, which is very similar to the
26+
file system. As with drives in a file system, such as C:, you can connect
27+
Windows PowerShell drives to Active Directory domains and AD LDS, as well as
28+
Active Directory snapshots.
29+
30+
### Coverage of Active Directory Module Cmdlets
31+
32+
Create, Read, Update, and Delete actions are supported for Active Directory
33+
objects by cmdlets such as `New-ADUser`, `Get-ADOrganizationalUnit`,
34+
`Set-ADComputer`, and `Remove-ADUser`.
35+
36+
Account and Password Policy Management are supported by cmdlets such as
37+
`Enable-ADAccount`, `Unlock-ADAccount`, `New-ADServiceAccount`,
38+
`Set-ADAccountControl`, and `Remove-ADFineGrainedPasswordPolicy`.
39+
40+
Domain and Forest Management is supported by cmdlets such as `Get-ADForest`,
41+
`Set-ADForest`, `Set-ADForestMode`, `Enable-ADOptionalFeature`,
42+
`Get-ADDomainController`, and `Get-ADDomain`.
43+
44+
### Listing the Active Directory Module Cmdlets
45+
46+
To get a list of all of the Active Directory module cmdlets, run
47+
48+
```powershell
49+
Get-Command -Module ActiveDirectory
50+
```
51+
52+
### Getting Started
53+
54+
Getting started with the Active Directory module for Windows PowerShell is as
55+
easy as clicking the following shortcut:
56+
57+
Run the following command in any Windows PowerShell prompt to import the Active
58+
Directory module:
59+
60+
```powershell
61+
Import-Module ActiveDirectory
62+
```
63+
64+
### Overview and Conceptual Topics
65+
66+
The first two of these topics offer a high level overview of the Active
67+
Directory module and the Active Directory Provider.
68+
69+
- For a brief introduction to the Active Directory provider for Windows
70+
PowerShell, see [ActiveDirectory](/powershell/module/activedirectory).
71+
- The following topics are conceptual support topics for the Active Directory
72+
module cmdlets.
73+
- For an introduction to the **Identity** parameter, which is used by the
74+
Active Directory module cmdlets to identify objects in the directory, see
75+
[about_ActiveDirectory_Identity](about_ActiveDirectory_Identity.md).
76+
- For an introduction to the **Filter** parameter which is used by Active
77+
Directory module cmdlets to search for objects in the directory, see
78+
[about_ActiveDirectory_Filter](about_ActiveDirectory_Filter.md).
79+
- For an introduction to the .NET Framework-based object model implemented by
80+
the Active Directory module, see
81+
[about_ActiveDirectory_ObjectModel](about_ActiveDirectory_ObjectModel.md).

0 commit comments

Comments
 (0)