Refinements 2

Author: KathrynEE

docs/cross-service/toc.yml

@@ -36,6 +36,8 @@
     href: ../project/work-across-projects-faqs.yml?toc=/azure/devops/cross-service/toc.json&bc=/azure/devops/cross-service/breadcrumb/toc.json
 - name: Public projects
   href: ../organizations/public/toc.yml
+- name: Notifications
+  href: ../notifications/toc.yml
 - name: Azure Boards & GitHub
   href: ../boards/github/toc.yml
 - name: Microsoft Teams & Slack integration
@@ -72,8 +74,6 @@
     href: ../marketplace-extensibility/index.yml
   - name: Settings & Usage
     href: ../organizations/index.yml
-  - name: Notifications
-    href: ../notifications/about-notifications.md
   - name: Azure Boards
     href:  ../boards/index.yml
   - name: Analytics & reporting

docs/includes/get-started/add-project-administrators.md

@@ -7,7 +7,7 @@ ms.date: 02/25/2022
 ---
 
 
-The person who creates a project is automatically added as a member to the **Project Administrators** group. Members of this group have permissions to manage project configuration, repositories, pipeline resources, teams, and all project permissions. 
+The person who creates a project is automatically added as a member to the **Project Administrators** group. Members of this group have permissions to manage project configuration, repositories, pipeline resources, teams, and all project-level permissions. 
 
 It's always a good idea to have more than one person who has administrative privileges. To add a user to this group, see [Change permissions at the project level, Add members to the Project Administrators group](../../organizations/security/change-project-level-permissions.md#add-members-to-the-project-administrators-group).
 

docs/includes/get-started/review-notifications.md

@@ -3,7 +3,7 @@ ms.technology: devops-new-user
 ms.author: kaelli
 author: KathrynEE
 ms.topic: include
-ms.date: 02/25/2022
+ms.date: 02/28/2022
 ---
 
 
@@ -12,10 +12,9 @@ ms.date: 02/25/2022
 A number of notifications are predefined for each project you add. Notifications are based on subscription rules. Subscriptions arise from the following areas:
 
 - [Out-of-the-box or default subscriptions](../../notifications/oob-built-in-notifications.md).
-- [Team, organization, and collection-level notifications](../../notifications/manage-team-group-global-organization-notifications.md), managed by a team administrator or member of the Project Collection Administrators group.
-- Project notifications, managed by a member of the Project Administrators group.
+- [Team, project, and organization or collection subscriptions](../../notifications/manage-team-group-global-organization-notifications.md) defined by a team administrator or member of the **Project Administrators** or **Project Collection Administrators** groups. 
 
-If users believe they're getting too many notifications, direct them to [opt out of a subscription](../../notifications/manage-your-personal-notifications.md).
+If users believe they're getting too many notifications, you can direct them to [opt out of a subscription](../../notifications/manage-your-personal-notifications.md).
 
 > [!div class="mx-imgBorder"]  
 > ![Personal notifications](../../user-guide/media/services/personal-notifications.png)   

docs/includes/get-started/share-project-vision.md

@@ -8,15 +8,15 @@ ms.date: 02/25/2022
 
 
 
-::: moniker range=">= tfs-2015"
+::: moniker range=">= tfs-2018"
 
-## Share your project vision  
+## Share your project vision, set up a project wiki 
 
 ::: moniker-end
 
 ::: moniker range="azure-devops"  
 
-Each project has a summary page that's useful for sharing information through **README** files. Or, redirect users to a project Wiki. For users who are new to your project, we recommend that you [set up your project summary page](../../organizations/projects/project-vision-status.md) or [provision a Wiki](../../project/wiki/wiki-create-repo.md). Use these features to share established processes and procedures for your project.
+Each project has a summary page that's useful for sharing information through **README** files. Or, redirect users to a project Wiki. For users who are new to your project, we recommend that you [set up your project summary page](../../organizations/projects/project-vision-status.md). Or, you can [provision a Wiki](../../project/wiki/wiki-create-repo.md). Use these features to share established processes and procedures for your project. 
 
 ::: moniker-end  
 
@@ -25,8 +25,9 @@ Each project has a summary page that's useful for sharing information through **
 
 ::: moniker-end
 
+::: moniker range="tfs-2018" 
 
-::: moniker range=">= tfs-2015 < tfs-2018"  
+## Share your project vision   
 Each project has a summary page that's useful for sharing information through **README files**. You can use this page to share information relevant to your project. To learn more, see [set up your project summary page](../../organizations/projects/project-vision-status.md). 
 
 ::: moniker-end

docs/notifications/manage-team-group-global-organization-notifications.md

@@ -1,36 +1,40 @@
 ---
-title: Manage notifications for a team, group, global organization
-titleSuffix: Azure DevOps
-description: Learn how to get global organization, team, and group notifications when changes occur to source code, git, work items, and builds in Azure DevOps.  
+title: Manage notifications for a team, project, organization or collection
+titleSuffix: Azure DevOps 
+description: Learn how to configure team, project, and organization/collection notifications for when changes occur to source code, git, work items, and builds in Azure DevOps.  
 ms.technology: devops-collab
 ms.assetid: 6edc44d0-2729-46f5-8108-c8a5160a6a7a
 ms.custom: contperf-fy21q2, cross-project
-ms.reviewer: wismythe
 ms.author: chcomley
 author: chcomley
 ms.topic: how-to
 ms.date: 10/09/2020
 monikerRange: '<= azure-devops'
 ---
 
-# Manage notifications for a team, group, or organization
+# Manage notifications for a team, project, or organization
 
 [!INCLUDE [version-lt-eq-azure-devops](../includes/version-lt-eq-azure-devops.md)]
 
-Your team or group can receive email notifications as changes occur to the following items in Azure DevOps:
+Your team, project, or organization can receive email notifications as changes occur to the following items in Azure DevOps:
 - work items 
 - code reviews
 - pull requests
 - source control files
 - builds
 
-For example, when a high priority work item is assigned to your team's area path, a notification email gets sent to the team.
+For example, when a high priority work item is assigned to your team's area path, a notification email gets sent to the team. For more information, see [Notification types](about-notifications.md#notification-types).
 
 [!INCLUDE [note-earlier-tfs-version](includes/note-earlier-tfs-version.md)]
 
 ## Prerequisites
 
-You must be a Team-, Project-, or Project Collection Administrator to create group and team notifications. If you're not an administrator, [get added as one](../organizations/settings/add-team-administrator.md). For more information, see [Notification types](about-notifications.md#notification-types).
+- To manage notifications, you must be an administrator at the level you want to manage them:
+	- Team administrator to modify subscription for a team
+	- A member of the **Project Administrators** group to create or modify subscriptions for a project.  
+	- A member of the **Project Collection Administrators** group to create or modify subscriptions for an organization orcollection.  
+
+	If you're not an administrator, get added as one. See [Add a team administrator](../organizations/settings/add-team-administrator.md), [Change permissions at the project-level](../organizations/security/change-project-level-permissions.md), or [Change permissions at the organization or collection-level](../organizations/security/change-organization-collection-level-permissions.md). 
 
 [!INCLUDE [note-smtp-server](includes/note-smtp-server.md)]
 

docs/user-guide/manage-organization-collection.md

@@ -91,7 +91,7 @@ Access to select tasks is controlled by permissions and security groups.
 To learn more about security and setting permissions at the collection-level, review the following articles:
 
 - [Get started with permissions, access, and security groups](../organizations/security/about-permissions.md)   
-- [Change permissions at the organization or collection-level](../organizations/security/change-organization-collection-level-permissions.md) 
+- [Change permissions at the organization or collection-level](../organizations/security/change-organization-collection-level-permissions.md). 
 
 
 ### Add members to the Project Collection Administrators group 
@@ -189,25 +189,37 @@ The following features are only enabled or disabled at the organization-level:
 
 ::: moniker-end 
 
-[!INCLUDE [install-manage-extensions](../includes/get-started/install-manage-extensions.md)] 
+ 
+  
+## Install and manage extensions 
+
+An extension is an installable unit that adds new capabilities to your projects. Azure DevOps extensions support the following functions:
+
+- Planning and tracking of work items, sprints, scrums, and so on  
+- Build and release flows
+- Code testing and tracking
+- Collaboration among team members
+
+ 
 
-::: moniker range=">= tfs-2015"
+For example, to support [code search](../project/search/functional-code-search.md), install the [Code Search extension](https://marketplace.visualstudio.com/items?itemName=ms.vss-code-search).
+ 
+You want to tell your users about extensions and that they can [request an extension](../marketplace/request-extensions.md). To install and manage extensions, you must be an organization Owner, a member of the **Project Collection Administrators** group. Or, you can get added to the [Manager role for extensions](../marketplace/how-to/grant-permissions.md).
+  
 
 ### Install Code Search 
 
 Code Search is a free Marketplace extension that you must install to enable searching across all your source repositories. To learn how, see [Install and configure Search](../project/search/install-configure-search.md).
-::: moniker-end 
-
 
 ::: moniker range=">= azure-devops-2019 < azure-devops"
 
 ### Enable or disable Analytics
 
-Analytics is ...  . To learn more, see [Install or enable the Analytics service](../report/dashboards/analytics-extension.md).
-::: moniker-end 
+The Analytics service is the reporting platform for Azure DevOps, replacing the previous platform based on SQL Server Reporting Services. Built for reporting, Analytics is optimized for fast read-access and server-based aggregations. Use it to answer quantitative questions about the past or present state of your projects.
 
+To learn more, see [What is the Analytics service?](../report/powerbi/what-is-analytics.md) and [Install or enable the Analytics service](../report/dashboards/analytics-extension.md).
+::: moniker-end 
 
- 
 ::: moniker range="azure-devops"
 
 ## Adjust time zone and other organization settings
@@ -219,30 +231,18 @@ When you create an organization, you specify the name of your organization and s
 
 ::: moniker-end 
 
-::: moniker range=">= tfs-2015"  
-
-## Set DevOps policies 
-
-Set policies to support collaboration across your teams, secure your projects, and automatically remove obsolete files. To set policies, review the following articles: 
-
-::: moniker-end  
-
-::: moniker range=">= azure-devops-2019"
-
-- [Manage branch policies](../repos/git/branch-policies.md)  
-- [Add Team Foundation Version Control (TFVC) check-in policies](../repos/tfvc/add-check-policies.md)  
-- [Set build and release pipeline retention policies](../pipelines/policies/retention.md) 
-- [Set test retention policies](../test/how-long-to-keep-test-results.md) 
-::: moniker-end  
+ 
 
-::: moniker range=">= tfs-2015 <= tfs-2018"
+## Configure DevOps settings 
 
-- [Manage branch policies](../repos/git/branch-policies.md)  
-- [Add TFVC check-in policies](../repos/tfvc/add-check-policies.md)  
-- [Set build and release pipeline retention policies](../pipelines/policies/retention.md) 
-- [Set test retention policies](../test/how-long-to-keep-test-results.md) 
-::: moniker-end  
+There are a few settings that you define at the organization-level to support devops work. These include the following items: 
 
+- [Add agent pools](../pipelines/agents/pools-queues.md)
+- [Define pipeline retention settings](../pipelines/policies/retention.md#set-collection-level-retention-policies)
+- Define repository settings:
+	- [Default branch name for new repositories](../repos/git/repository-settings.md#default-branch-name)
+	- [Gravatar images](../repos/git/repository-settings.md#gravatar-images).
+ 
 
 ## Customize work-tracking processes
 
@@ -258,7 +258,7 @@ To learn more, see the following articles:
 
 ::: moniker-end  
 
-::: moniker range="<= tfs-2018"
+::: moniker range="tfs-2018"
 
 All work-tracking tools are available immediately after you create a project. Often, one or more users may want to customize the experience to meet one or more business needs. But, you may want to establish a methodology for who manages the updates and evaluates requests.
 
@@ -269,17 +269,10 @@ To learn more, see [On-premises XML process model](../reference/on-premises-xml-
 
 ## Review and update notifications
 
-A number of notifications are predefined at the organization or collection level. Notifications are based on subscription rules which you can modify. Subscriptions arise from the following areas:
-
-
-global-notifications.png
+A number of notifications are predefined at the organization or collection level. You can disable or modify these subscriptions, or add new subscriptions as described in [Manage notifications for a team, project, or organization](../../notifications/manage-team-group-global-organization-notifications.md).  
+ 
 :::image type="content" source="../media/global-notifications.png" alt-text="Screenshot of Azure DevOps global notifications.":::
-
-If users believe they're getting too many notifications, direct them to [opt out of a subscription](../notifications/manage-your-personal-notifications.md).
-
-> [!div class="mx-imgBorder"]  
-> ![Personal notifications](media/services/personal-notifications.png)   
-
+ 
 
 ::: moniker range="< azure-devops"  
 
@@ -292,15 +285,11 @@ In order for team members to receive notifications, [you must configure an SMTP
 
 ## Scale your organization or collection  
 
-- [Plan your organizational structure](plan-your-azure-devops-org-structure.md)  
+To learn about scaling your organization, review the following articles. 
+
 - [About projects and scaling your organization](../organizations/projects/about-projects.md)
+- [Plan your organizational structure](plan-your-azure-devops-org-structure.md)  
 
-
-## Next steps  
-
-> [!div class="nextstepaction"]
-> [Share your project vision](../organizations/projects/project-vision-status.md)
-
 ## Related articles
 
 ::: moniker range="azure-devops"  

docs/user-guide/project-admin-tutorial.md

@@ -41,7 +41,7 @@ Access to select tasks is controlled by permissions and security groups. To quic
 To learn more about security and setting permissions at the project-level, review the following articles:
 
 - [Get started with permissions, access, and security groups](../organizations/security/about-permissions.md)   
-- [Change permissions at the organization or collection-level](../organizations/security/change-project-level-permissions.md) 
+- [Change permissions at the project-level](../organizations/security/change-project-level-permissions.md) 
 
 ### Add members to the Project Administrators group 
 
@@ -69,6 +69,10 @@ As a member of the **Project Administrators** group, you can grant or restrict p
 - [Set object-level permissions](../organizations/security/set-object-level-permissions.md) 
 
 
+[!INCLUDE [review-notifications](../includes/get-started/review-notifications.md)] 
+
+[!INCLUDE [determine-traceability-requirements](../includes/get-started/determine-traceability-requirements.md)]  
+
 ## Set DevOps policies 
 
 Set policies to support collaboration across your teams and automatically remove obsolete files. To set policies that govern Azure Repos, Azure Pipelines, and Azure Test Plans, review the following articles: 
@@ -111,10 +115,6 @@ To learn more, see [On-premises XML process model](../reference/on-premises-xml-
 
 ::: moniker-end
 
-[!INCLUDE [review-notifications](../includes/get-started/review-notifications.md)] 
-
-[!INCLUDE [determine-traceability-requirements](../includes/get-started/determine-traceability-requirements.md)]  
-
 
 ## Integrate with other services