Resolve syncing conflicts from repo_sync_working_branch to main

CONTRIBUTING.md

@@ -1,26 +1,31 @@
-# Contributing to Microsoft DAX and Power Query M Reference documentation
-
-## Providing feedback
-
-Whether you have a GitHub account or not, you can use the thumb up, thumb down icons at the top-right of most articles to rate and provide feedback. Your rating and feedback is anonymous. Feedback is reviewed and changes may be made based on your feedback, but no response is provided directly to you.
-
-## Editing in GitHub
-
-Refer to the [Microsoft Docs contributors guide](https://docs.microsoft.com/contribute) to learn more about using GitHub Editor and Git and markdown tools to submit a pull request (PR) for documentation changes.
-
-### DAX Reference
-
-The DAX Reference allows Quick edits by using the in-browser GitHub editor and more detailed edits by using Git and markdown tools.
-
-### Power Query M Reference
-
-The Power Query M function reference is mostly created through an automated process from in-product help. At this time, the Power Query M function reference does not allow Quick edits by using the in-browser GitHub editor.
-
-### Recognition
-
-If your changes are accepted, your GitHub account ID is shown as a contributor at the top of the article.
-
-## Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+# Contributing to Microsoft DAX and Power Query M Reference documentation
+
+## Providing feedback
+
+Whether you have a GitHub account or not, you can use the thumb up, thumb down icons at the top-right of most articles to rate and provide feedback. Your rating and feedback is anonymous. Feedback is reviewed and changes may be made based on your feedback, but no response is provided directly to you.
+
+## Editing in GitHub
+
+Refer to the [Microsoft Docs contributors guide](https://docs.microsoft.com/contribute) to learn more about using GitHub Editor and Git and markdown tools to submit a pull request (PR) for documentation changes.
+
+### DAX Reference
+
+The DAX Reference allows Quick edits by using the in-browser GitHub editor and more detailed edits by using Git and markdown tools.
+
+### Power Query M Reference
+
+The Power Query M function reference is primarily created through an automated process from in-product help. At this time, the Power Query M function reference does not have the edit (Pencil) Quick edits button at the top-right of the main frame of each page enabled. External contributions must be made by using the GitHub editor from the or by Git and markdown tools from the root of the query-docs repo.
+
+### Merge and publish process
+
+All contributions are thoroughly vetted and must meet strict technical accuracy and grammar requirements before being merged into the public repo. Once merged, it can still take several days for changes to be shown in live documentation.
+
+### Recognition
+
+If your changes are accepted, your GitHub account ID is shown as a contributor at the top of the article.
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+
 For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/), or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

README.md

@@ -1,18 +1,16 @@
-# Microsoft Data Analysis Expressions (DAX) Power Query M language references README
-
-Welcome to the DAX and Power Query M language references. Please review this README to learn more about how you can contribute to documentation on the open-source Microsoft Docs platform. 
-
-## Contribute
-
-To learn about how you can help improve documentation, see [Contributing to Microsoft DAX and Power Query M Reference documentation](https://github.com/MicrosoftDocs/query-docs/blob/main/CONTRIBUTING.md).
-
-## Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-
-## License
-
-Refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
-
-
+# Microsoft Data Analysis Expressions (DAX) Power Query M language references README
+
+Welcome to the DAX and Power Query M language references. Please review this README to learn more about how you can contribute to documentation on the open-source Microsoft Docs platform. 
+
+## Contribute
+
+To learn about how you can help improve documentation, see [Contributing to Microsoft DAX and Power Query M Reference documentation](https://github.com/MicrosoftDocs/query-docs-pr/blob/main/CONTRIBUTING.md).
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
+
+## License
+
+Refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE) and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.