Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 23 deletions

diff --git a/doc/api/wikis.md b/doc/api/wikis.md
index 570fb2168b2..035a89d80a5 100644
--- a/doc/api/wikis.md
+++ b/doc/api/wikis.md
@@ -86,7 +86,7 @@ POST /projects/:id/wikis
 | `id`      | integer/string    | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
 | `content`       | string  | yes      | The content of the wiki page |
 | `title`        | string  | yes      | The title of the wiki page        |
-| `format` | string  | no       | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, and `asciidoc` |
+| `format` | string  | no       | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, `asciidoc` and `org` |
 
 ```bash
 curl --data "format=rdoc&title=Hello&content=Hello world" --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/wikis"
@@ -116,7 +116,7 @@ PUT /projects/:id/wikis/:slug
 | `id`      | integer/string    | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
 | `content`       | string  | yes if `title` is not provided     | The content of the wiki page |
 | `title`        | string  | yes if `content` is not provided      | The title of the wiki page        |
-| `format` | string  | no       | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, and `asciidoc` |
+| `format` | string  | no       | The format of the wiki page. Available formats are: `markdown` (default), `rdoc`, `asciidoc` and `org` |
 | `slug` | string  | yes       | The slug (a unique string) of the wiki page |
 
 ```bash
diff --git a/doc/user/project/merge_requests/getting_started.md b/doc/user/project/merge_requests/getting_started.md
index a1bc3232ed1..0ab8d31403e 100644
--- a/doc/user/project/merge_requests/getting_started.md
+++ b/doc/user/project/merge_requests/getting_started.md
@@ -26,7 +26,7 @@ it to GitLab, you have the option to create a **Merge Request**,
 which is essentially a _request_ to merge one branch into another.
 
 The branch you added your changes into is called _source branch_
-while the branch you'll request to merge your changes into is
+while the branch you request to merge your changes into is
 called _target branch_.
 
 The target branch can be the default or any other branch, depending
@@ -46,19 +46,18 @@ Learn the various ways to [create a merge request](creating_merge_requests.md).
 
 ## What you can do with merge requests
 
-When you start a new merge request, you'll have the following
-options to include straightaway (you can also add them later by
-clicking the **Edit** button on the merge request's page at the
-top-right side):
+When you start a new merge request, you can immediately include the following
+options, or add them later by clicking the **Edit** button on the merge
+request's page at the top-right side:
 
-- [Assign](#assignee) the merge request to a colleague for review.With GitLab Starter and higher tiers, you can [assign it to more than one person at a time](#multiple-assignees-starter).
+- [Assign](#assignee) the merge request to a colleague for review. With GitLab Starter and higher tiers, you can [assign it to more than one person at a time](#multiple-assignees-starter).
 - Set a [milestone](../milestones/index.md) to track time-sensitive changes.
 - Add [labels](../labels.md) to help contextualize and filter your merge requests over time.
 - Require [approval](merge_request_approvals.md) from your team. **(STARTER)**
-- [Close issues automatically](#merge-requests-to-close-issues) when it's merged.
+- [Close issues automatically](#merge-requests-to-close-issues) when they are merged.
 - Enable the [delete source branch when merge request is accepted](#deleting-the-source-branch) option to keep your repository clean.
 - Enable the [squash commits when merge request is accepted](squash_and_merge.md) option to combine all the commits into one before merging, thus keep a clean commit history in your repository.
-- Set the merge request as a [Work In Progress (WIP)](work_in_progress_merge_requests.md) to avoid accidental merges before it's ready.
+- Set the merge request as a [Work In Progress (WIP)](work_in_progress_merge_requests.md) to avoid accidental merges before it is ready.
 
 Once you have created the merge request, you can also:
 
@@ -98,12 +97,13 @@ to indicate everyone that is reviewing or accountable for it.
 To assign multiple assignees to a merge request:
 
 1. From a merge request, expand the right sidebar and locate the **Assignees** section.
-1. Click on **Edit** and from the dropdown menu, select as many users as you want to assign the merge request to.
+1. Click on **Edit** and from the dropdown menu, select as many users as you want
+   to assign the merge request to.
 
 Similarly, assignees are removed by deselecting them from the same
 dropdown menu.
 
-It's also possible to manage multiple assignees:
+It is also possible to manage multiple assignees:
 
 - When creating a merge request.
 - Using [quick actions](../quick_actions.md#quick-actions-for-issues-merge-requests-and-epics).
@@ -111,7 +111,7 @@ It's also possible to manage multiple assignees:
 ### Merge requests to close issues
 
 If the merge request is being created to resolve an issue, you can
-add a note in the description which will set it to
+add a note in the description which sets it to
 [automatically close the issue](../issues/managing_issues.md#closing-issues-automatically)
 when merged.
 
@@ -122,27 +122,30 @@ to prevent confidential information from being exposed.
 
 ### Deleting the source branch
 
-When creating a merge request, select the "Delete source branch
-when merge request accepted" option and the source branch will be
-deleted when the merge request is merged. To make this option
+When creating a merge request, select the
+**Delete source branch when merge request accepted** option, and the source
+branch is deleted when the merge request is merged. To make this option
 enabled by default for all new merge requests, enable it in the
 [project's settings](../settings/index.md#merge-request-settings).
 
 This option is also visible in an existing merge request next to
-the merge request button and can be selected/deselected before merging.
-It's only visible to users with [Maintainer permissions](../../permissions.md)
+the merge request button and can be selected or deselected before merging.
+It is only visible to users with [Maintainer permissions](../../permissions.md)
 in the source project.
 
 If the user viewing the merge request does not have the correct
 permissions to delete the source branch and the source branch
-is set for deletion, the merge request widget will show the
+is set for deletion, the merge request widget displays the
 **Deletes source branch** text.
 
 ![Delete source branch status](img/remove_source_branch_status.png)
 
 ## Recommendations and best practices for Merge Requests
 
-- When working locally in your branch, add multiple commits and only push when you're done, so GitLab will run only one pipeline for all the commits pushed at once. By doing so, you save pipeline minutes.
+- When working locally in your branch, add multiple commits and only push when
+  you're done, so GitLab runs only one pipeline for all the commits pushed
+  at once. By doing so, you save pipeline minutes.
 - Delete feature branches on merge or after merging them to keep your repository clean.
-- Take one thing at a time and ship the smallest changes possible. By doing so, you'll have faster reviews and your changes will be less prone to errors.
-- Don't use capital letters nor special chars in branch names.
+- Take one thing at a time and ship the smallest changes possible. By doing so,
+  you'll have faster reviews and your changes will be less prone to errors.
+- Do not use capital letters nor special chars in branch names.
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index 687e1850289..80f5823c095 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -38,7 +38,7 @@ automatically. For example, a title of `docs/my-page` will create a wiki
 page with a path `/wikis/docs/my-page`.
 
 Once you enter the page name, it's time to fill in its content. GitLab wikis
-support Markdown, RDoc and AsciiDoc. For Markdown based pages, all the
+support Markdown, RDoc, AsciiDoc and Org. For Markdown based pages, all the
 [Markdown features](../../markdown.md) are supported and for links there is
 some [wiki specific](../../markdown.md#wiki-specific-markdown) behavior.