Merge branch 'master' into 'master'

Corrected the document from the grammar perspective.

See merge request gitlab-org/gitlab!41184

doc/user/admin_area/settings/sign_up_restrictions.md

@@ -6,14 +6,12 @@ type: reference
 
 You can use sign-up restrictions to:
 
-- Disable new signups.
+- Disable new sign-ups.
 - Require user email confirmation.
 - Denylist or allowlist email addresses belonging to specific domains.
 
 NOTE: **Note:**
-These restrictions are only applied during sign-up from an external user. An admin is
-able to add a user through the admin panel with a disallowed domain. Also
-note that the users can change their email addresses after signup to
+These restrictions are only applied during sign-up from an external user. An admin can add a user through the admin panel with a disallowed domain. Also, note that the users can change their email addresses after sign-up to
 disallowed domains.
 
 ## Disable new signups
@@ -26,8 +24,8 @@ You can restrict new users from signing up by themselves for an account in your
 
 ### Recommendations
 
-For customers running public facing GitLab instances, we highly recommend that you
-consider disabling new signups if you do not expect public users to sign up for an
+For customers running public-facing GitLab instances, we highly recommend that you
+consider disabling new sign-ups if you do not expect public users to sign up for an
 account.
 
 Alternatively, you could also consider setting up a
@@ -52,7 +50,7 @@ the minimum number of characters a user must have in their password using the Gi
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/598) in GitLab 7.11.0
 
-You can restrict users to only sign up using email addresses matching the given
+You can restrict users only to sign up using email addresses matching the given
 domains list.
 
 ## Denylist email domains

doc/user/project/repository/web_editor.md

@@ -8,8 +8,8 @@ type: howto
 # GitLab Web Editor
 
 Sometimes it's easier to make quick changes directly from the GitLab interface
-than to clone the project and use the Git command line tool. In this feature
-highlight we look at how you can create a new file, directory, branch or
+than to clone the project and use the Git command-line tool. In this feature
+highlight, we look at how you can create a new file, directory, branch, or
 tag from the file browser. All of these actions are available from a single
 dropdown menu.
 
@@ -17,13 +17,12 @@ dropdown menu.
 
 From a project's files page, click the '+' button to the right of the branch selector.
 Choose **New file** from the dropdown.
-
 ![New file dropdown menu](img/web_editor_new_file_dropdown.png)
 
-Enter a file name in the **File name** box. Then, add file content in the editor
+Enter a file name in the **Filename** box. Then, add file content in the editor
 area. Add a descriptive commit message and choose a branch. The branch field
 will default to the branch you were viewing in the file browser. If you enter
-a new branch name, a checkbox will appear allowing you to start a new merge
+a new branch name, a checkbox will appear, allowing you to start a new merge
 request after you commit the changes.
 
 When you are satisfied with your new file, click **Commit Changes** at the bottom.
@@ -32,14 +31,14 @@ When you are satisfied with your new file, click **Commit Changes** at the botto
 
 ### Template dropdowns
 
-When starting a new project, there are some common files which the new project
+When starting a new project, there are some common files that the new project
 might need too. Therefore a message will be displayed by GitLab to make this
 easy for you.
 
 ![First file for your project](img/web_editor_template_dropdown_first_file.png)
 
-When clicking on either `LICENSE` or `.gitignore`, etc., a dropdown will be displayed
-to provide you with a template which might be suitable for your project.
+When clicking on either `LICENSE` or `.gitignore` and so on, a dropdown will be displayed
+to provide you with a template that might be suitable for your project.
 
 ![MIT license selected](img/web_editor_template_dropdown_mit_license.png)
 
@@ -56,16 +55,16 @@ least add a file in order for the button to show up.
 ## Upload a file
 
 The ability to create a file is great when the content is text. However, this
-doesn't work well for binary data such as images, PDFs or other file types. In
-this case you need to upload a file.
+doesn't work well for binary data such as images, PDFs, or other file types. In
+this case, you need to upload a file.
 
 From a project's files page, click the '+' button to the right of the branch
 selector. Choose **Upload file** from the dropdown.
 
 ![Upload file dropdown menu](img/web_editor_upload_file_dropdown.png)
 
-Once the upload dialog pops up there are two ways to upload your file. Either
-drag and drop a file on the pop up or use the **click to upload** link. A file
+Once the upload dialog pops up, there are two ways to upload your file. Either
+drag and drop a file on the popup or use the **click to upload** link. A file
 preview will appear once you have selected a file to upload.
 
 Enter a commit message, choose a branch, and click **Upload file** when you are
@@ -83,7 +82,7 @@ Choose **New directory** from the dropdown.
 
 ![New directory dropdown](img/web_editor_new_directory_dropdown.png)
 
-In the new directory dialog enter a directory name, a commit message and choose
+In the new directory dialog, enter a directory name, a commit message, and choose
 the target branch. Click **Create directory** to finish.
 
 ![New directory dialog](img/web_editor_new_directory_dialog.png)
@@ -108,7 +107,7 @@ name or a referenced merge request or your project has an active
 fork relationship.
 If you would like to make this button appear, a possible workaround is to [remove your project's
 fork relationship](../settings/index.md#removing-a-fork-relationship). Once removed, the fork
-relationship cannot be restored and you will no longer be able to send merge requests to the source.
+relationship cannot be restored, and you will no longer be able to send merge requests to the source.
 
 ![Create Button](img/web_editor_new_branch_from_issue_create_button_v12_6.png)
 
@@ -117,9 +116,9 @@ This dropdown contains the options **Create merge request and branch** and **Cre
 ![New Branch Button](img/web_editor_new_branch_from_issue_v_12_6.png)
 
 Once you choose one of these options, a new branch or branch and merge request
-will be created, based on the default
-branch of your project, by default `master`. The branch name will be based on
-the title of the issue and as a prefix, it will have its internal ID. Thus, the example
+will be created based on the default
+branch of your project (by default, `master`). The branch name will be based on
+the title of the issue, and as a prefix, it will have its internal ID. Thus, the example
 screenshot above will create a branch named
 `2-make-static-site-auto-deploy-and-serve`.
 
@@ -141,13 +140,13 @@ merge request is merged.
 ### Create a new branch from a project's dashboard
 
 If you want to make changes to several files before creating a new merge
-request, you can create a new branch up front. From a project's files page,
+request, you can create a new branch upfront. From a project's files page,
 choose **New branch** from the dropdown.
 
 ![New branch dropdown](img/web_editor_new_branch_dropdown.png)
 
 Enter a new **Branch name**. Optionally, change the **Create from** field
-to choose which branch, tag or commit SHA this new branch will originate from.
+to choose which branch, tag, or commit SHA this new branch will originate from.
 This field will autocomplete if you start typing an existing branch or tag.
 Click **Create branch** and you will be returned to the file browser on this new
 branch.
@@ -155,7 +154,7 @@ branch.
 ![New branch page](img/web_editor_new_branch_page.png)
 
 You can now make changes to any files, as needed. When you're ready to merge
-the changes back to master you can use the widget at the top of the screen.
+the changes back to master, you can use the widget at the top of the screen.
 This widget only appears for a period of time after you create the branch or
 modify files.
 
@@ -172,15 +171,15 @@ SHA. From a project's files page, choose **New tag** from the dropdown.
 Give the tag a name such as `v1.0.0`. Choose the branch or SHA from which you
 would like to create this new tag. You can optionally add a message and
 release notes. The release notes section supports Markdown format and you can
-also upload an attachment. Click **Create tag** and you will be taken to the tag
+also upload an attachment. Click **Create tag**, and you will be taken to the tag
 list page.
 
 ![New tag page](img/web_editor_new_tag_page.png)
 
 ## Tips
 
-When creating or uploading a new file, or creating a new directory, you can
-trigger a new merge request rather than committing directly to master. Enter
+When creating or uploading a new file or creating a new directory, you can
+trigger a new merge request rather than committing directly to `master`. Enter
 a new branch name in the **Target branch** field. You will notice a checkbox
 appear that is labeled **Start a new merge request with these changes**. After
 you commit the changes you will be taken to a new merge request form.