Skip to content

Commit

Permalink
Merge pull request #11115 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
5/15/2024 PM Publish
  • Loading branch information
Taojunshen committed May 15, 2024
2 parents dadf154 + d53bb6c commit f08f5da
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
10 changes: 10 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Microsoft Open Source Code of Conduct

This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).

Resources:

- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
- Employees can reach out at [aka.ms/opensource/moderation-support](https://aka.ms/opensource/moderation-support)
17 changes: 8 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,23 @@ Welcome to the PowerShell-Docs repository, the home of the official PowerShell d

## Microsoft Open Source Code of Conduct

This project has adopted the [Microsoft Open Source Code of Conduct][04]. For more information see
the [Code of Conduct FAQ][05] or contact [opencode@microsoft.com][06] with any additional questions
or comments.
This project has adopted the [Microsoft Open Source Code of Conduct][04].

## Build Status

[live-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=live
[main-badge]: https://powershell.visualstudio.com/PowerShell-Docs/_apis/build/status/PowerShell-Docs-CI?branchName=main

## Build Status

| live branch | main branch |
| :---------------------------- | :---------------------------- |
| [![live-badge][]][live-badge] | [![main-badge][]][main-badge] |

## PowerShell Updatable Help (CabGen) CI Build Status

[![Build Status](https://apidrop.visualstudio.com/Content%20CI/_apis/build/status/PROD/CabGen(PowerShell_Updatable_Help)/GitHub_MicrosoftDocs_PowerShell-Docs/6ff7e8c3-dfc6-3ebd-da5a-d5e2ff43de8f_cabgen_Publish-Updatable-Help?repoName=MicrosoftDocs%2FPowerShell-Docs&branchName=live)](https://apidrop.visualstudio.com/Content%20CI/_build/latest?definitionId=5076&repoName=MicrosoftDocs%2FPowerShell-Docs&branchName=live)
[![Build Status][cabgen-status]][cabgen-log]

[cabgen-status]: https://apidrop.visualstudio.com/Content%20CI/_apis/build/status/PROD/CabGen(PowerShell_Updatable_Help)/GitHub_MicrosoftDocs_PowerShell-Docs/6ff7e8c3-dfc6-3ebd-da5a-d5e2ff43de8f_cabgen_Publish-Updatable-Help?repoName=MicrosoftDocs%2FPowerShell-Docs&branchName=live
[cabgen-log]: https://apidrop.visualstudio.com/Content%20CI/_build/latest?definitionId=5076&repoName=MicrosoftDocs%2FPowerShell-Docs&branchName=live

## Repository Structure

Expand Down Expand Up @@ -75,6 +76,4 @@ repo. The Creative Commons license applies to the documentation.
[01]: https://learn.microsoft.com/powershell/scripting/
[02]: https://aka.ms/PSDocsContributor
[03]: https://cla.microsoft.com/
[04]: https://opensource.microsoft.com/codeofconduct/
[05]: https://opensource.microsoft.com/codeofconduct/faq/
[06]: mailto:opencode@microsoft.com
[04]: CODE_OF_CONDUCT.md

0 comments on commit f08f5da

Please sign in to comment.