Merge branch 'main' into maccruz-readerrole

Author: schmurky

.acrolinx-config.edn

@@ -1,5 +1,5 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["microsoft-365/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
+ :allowed-filename-matches ["microsoft-365/" "copilot/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
 
  :use-gh-statuses true
 

.openpublishing.redirection.json

@@ -204,6 +204,16 @@
          "source_path":"microsoft-365/scheduler/index.yml",
          "redirect_url":"https://news.microsoft.com/reinventing-productivity",
          "redirect_document_id":false
+      },
+      {
+         "source_path":"microsoft-365/admin/copilot/m365-copilot-setup.md",
+         "redirect_url":"/microsoft-365-copilot/microsoft-365-copilot-setup",
+         "redirect_document_id":false
+      },
+      {
+         "source_path":"microsoft-365/admin/copilot/m365-early-access-program.yml",
+         "redirect_url":"/microsoft-365-copilot/microsoft-365-early-access-program",
+         "redirect_document_id":false
       }
 
     ]

.openpublishing.redirection.security.json

@@ -2805,6 +2805,11 @@
          "redirect_url":"/microsoft-365/business-premium/m365bp-mdb-maintain-environment",
          "redirect_document_id":true
        },
+       {
+         "source_path":"microsoft-365/security/intelligence/microsoft-bug-bounty-program.md",
+         "redirect_url":"https://www.microsoft.com/msrc/bounty?rtc=1",
+         "redirect_document_id":false
+      },
        {
          "source_path":"microsoft-365/security/defender-endpoint/specify-additional-definitions-network-traffic-inspection-mdav.md",
          "redirect_url":"/microsoft-365/security/defender-endpoint/network-protection",

README.md

@@ -1,69 +1,83 @@
 ---
-ms.date: 01/04/2018
+ms.date: 9/15/2023
 ---
+
 # Overview
 
 ## Learn how to contribute
 
-Anyone who is interested can contribute to the topics. When you contribute, your work will go directly into the content set after being merged. It will then be published to [Microsoft Learn](https://learn.microsoft.com/) and you will be listed as a contributor at: <https://github.com/MicrosoftDocs/microsoft-365-docs/graphs/contributors>.
+Anyone who is interested can contribute to the articles. When you contribute, your work goes into the content set after it's been reviewed and merged. It's then published to [Microsoft Learn](https://learn.microsoft.com/), and you're listed as a contributor at: <https://github.com/MicrosoftDocs/microsoft-365-docs/graphs/contributors>.
 
 ### Quickly update an article using GitHub.com
 
-Contributors who only make infrequent or small updates can edit the file directly on GitHub.com without having to install any additional software. This article shows you how. [This two-minute video](https://www.microsoft.com/videoplayer/embed/RE1XQTG) also covers how to contribute.
+Contributors who make infrequent or small updates can edit the file directly on GitHub.com without installing any software. This article shows you how. [This two-minute video](https://www.microsoft.com/videoplayer/embed/RE1XQTG) also covers how to contribute.
+
+> [!TIP]
+> To edit an article, you need to get to it on the GitHub.com backend. If you're already on the GitHub.com page of the article, you're starting at step 4.
+>
+> Your permissions in the repo determine what you see in step 5 and later. People with no special privileges see the steps as described. People with permissions to approve their own pull requests see a similar experience with different button and page titles (for example, **Commit changes** instead of **Propose changes**), extra options for creating a new branch, and fewer confirmation pages. The point is: click any green buttons that are presented to you until there are no more.
+
+1. Verify that you're signed in to GitHub.com with your GitHub account.
+2. On learn.microsoft.com, find the article that you want to update.
+3. Above the title of the article, select ![Edit this document icon.](microsoft-365/media/m365-cc-sc-edit-icon.png) **Edit this document**.
+
+   ![Screenshot of how to edit this document button on a learn.microsoft.com article.](microsoft-365/media/quick-update-edit-button-on-learn-page.png)
+
+4. The corresponding article file opens on GitHub. Select ![Edit this file icon.](microsoft-365/media/m365-cc-sc-edit-icon.png) **Edit this file**.
 
-1. Make sure you're signed in to GitHub.com with your GitHub account.
-2. Browse to the page you want to edit on Microsoft Learn.
-3. On the right-hand side of the page, click **Edit** (pencil icon).
+   ![Screenshot of how to edit this document button on a GitHub article file.](microsoft-365/media/quick-update-edit-button-on-github-page.png)
 
-   ![Edit button on Microsoft Learn.](https://learn.microsoft.com/compliance/media/quick-update-edit.png)
+5. The article file opens in a line-numbered editor page where you can make updates.
 
-4. The corresponding topic file on GitHub opens, where you need to click the **Edit this file** pencil icon.
+   Articles on learn.microsoft.com are formatted using the Markdown language. For help on using Markdown, see [Mastering Markdown.](https://guides.github.com/features/mastering-markdown/).
 
-   ![Edit button on github.com.](https://learn.microsoft.com/compliance/media/quick-update-github.png)
+   Select **Preview** to view your changes as you go. Select **Edit** to go back to making updates.
 
-5. The topic opens in a line-numbered editing page where you can make changes to the file. Files in GitHub are written and edited using Markdown language. For help on using Markdown, see [Mastering Markdown](https://guides.github.com/features/mastering-markdown/). Select the **Preview changes** tab to view your changes as you go.
+   When you're finished making changes, select the green **Commit changes** button.
 
-6. When you're finished making changes, go to the **Propose file change** section at the bottom of the page:
+   ![Screenshot of how to select the green Commit changes button on the article editor page.](microsoft-365/media/quick-update-editor-page.png)
 
-   - A brief title is required. By default, the title is the name of the file, but you can change it.
-   - Optionally, you can enter more details in the **Add an optional extended description** box.
+6. In the **Propose changes** dialog that opens, review and/or enter the following values:
+   - **Commit message**: This value is required. You can accept the default value ("Update \<filename\>") or you can change it.
+   - **Extended description**: This value is optional. For example:
+     - An explanation of the changes.
+     - @ include the GitHub alias of someone to review and merge your changes.
 
-   When you're ready, click the green **Propose file change** button.
+   When you're finished on the **Propose changes** dialog, select the green **Propose changes** button.
 
-   ![Propose file change section.](https://learn.microsoft.com/compliance/media/propose-file-change.png)
+   ![Screenshot of how to select the green Propose changes button in the Propose changes dialog.](microsoft-365/media/quick-update-propose-changes-dialog.png)
 
-7. On the **Comparing changes** page that appears, click the green **Create pull request** button.
+7. On the **Comparing changes** page that opens, select the green **Create pull request** button.
 
-   ![Comparing changes page.](https://learn.microsoft.com/compliance/media/comparing-changes-page.png)
+   ![Screenshot of how to select the green Create pull request button on the Comparing changes page.](microsoft-365/media/quick-update-comparing-changes-page.png)
 
-8. On the **Open a pull request** page that appears, click the green **Create pull request** button.
+8. On the **Open a pull request** page that opens, review the title and comments, and then select the green **Create pull request** button.
 
-   ![Open a pull request page.](https://learn.microsoft.com/compliance/media/open-a-pull-request-page.png)
+   ![Screenshot of how to select the green Create pull request button on the Open a pull request page.](microsoft-365/media/quick-update-open-a-pull-request-page.png)
 
-> [!NOTE]
-> Your permissions in the repo determine what you see in the last several steps. People with no special privileges will see the **Propose file change** section and subsequent confirmation pages as described. People with permissions to create and approve their own pull requests will see a similar **Commit changes** section with extra options for creating a new branch and fewer confirmation pages.<br/><br/>The point is: click any green buttons that are presented to you until there are no more.
+9. That's it. There's nothing more for you to do.
 
-The writer identified in the metadata of the topic will be notified and will eventually review and approve your changes so the topic will be updated on Microsoft Learn. If there are questions or issues with the updates, the writer will contact you.
+   The article owner (identified in metadata) is notified about the changes to the article. Eventually, the article owner or another party will review, possibly edit, and approve your changes. After your pull request is merged, the article is updated on learn.microsoft.com.
 
 ## Microsoft Open Source 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 [[email protected]](mailto:[email protected]) with any additional questions or comments.
+For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any questions or comments.
 
 ### Contributing
 
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit <https://cla.microsoft.com>.
 
-When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
+When you submit a pull request, a CLA-bot automatically determines whether you need to provide a CLA and decorate the PR appropriately (for example, label, comment). Follow the instructions provided by the bot. You only need to do this step once across all repos using our CLA.
 
 ### Legal Notices
 
 Microsoft and any contributors grant you a license to the Microsoft documentation and other content in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode), see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the [LICENSE-CODE](LICENSE-CODE) file.
 
-Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
+Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries/regions.
 
-The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks. Microsoft's general trademark guidelines can be found at <https://go.microsoft.com/fwlink/?LinkID=254653>.
+The licenses for this project don't grant you rights to use any Microsoft names, logos, or trademarks. Microsoft's general trademark guidelines can be found at <https://go.microsoft.com/fwlink/?LinkID=254653>.
 
 Privacy information can be found at <https://privacy.microsoft.com/>
 

copilot/TOC.yml

@@ -1,2 +1,21 @@
-- name: Index
-  href: index.md
+- name: Microsoft 365 Copilot documentation
+  href: index.yml
+  items:
+    - name: Get started with Microsoft 365 Copilot
+      href: microsoft-365-copilot-setup.md
+    - name: Plan
+      items: 
+        - name: Overview of Microsoft 365 Copilot
+          href: microsoft-365-copilot-overview.md
+        - name: Requirements for Microsoft 365 Copilot
+          href: microsoft-365-copilot-requirements.md
+        - name: Data, Privacy, and Security for Microsoft 365 Copilot
+          href: /DeployOffice/privacy/microsoft-365-copilot
+    - name: Deploy
+      items: 
+        - name: Enable users for Microsoft 365 Copilot
+          href: microsoft-365-copilot-enable-users.md
+    - name: Manage
+      items:
+        - name: Microsoft 365 Copilot usage report
+          href: /microsoft-365/admin/activity-reports/microsoft-365-copilot-usage

copilot/breadcrumb/toc.yml

@@ -1,3 +1,7 @@
-- name: '<please enter product name here>'
-  tocHref: /
-  topicHref: /
+- name: Microsoft 365
+  tocHref: /microsoft-365/
+  topicHref: /microsoft-365/index
+  items:
+  - name: Microsoft 365 Copilot
+    tocHref: /microsoft-365-copilot/
+    topicHref: /microsoft-365-copilot/index

copilot/docfx.json

@@ -42,10 +42,11 @@
     "globalMetadata": {
       "breadcrumb_path": "/microsoft-365-copilot/breadcrumb/toc.json",
       "feedback_system": "Standard",
-      "permissioned-type": "public"
+      "permissioned-type": "public",
+      "uhfHeaderId": "MSDocsHeader-M365-IT"
     },
     "fileMetadata": {},
     "template": [],
     "dest": "microsoft-365-copilot"
   }
-}
+}

copilot/includes/copilot-content-updates.md

@@ -0,0 +1,12 @@
+<!-- This file is generated automatically each week. Changes made to this file will be overwritten.-->
+
+
+
+## Week of September 18, 2023
+
+
+| Published On |Topic title | Change |
+|------|------------|--------|
+| 9/21/2023 | [Enable users for Microsoft 365 Copilot](/microsoft-365-copilot/microsoft-365-copilot-enable-users) | added |
+| 9/21/2023 | [Microsoft 365 Copilot overview](/microsoft-365-copilot/microsoft-365-copilot-overview) | added |
+| 9/21/2023 | [Microsoft 365 Copilot Requirements](/microsoft-365-copilot/microsoft-365-copilot-requirements) | added |

copilot/index.md

@@ -0,0 +1,67 @@
+### YamlMime:Hub
+
+title: Microsoft 365 Copilot documentation # < 60 chars
+summary: Learn about Microsoft 365 Copilot and how your organization can use this copilot for work. # < 160 chars
+brand: m365 # brand: aspnet | azure | bash | bizapps | bot-framework | dotnet | dynamics | education | enterprise-mobility | gaming | graph | m365 | nuget | office | powershell | playfab | power-apps | power-automate | power-bi | power-platform | power-virtual-agents | project | sharepoint | sql | surface | system-center | teams | visual-studio | windows | workplace-analytics | xamarin
+
+metadata:
+  title: Microsoft 365 Copilot documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
+  description: Learn about Microsoft 365 Copilot and how your organization can use this copilot for work. # Required; article description that is displayed in search results. < 160 chars.
+  ms.service: microsoft-365-copilot 
+  ms.topic: hub-page # Required
+  ms.collection: essentials-hub-or-landing # Optional; Remove if not applicable.
+  author: samanro #Required; your GitHub user alias, with correct capitalization.
+  ms.author: samanro #Required; microsoft alias of author; optional team alias.
+  ms.date: 09/21/2023 #Required; mm/dd/yyyy format.
+
+
+
+# additionalContent section (Optional; Remove if not applicable.)
+# Card with summary style
+additionalContent:
+  # Supports up to 4 subsections
+  sections:
+    - title: Get started with Microsoft 365 Copilot # < 60 chars (Optional; Remove if not applicable.)
+      items:
+        # Card
+        - title: Microsoft 365 Copilot overview
+          summary: Learn how Microsoft 365 Copilot works. 
+          url: microsoft-365-copilot-overview.md
+        # Card
+        - title: Copilot requirements
+          summary: Learn about Microsoft 365 Apps, network, and license requirements for Microsoft 365 Copilot. 
+          url: microsoft-365-copilot-requirements.md
+        # Card
+        - title: Setup
+          summary: Get started with Microsoft 365 Copilot in the Microsoft 365 Admin Center.
+          url: microsoft-365-copilot-setup.md
+        # Card
+        - title: Enable users
+          summary: Learn about the steps to deploy Microsoft 365 Copilot. 
+          url: microsoft-365-copilot-enable-users.md
+        # Card
+        - title: Data, Privacy, and Security for Microsoft 365 Copilot
+          summary: Learn how Microsoft 365 Copilot uses data and how it stores and protects that data. 
+          url: /deployoffice/privacy/microsoft-365-copilot
+        # Card
+        - title: End user help and learning for Microsoft 365 Copilot
+          summary: End users can explore how Copilot with the apps in Microsoft 365 can help boost their productivity.
+          url: https://support.microsoft.com/copilot
+    - title: Learn about Microsoft 365 Copilot # < 60 chars (Optional; Remove if not applicable.)
+      items:
+        # Card
+        - title: Overview video
+          summary: Watch an overview of Microsoft 365 Copilot.
+          url: https://www.youtube.com/watch?v=E5g20qmeKpg
+        # Card
+        - title: FAQ
+          summary: Review the Copilot FAQ.
+          url: https://support.microsoft.com/topic/frequently-asked-questions-ai-microsoft-365-copilot-and-microsoft-designer-987b275d-f6f2-4d5d-94c5-e927cffae705
+        # Card
+        - title: Service description
+          summary: Read the service description for what's included in Microsoft 365 Copilot.
+          url: /office365/servicedescriptions/office-365-platform-service-description/microsoft-365-copilot/
+        # Card
+        - title: Microsoft AI help & learning
+          summary: Help and learning for you and your users.
+          url: https://support.microsoft.com/microsoft-ai