Skip to content

Commit

Permalink
Merge branch 'main' into JasonGerend-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonGerend authored Nov 25, 2024
2 parents 1ad3446 + aa5f1ad commit fe72922
Show file tree
Hide file tree
Showing 180 changed files with 22,538 additions and 2,321 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/AutoLabelAssign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Assign and label PR

permissions:
pull-requests: write
contents: read
actions: read

on:
workflow_run:
workflows: [Background tasks]
types:
- completed

jobs:
download-payload:
name: Download and extract payload artifact
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
with:
WorkflowId: ${{ github.event.workflow_run.id }}
OrgRepo: ${{ github.repository }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}

label-assign:
name: Run assign and label
needs: [download-payload]
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
with:
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
AutoAssignUsers: 1
AutoLabel: 1
ExcludedUserList: '["user1", "user2"]'
ExcludedBranchList: '["branch1", "branch2"]'
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34 changes: 34 additions & 0 deletions .github/workflows/AutoLabelMsftContributor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Auto label Microsoft contributors

permissions:
pull-requests: write
contents: read
actions: read

on:
workflow_run:
workflows: [Background tasks]
types:
- completed

jobs:
download-payload:
if: github.repository_visibility == 'public'
name: Download and extract payload artifact
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
with:
WorkflowId: ${{ github.event.workflow_run.id }}
OrgRepo: ${{ github.repository }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}

label-msft:
name: Label Microsoft contributors
if: github.repository_visibility == 'public'
needs: [download-payload]
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
with:
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
26 changes: 26 additions & 0 deletions .github/workflows/BackgroundTasks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Background tasks

permissions:
pull-requests: write
contents: read

on:
pull_request_target:

jobs:
upload:
runs-on: ubuntu-latest

steps:
- name: Save payload data
env:
PayloadJson: ${{ toJSON(github) }}
AccessToken: ${{ github.token }}
run: |
mkdir -p ./pr
echo $PayloadJson > ./pr/PayloadJson.json
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
- uses: actions/upload-artifact@v4
with:
name: PayloadJson
path: pr/
19 changes: 19 additions & 0 deletions .github/workflows/LiveMergeCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: PR can merge into branch

permissions:
pull-requests: write
statuses: write
contents: read

on:
pull_request_target:
types: [opened, reopened, synchronize, edited]

jobs:

live-merge:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}
19 changes: 19 additions & 0 deletions .github/workflows/PrFileCount.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: PR file count less than limit

permissions:
pull-requests: write
statuses: write
contents: read

on:
pull_request_target:
types: [opened, reopened, synchronize, labeled, unlabeled, edited]

jobs:

file-count:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}
17 changes: 17 additions & 0 deletions .github/workflows/ProtectedFiles.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: PR has no protected files

permissions:
pull-requests: write
statuses: write
contents: read

on: [pull_request_target]

jobs:

protected-files:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}
17 changes: 0 additions & 17 deletions .openpublishing.build.ps1

This file was deleted.

9 changes: 9 additions & 0 deletions ContentOwners.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

# Each line is a file pattern followed by one or more owners.

# Order is important! The last matching pattern has the most precedence.
# So if a pull request only touches javascript files, only these owners
# will be requested to review.

/docset/ @roharwoo

Binary file removed TeamsAdmin.png
Binary file not shown.
4 changes: 2 additions & 2 deletions cabgen-bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ pr: none # Disable pull request triggers.

resources:
repositories:
- repository: templates
- repository: ReferenceAutomation
type: git
name: Content CI/ReferenceAutomation
ref: refs/heads/master

extends:
template: PowerShell/cabgen.yml@templates
template: PowerShell/cabgen.yml@ReferenceAutomation
64 changes: 32 additions & 32 deletions docset/docfx.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
{
"build": {
"content": [
{ "files": [ "toc.yml" ], "src": "bread", "dest": "windows/bread" },
{ "dest": "windows/bread", "files": [ "toc.yml" ], "src": "bread" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "windows" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "winserver2025-ps" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps", "dest": "module/WindowsServer2025-ps" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "windows" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "winserver2022-ps" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps", "dest": "module/WindowsServer2022-ps" },
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps" },
{ "dest": "winserver2025-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2025-ps", "version": "WindowsServer2025-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps" },
{ "dest": "module/WindowsServer2025-ps", "files": [ "toc.yml" ], "src": "winserver2025-ps", "version": "WindowsServer2025-ps" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "windows" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "winserver2019-ps" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps", "dest": "module/WindowsServer2019-ps" },
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps" },
{ "dest": "winserver2022-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2022-ps", "version": "WindowsServer2022-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps" },
{ "dest": "module/WindowsServer2022-ps", "files": [ "toc.yml" ], "src": "winserver2022-ps", "version": "WindowsServer2022-ps" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "windows" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "windows" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps", "dest": "module/WindowsServer2016-ps" },
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps" },
{ "dest": "winserver2019-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2019-ps", "version": "WindowsServer2019-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps" },
{ "dest": "module/WindowsServer2019-ps", "files": [ "toc.yml" ], "src": "winserver2019-ps", "version": "WindowsServer2019-ps" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps", "dest": "windows" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps", "dest": "winserver2012-ps" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2012-ps", "version": "winserver2012-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "winserver2012-ps", "version": "winserver2012-ps", "dest": "module/winserver2012-ps" },
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps" },
{ "dest": "windows", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2016-ps", "version": "WindowsServer2016-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps" },
{ "dest": "module/WindowsServer2016-ps", "files": [ "toc.yml" ], "src": "winserver2016-ps", "version": "WindowsServer2016-ps" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "windows" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "winserver2012r2-ps" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps", "dest": "module/winserver2012r2-ps" },
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps" },
{ "dest": "winserver2012-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012-ps", "version": "winserver2012-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2012-ps", "version": "winserver2012-ps" },
{ "dest": "module/winserver2012-ps", "files": [ "toc.yml" ], "src": "winserver2012-ps", "version": "winserver2012-ps" },

{ "files": [ "**/*.md" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps", "dest": "mdop" },
{ "files": [ "toc.yml" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps", "dest": "mdop/win-mdop2-ps" },
{ "files": [ "**/*.yml" ], "exclude": [ "toc.yml" ], "src": "mdop", "version": "win-mdop2-ps", "dest": "module" },
{ "files": [ "toc.yml" ], "src": "mdop", "version": "win-mdop2-ps", "dest": "module/win-mdop2-ps" },
{ "dest": "windows", "files": [ "**/*.md" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps" },
{ "dest": "winserver2012r2-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/winserver2012r2-ps", "version": "winserver2012r2-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml", "**/About/*.md" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps" },
{ "dest": "module/winserver2012r2-ps", "files": [ "toc.yml" ], "src": "winserver2012r2-ps", "version": "winserver2012r2-ps" },

{ "files": [ "**/*.md" ], "src": "virtual-directory-module", "dest": "module" }
{ "dest": "mdop", "files": [ "**/*.md" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps" },
{ "dest": "mdop/win-mdop2-ps", "files": [ "toc.yml" ], "src": "docs-conceptual/mdop", "version": "win-mdop2-ps" },
{ "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml" ], "src": "mdop", "version": "win-mdop2-ps" },
{ "dest": "module/win-mdop2-ps", "files": [ "toc.yml" ], "src": "mdop", "version": "win-mdop2-ps" },

{ "dest": "module", "files": [ "**/*.md" ], "src": "virtual-directory-module" }
],
"resource": [
{ "files": [ "**/*.png", "**/*.jpg" ], "exclude": [ "**/obj/**", "**/includes/**" ] }
Expand Down Expand Up @@ -91,7 +91,7 @@
"garycentric",
"AngelaMotherofDragons",
"dstrome",
"v-dihans",
"v-dihans",
"sdwheeler",
"Stacyrch140",
"v-stsavell",
Expand Down
Binary file removed docset/images/compare-changes.png
Binary file not shown.
Binary file removed docset/images/contribute-link.png
Binary file not shown.
Binary file removed docset/images/pencil-icon.png
Binary file not shown.
Binary file removed docset/images/preview-changes.png
Binary file not shown.
Binary file removed docset/images/propose-file-change.png
Binary file not shown.
26 changes: 26 additions & 0 deletions docset/winserver2012-ps/activedirectory/About/About.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
description: About articles for the ActiveDirectory module.
Help Version: 3.1.0.0
Locale: en-US
ms.date: 07/03/2024
title: About articles
---
# About topics

## Description

About topics cover a range of concepts about PowerShell.

## About Topics

### [about_ActiveDirectory](about_ActiveDirectory.md)
The Active Directory module is a command line interface for managing Active Directory.

### [about_ActiveDirectory_Filter](about_ActiveDirectory_Filter.md)
Describes the syntax and behavior of the search filter supported by the Active Directory module for Windows PowerShell.

### [about_ActiveDirectory_Identity](about_ActiveDirectory_Identity.md)
The Active Directory module for Windows PowerShell objects have a range of identifying attributes that are used for search and retrieval.

### [about_ActiveDirectory_ObjectModel](about_ActiveDirectory_ObjectModel.md)
Describes the object model of the Active Directory module for Windows PowerShell.
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
---
title: about_ActiveDirectory
ms.date: 04/22/2013
description: The Active Directory module is a command line interface for managing Active Directory.
Locale: en-US
schema: 2.0.0
---

# about_ActiveDirectory

## SHORT DESCRIPTION

The Active Directory module is a command line interface for managing Active
Directory.

## LONG DESCRIPTION

The Active Directory module for Windows PowerShell is for IT Professionals who
are administering and interfacing with Active Directory. The Active Directory
module provides an efficient way to complete many administrative,
configuration, and diagnostic tasks across Active Directory Domain Services (AD
DS) and Active Directory Lightweight Directory Services (AD LDS) instances in
their environments. The Active Directory module includes a set of Windows
PowerShell cmdlets and a provider. The provider exposes the Active Directory
database through a hierarchical navigation system, which is very similar to the
file system. As with drives in a file system, such as C:, you can connect
Windows PowerShell drives to Active Directory domains and AD LDS, as well as
Active Directory snapshots.

### Coverage of Active Directory Module Cmdlets

Create, Read, Update, and Delete actions are supported for Active Directory
objects by cmdlets such as `New-ADUser`, `Get-ADOrganizationalUnit`,
`Set-ADComputer`, and `Remove-ADUser`.

Account and Password Policy Management are supported by cmdlets such as
`Enable-ADAccount`, `Unlock-ADAccount`, `New-ADServiceAccount`,
`Set-ADAccountControl`, and `Remove-ADFineGrainedPasswordPolicy`.

Domain and Forest Management is supported by cmdlets such as `Get-ADForest`,
`Set-ADForest`, `Set-ADForestMode`, `Enable-ADOptionalFeature`,
`Get-ADDomainController`, and `Get-ADDomain`.

### Listing the Active Directory Module Cmdlets

To get a list of all of the Active Directory module cmdlets, run

```powershell
Get-Command -Module ActiveDirectory
```

### Getting Started

Getting started with the Active Directory module for Windows PowerShell is as
easy as clicking the following shortcut:

Run the following command in any Windows PowerShell prompt to import the Active
Directory module:

```powershell
Import-Module ActiveDirectory
```

### Overview and Conceptual Topics

The first two of these topics offer a high level overview of the Active
Directory module and the Active Directory Provider.

- For a brief introduction to the Active Directory provider for Windows
PowerShell, see [ActiveDirectory](/powershell/module/activedirectory).
- The following topics are conceptual support topics for the Active Directory
module cmdlets.
- For an introduction to the **Identity** parameter, which is used by the
Active Directory module cmdlets to identify objects in the directory, see
[about_ActiveDirectory_Identity](about_ActiveDirectory_Identity.md).
- For an introduction to the **Filter** parameter which is used by Active
Directory module cmdlets to search for objects in the directory, see
[about_ActiveDirectory_Filter](about_ActiveDirectory_Filter.md).
- For an introduction to the .NET Framework-based object model implemented by
the Active Directory module, see
[about_ActiveDirectory_ObjectModel](about_ActiveDirectory_ObjectModel.md).
Loading

0 comments on commit fe72922

Please sign in to comment.