Add latest changes from gitlab-org/gitlab@master

4 files changed, 24 insertions, 16 deletions

diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 47a3dae088d..f69aabf4d14 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -267,7 +267,7 @@ These Group Activity Analytics can be enabled with the `group_activity_analytics
 
 ### View group activity
 
-You can view the most recent actions taken in a group.
+You can view the most recent actions taken in a group, either in your browser or in an RSS feed:
 
 1. On the top bar, select **Menu > Groups**.
 1. Select **Your Groups**.
diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index cc0a1dccafd..9842b0820e6 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -43,7 +43,7 @@ To learn how the GitLab Strategic Marketing department uses GitLab issues with [
 - [Cross-link issues](crosslinking_issues.md)
 - [Bulk edit issues](../issues/managing_issues.md)
 - [Sort issue lists](sorting_issue_lists.md)
-- [Search for issues](../../search/index.md#filtering-issue-and-merge-request-lists)
+- [Search for issues](../../search/index.md#filter-issue-and-merge-request-lists)
 - [Epics](../../group/epics/index.md)
 - [Issue boards](../issue_board.md)
 - [Issues API](../../../api/issues.md)
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index b0c2b19416b..9de39a0617a 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -53,7 +53,7 @@ GitLab displays open merge requests, with tabs to filter the list by open and cl
 
 ![Project merge requests list view](img/project_merge_requests_list_view_v13_5.png)
 
-You can [search and filter](../../search/index.md#filtering-issue-and-merge-request-lists),
+You can [search and filter](../../search/index.md#filter-issue-and-merge-request-lists),
 the results, or select a merge request to begin a review.
 
 ## Merge request sidebar
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index bd7dd026583..7cf62f09303 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -27,8 +27,8 @@ When you click **Issues**, GitLab shows the opened issues assigned to you:
 
 You can search through **Open**, **Closed**, or **All** issues.
 
-You can also filter the results using the search and filter field, as described below in
-[Filtering issue and merge request lists](#filtering-issue-and-merge-request-lists).
+You can also filter the results using the search and filter field, as described in
+[Filter issue and merge request lists](#filter-issue-and-merge-request-lists).
 
 ### Issues and MRs assigned to you or created by you
 
@@ -37,11 +37,11 @@ in the search field in the upper right corner:
 
 ![shortcut to your issues and merge requests](img/issues_mrs_shortcut.png)
 
-### Filtering issue and merge request lists
+### Filter issue and merge request lists
 
-> - Filtering by Epics was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/195704) in GitLab Ultimate 12.9.
-> - Filtering by child Epics was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9029) in GitLab Ultimate 13.0.
-> - Filtering by Iterations was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118742) in GitLab 13.6. Moved to GitLab Premium in 13.9.
+> - Filter by Epics was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/195704) in GitLab Ultimate 12.9.
+> - Filter by child Epics was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9029) in GitLab Ultimate 13.0.
+> - Filter by Iterations was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118742) in GitLab 13.6. Moved to GitLab Premium in 13.9.
 
 Follow these steps to filter the **Issues** and **Merge Requests** list pages in projects and
 groups:
@@ -64,12 +64,13 @@ groups:
    - `!=`: Is not ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/18059) in GitLab 12.7)
 1. Enter the text to [filter the attribute by](#filters-autocomplete).
 1. Repeat this process to filter by multiple attributes. Multiple attributes are joined by a logical
-   `AND`.
+   `AND`. For example, filtering by an Author and Milestone `!=` 12.6 filters for the issues where the
+   author matches your selection, and the milestone is not 12.6:
 
-For example, filtering by Author `=` Jane and Milestone `!=` 12.6 filters for the issues where Jane
-is the author and the milestone is not 12.6.
+   ![filter issues in a project](img/issue_search_filter_v12_7.png)
 
-![filter issues in a project](img/issue_search_filter_v12_7.png)
+GitLab displays the results on-screen, but you can also
+[retrieve them as an RSS feed](#retrieve-search-results-as-feed).
 
 ### Filtering by **None** / **Any**
 
@@ -96,13 +97,20 @@ You can filter issues and merge requests by specific terms included in titles or
 
 ![filter issues by specific terms](img/issue_search_by_term.png)
 
-### Retrieving search results as feed
+### Retrieve search results as feed
 
 > Feeds for merge requests were [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66336) in GitLab 14.3.
 
-You can subscribe to the results of your search query for issues or merge requests within a project as an Atom feed by clicking on the feed symbol **{rss}**.
+GitLab provides RSS feeds of search results for your project. To subscribe to the
+RSS feed of search results:
 
-This will generate a feed URL containing both a feed token and your search query, which can be added to your feed reader.
+1. Go to your project's page.
+1. On the left sidebar, select **Issues** or **Merge requests**.
+1. Build your search query as described in [Filter issue and merge request lists](#filter-issue-and-merge-request-lists).
+1. Select the feed symbol **{rss}** to display the results as an RSS feed in Atom format.
+
+The URL of the result contains both a feed token, and your search query.
+You can add this URL to your feed reader.
 
 ### Filtering by ID