Improve MR docs from suggestions

Fix old content and improve structure, and remove
repetition. Also brings back content deleted by accident

doc/user/group/index.md

@@ -75,7 +75,7 @@ By doing so:
 ## Issues and merge requests within a group
 
 Issues and merge requests are part of projects. For a given group, you can view all of the
-[issues](../project/issues/index.md#issues-list) and [merge requests](../project/merge_requests/reviewing_and_managing_merge_requests.md#view-group-merge-requests) across all projects in that group,
+[issues](../project/issues/index.md#issues-list) and [merge requests](../project/merge_requests/reviewing_and_managing_merge_requests.md#view-merge-requests-for-all-projects-in-a-group) across all projects in that group,
 together in a single list view.
 
 ### Bulk editing issues and merge requests

doc/user/index.md

@@ -50,10 +50,10 @@ GitLab is a Git-based platform that integrates a great number of essential tools
 With GitLab Enterprise Edition, you can also:
 
 - Provide support with [Service Desk](project/service_desk.md).
-- Improve collaboration with
-  [Merge Request Approvals](project/merge_requests/merge_request_approvals.md) **(STARTER)**,
-  [Multiple Assignees for Issues](project/issues/multiple_assignees_for_issues.md) **(STARTER)**,
-  and [Multiple Issue Boards](project/issue_board.md#multiple-issue-boards).
+- Improve collaboration with:
+  - [Merge Request Approvals](project/merge_requests/merge_request_approvals.md). **(STARTER)**
+  - [Multiple Assignees for Issues](project/issues/multiple_assignees_for_issues.md). **(STARTER)**
+  - [Multiple Issue Boards](project/issue_board.md#multiple-issue-boards).
 - Create formal relationships between issues with [Related Issues](project/issues/related_issues.md).
 - Use [Burndown Charts](project/milestones/burndown_charts.md) to track progress during a sprint or while working on a new version of their software.
 - Leverage [Elasticsearch](../integration/elasticsearch.md) with [Advanced Global Search](search/advanced_global_search.md) and [Advanced Syntax Search](search/advanced_search_syntax.md) for faster, more advanced code search across your entire GitLab instance.

doc/user/project/merge_requests/creating_merge_requests.md

@@ -17,9 +17,9 @@ branch that contain your changes, and the target project and branch where you wa
 the changes into. Click on **Compare branches and continue** to go to the next step
 and start filling in the merge request details.
 
-When viewing the commits on a branch in **Repository > Commits**, you can click on
-the **Create merge request** button, and a new merge request will be started using
-the current branch as the source, and `master` in the current project as the target.
+When viewing the commits on a branch other than master in **Repository > Commits**, you
+can click on the **Create merge request** button, and a new merge request will be started
+using the current branch as the source, and `master` in the current project as the target.
 
 If you have recently pushed changes to GitLab, the **Create merge request** button will
 also appear in the top right of the:
@@ -62,7 +62,8 @@ description which will set it to [automatically close the issue](../issues/manag
 when merged.
 
 If the issue is [confidential](../issues/confidential_issues.md), you may want to
-use an alternative workflow for [merge requests for confidential issues](../issues/confidential_issues.md#merge-requests-for-confidential-issues).
+use a different workflow for [merge requests for confidential issues](../issues/confidential_issues.md#merge-requests-for-confidential-issues),
+to prevent confidential information from being exposed.
 
 ## Assignee
 
@@ -111,13 +112,6 @@ request widget will show the "Deletes source branch" text.
 
 ![Delete source branch status](img/remove_source_branch_status.png)
 
-When a user opens a merge request from a fork, they are given the option to allow
-upstream maintainers to collaborate with them on the source branch. This allows
-the maintainers of the upstream project to make small fixes or rebase branches
-before merging, reducing the back and forth of accepting community contributions.
-
-[Learn more about allowing upstream members to push to forks.](allow_collaboration.md)
-
 ## Create new merge requests by email
 
 _This feature needs [incoming email](../../../administration/incoming_email.md)

doc/user/project/merge_requests/index.md

@@ -22,8 +22,11 @@ A. Consider you are a software developer working in a team:
 1. You work on the implementation optimizing code with [Code Quality reports](code_quality.md) **(STARTER)**
 1. You verify your changes with [JUnit test reports](../../../ci/junit_test_reports.md) in GitLab CI/CD
 1. You avoid using dependencies whose license is not compatible with your project with [License Compliance reports](../../application_security/license_compliance/index.md) **(ULTIMATE)**
-1. You request the [approval](merge_request_approvals.md) from your manager
-1. Your manager pushes a commit with their final review, [approves the merge request](merge_request_approvals.md), and sets it to [merge when pipeline succeeds](merge_when_pipeline_succeeds.md) (Merge Request Approvals are available in GitLab Starter)
+1. You request the [approval](merge_request_approvals.md) from your manager **(STARTER)**
+1. Your manager:
+   1. Pushes a commit with their final review
+   1. [Approves the merge request](merge_request_approvals.md) **(STARTER)**
+   1. Sets it to [merge when pipeline succeeds](merge_when_pipeline_succeeds.md)
 1. Your changes get deployed to production with [manual actions](../../../ci/yaml/README.md#whenmanual) for GitLab CI/CD
 1. Your implementations were successfully shipped to your customer
 
@@ -63,7 +66,7 @@ to be aware of:
 | [Git push options](../push_options.md)                                                                                                        | Use Git push options to create or update merge requests when pushing changes to GitLab with Git, without needing to use the GitLab interface.                                              |
 | [Labels](../../project/labels.md)                                                                                                             | Organize your issues and merge requests consistently throughout the project.                                                                                                               |
 | [Merge request approvals](merge_request_approvals.md) **(STARTER)**                                                                           | Set the number of necessary approvals and predefine a list of approvers that will need to approve every merge request in a project.                                                        |
-| [Merge Request Dependencies](merge_request_dependencies.md) **(PREMIUM)**                                                                     | Specify that a merge request depends on other merge requests, enforcing a desired order of merging.                                                                                        |
+| [Merge Request dependencies](merge_request_dependencies.md) **(PREMIUM)**                                                                     | Specify that a merge request depends on other merge requests, enforcing a desired order of merging.                                                                                        |
 | [Merge Requests for Confidential Issues](../issues/confidential_issues.md#merge-requests-for-confidential-issues)                             | Create merge requests to resolve confidential issues for preventing leakage or early release of sensitive data through regular merge requests.                                             |
 | [Milestones](../../project/milestones/index.md)                                                                                               | Track merge requests to achieve a broader goal in a certain period of time.                                                                                                                |
 | [Multiple assignees](creating_merge_requests.md#multiple-assignees-starter) **(STARTER)**                                                     | Have multiple assignees for merge requests to indicate everyone that is reviewing or accountable for it.                                                                                   |
@@ -81,8 +84,7 @@ all the merge requests in a group or project. When [reviewing or managing merge
 there are a number of features to be aware of:
 
 | Feature                                                                                                                                               | Description                                                                                                                                              |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [Allow collaboration](allow_collaboration.md)                                                                                                         | Allow the members of an upstream project to make small fixes or rebase branches before merging, reducing the back and forth of accepting external contributions. |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [Bulk editing merge requests](../../project/bulk_editing.md)                                                                                          | Update the attributes of multiple merge requests simultaneously.                                                                                         |
 | [Cherry-pick changes](cherry_pick_changes.md)                                                                                                         | Cherry-pick any commit in the UI by simply clicking the **Cherry-pick** button in a merged merge requests or a commit.                                   |
 | [Commenting on any file line in merge requests](reviewing_and_managing_merge_requests.md#commenting-on-any-file-line-in-merge-requests)               | Make comments directly on the exact line of a file you want to talk about.                                                                               |
@@ -104,7 +106,7 @@ there are a number of features to be aware of:
 | [Suggest changes](../../discussions/index.md#suggest-changes)                                                                                         | Add suggestions to change the content of merge requests directly into merge request threads, and easily apply them to the codebase directly from the UI. |
 | [Time Tracking](../time_tracking.md#time-tracking)                                                                                                    | Add a time estimation and the time spent with that merge request.                                                                                        |
 | [View changes between file versions](reviewing_and_managing_merge_requests.md#view-changes-between-file-versions)                                     | View what will be changed when a merge request is merged.                                                                                                |
-| [View group merge requests](reviewing_and_managing_merge_requests.md#view-group-merge-requests)                                                       | List and view the merge requests within a group.                                                                                                                 |
+| [View group merge requests](reviewing_and_managing_merge_requests.md#view-merge-requests-for-all-projects-in-a-group)                                 | List and view the merge requests within a group.                                                                                                         |
 | [View project merge requests](reviewing_and_managing_merge_requests.md#view-project-merge-requests)                                                   | List and view the merge requests within a project.                                                                                                       |
 
 ## Testing and reports in merge requests

doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md

@@ -17,7 +17,7 @@ and you can use the tabs available to quickly filter by open and closed. You can
 
 ![Project merge requests list view](img/project_merge_requests_list_view.png)
 
-## View group merge requests
+## View merge requests for all projects in a group
 
 View merge requests in all projects in the group, including all projects of all descendant subgroups of the group. Navigate to **Group > Merge Requests** to view these merge requests. This view also has the open and closed merge requests tabs.
 
@@ -36,9 +36,10 @@ option under **Merge Requests: Merge method** and save your changes.
 
 ## View changes between file versions
 
-The **Changes** tab at the bottom of a merge request shows the changes to files between branches or
-commits. This view of changes to a file is also known as a **diff**. By default, the diff view
-compares the file in the merge request branch and the file in the target branch.
+The **Changes** tab, below the main merge request details and next to the discussion tab,
+shows the changes to files between branches or commits. This view of changes to a
+file is also known as a **diff**. By default, the diff view compares the file in the
+merge request branch and the file in the target branch.
 
 The diff view includes the following:
 

doc/user/project/merge_requests/versions.md

@@ -35,6 +35,17 @@ changes appears as a system note.
 
 ![Merge request versions system note](img/versions_system_note.png)
 
+## Find the merge request that introduced a change
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/2383) in GitLab 10.5.
+
+When viewing the commit details page, GitLab will link to the merge request (or
+merge requests, if it's in more than one) containing that commit.
+
+This only applies to commits that are in the most recent version of a merge
+request - if a commit was in a merge request, then rebased out of that merge
+request, they will not be linked.
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues