Commit fce75fee authored by Amy Qualls's avatar Amy Qualls

Add missing serial commas to text

The pages included in this commit all had missing Oxford (serial)
commas. In most cases, I added the comma but took no other action;
a few pages required slight rewording.
parent 870b6dc6
...@@ -20,7 +20,7 @@ alternative. ...@@ -20,7 +20,7 @@ alternative.
## Serialized Data Is Less Powerful ## Serialized Data Is Less Powerful
When using a relational database you have the ability to query individual When using a relational database you have the ability to query individual
fields, change the schema, index data and so forth. When you use serialized data fields, change the schema, index data, and so forth. When you use serialized data
all of that becomes either very difficult or downright impossible. While all of that becomes either very difficult or downright impossible. While
PostgreSQL does offer the ability to query JSON fields it is mostly meant for PostgreSQL does offer the ability to query JSON fields it is mostly meant for
very specialized use cases, and not for more general use. If you use YAML in very specialized use cases, and not for more general use. If you use YAML in
......
...@@ -215,4 +215,4 @@ When importing, GitLab would execute the following command, passing the `import_ ...@@ -215,4 +215,4 @@ When importing, GitLab would execute the following command, passing the `import_
git clone file://git:/tmp/lol git clone file://git:/tmp/lol
``` ```
Git would simply ignore the `git:` part, interpret the path as `file:///tmp/lol` and import the repository into the new project, in turn potentially giving the attacker access to any repository in the system, whether private or not. Git would simply ignore the `git:` part, interpret the path as `file:///tmp/lol`, and import the repository into the new project. This action could potentially give the attacker access to any repository in the system, whether private or not.
...@@ -671,7 +671,7 @@ The sharing dialog within Grafana provides the link, as highlighted below. ...@@ -671,7 +671,7 @@ The sharing dialog within Grafana provides the link, as highlighted below.
![Grafana Direct Linked Rendered Image](img/grafana_live_embed.png) ![Grafana Direct Linked Rendered Image](img/grafana_live_embed.png)
NOTE: **Note:** NOTE: **Note:**
For this embed to display correctly, the Grafana instance must be available to the target user, either as a public dashboard or on the same network. For this embed to display correctly, the Grafana instance must be available to the target user, either as a public dashboard, or on the same network.
Copy the link and add an image tag as [inline HTML](../../markdown.md#inline-html) in your Markdown. You may tweak the query parameters as required. For instance, removing the `&from=` and `&to=` parameters will give you a live chart. Here is example markup for a live chart from GitLab's public dashboard: Copy the link and add an image tag as [inline HTML](../../markdown.md#inline-html) in your Markdown. You may tweak the query parameters as required. For instance, removing the `&from=` and `&to=` parameters will give you a live chart. Here is example markup for a live chart from GitLab's public dashboard:
......
...@@ -147,7 +147,7 @@ Create lists for each of your team members and quickly drag-and-drop issues onto ...@@ -147,7 +147,7 @@ Create lists for each of your team members and quickly drag-and-drop issues onto
## Permissions ## Permissions
[Reporters and up](../permissions.md) can use all the functionality of the [Reporters and up](../permissions.md) can use all the functionality of the
Issue Board, that is, create or delete lists and drag issues from one list to another. Issue Board to create or delete lists, and drag issues from one list to another.
## GitLab Enterprise features for Issue Boards ## GitLab Enterprise features for Issue Boards
...@@ -373,7 +373,7 @@ window where you can see all the issues that do not belong to any list. ...@@ -373,7 +373,7 @@ window where you can see all the issues that do not belong to any list.
Select one or more issues by clicking on the cards and then click **Add issues** Select one or more issues by clicking on the cards and then click **Add issues**
to add them to the selected list. You can limit the issues you want to add to to add them to the selected list. You can limit the issues you want to add to
the list by filtering by author, assignee, milestone and label. the list by filtering by author, assignee, milestone, and label.
![Bulk adding issues to lists](img/issue_boards_add_issues_modal.png) ![Bulk adding issues to lists](img/issue_boards_add_issues_modal.png)
...@@ -419,7 +419,7 @@ You should be able to use the filters on top of your Issue Board to show only ...@@ -419,7 +419,7 @@ You should be able to use the filters on top of your Issue Board to show only
the results you want. This is similar to the filtering used in the issue tracker the results you want. This is similar to the filtering used in the issue tracker
since the metadata from the issues and labels are re-used in the Issue Board. since the metadata from the issues and labels are re-used in the Issue Board.
You can filter by author, assignee, milestone and label. You can filter by author, assignee, milestone, and label.
### Creating workflows ### Creating workflows
......
...@@ -6,7 +6,7 @@ Issues are the fundamental medium for collaborating on ideas and planning work i ...@@ -6,7 +6,7 @@ Issues are the fundamental medium for collaborating on ideas and planning work i
The GitLab issue tracker is an advanced tool for collaboratively developing ideas, solving problems, and planning work. The GitLab issue tracker is an advanced tool for collaboratively developing ideas, solving problems, and planning work.
Issues can allow you, your team, and your collaborators to share and discuss proposals Issues can allow you and your team to share and discuss proposals
before, and during, their implementation. However, they can be used for a variety of before, and during, their implementation. However, they can be used for a variety of
other purposes, customized to your needs and workflow. other purposes, customized to your needs and workflow.
......
...@@ -48,7 +48,7 @@ about CI/CD pipelines, when present), followed by the discussion threads of the ...@@ -48,7 +48,7 @@ about CI/CD pipelines, when present), followed by the discussion threads of the
collaborating with that MR. collaborating with that MR.
MRs also contain navigation tabs from which you can see the discussion happening on the thread, MRs also contain navigation tabs from which you can see the discussion happening on the thread,
the list of commits, the list of pipelines and jobs, the code changes and inline code reviews. the list of commits, the list of pipelines and jobs, the code changes, and inline code reviews.
To get started, read the [introduction to merge requests](getting_started.md). To get started, read the [introduction to merge requests](getting_started.md).
......
...@@ -28,7 +28,7 @@ For an overview, check the video demonstration on [Mapping work versus time with ...@@ -28,7 +28,7 @@ For an overview, check the video demonstration on [Mapping work versus time with
## Use cases ## Use cases
Burndown Charts, in general, are used for tracking and analyzing the completion of Burndown Charts are generally used for tracking and analyzing the completion of
a milestone. Therefore, their use cases are tied to the a milestone. Therefore, their use cases are tied to the
[use you are assigning your milestone to](index.md). [use you are assigning your milestone to](index.md).
......
...@@ -27,7 +27,7 @@ they are static, hence we are not dealing with server-side scripts ...@@ -27,7 +27,7 @@ they are static, hence we are not dealing with server-side scripts
nor credit card transactions, then why do we need secure connections? nor credit card transactions, then why do we need secure connections?
Back in the 1990s, where HTTPS came out, [SSL](https://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_1.0.2C_2.0_and_3.0) was considered a "special" Back in the 1990s, where HTTPS came out, [SSL](https://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_1.0.2C_2.0_and_3.0) was considered a "special"
security measure, necessary just for big companies, like banks and shoppings sites security measure, necessary just for big companies like banks and shopping sites
with financial transactions. with financial transactions.
Now we have a different picture. [According to Josh Aas](https://letsencrypt.org/2015/10/29/phishing-and-malware.html), Executive Director at [ISRG](https://en.wikipedia.org/wiki/Internet_Security_Research_Group): Now we have a different picture. [According to Josh Aas](https://letsencrypt.org/2015/10/29/phishing-and-malware.html), Executive Director at [ISRG](https://en.wikipedia.org/wiki/Internet_Security_Research_Group):
......
...@@ -16,7 +16,7 @@ To do so, follow the steps below. ...@@ -16,7 +16,7 @@ To do so, follow the steps below.
click **New project**, and name it according to the click **New project**, and name it according to the
[Pages domain names](../getting_started_part_one.md#gitlab-pages-default-domain-names). [Pages domain names](../getting_started_part_one.md#gitlab-pages-default-domain-names).
1. Clone it to your local computer, add your website 1. Clone it to your local computer, add your website
files to your project, add, commit and push to GitLab. files to your project, add, commit, and push to GitLab.
Alternatively, you can run `git init` in your local directory, Alternatively, you can run `git init` in your local directory,
add the remote URL: add the remote URL:
`git remote add origin git@gitlab.com:namespace/project-name.git`, `git remote add origin git@gitlab.com:namespace/project-name.git`,
......
...@@ -50,7 +50,7 @@ For more examples on artifacts, follow the [artifacts reference in ...@@ -50,7 +50,7 @@ For more examples on artifacts, follow the [artifacts reference in
## Browsing artifacts ## Browsing artifacts
> - From GitLab 9.2, PDFs, images, videos and other formats can be previewed directly in the job artifacts browser without the need to download them. > - From GitLab 9.2, PDFs, images, videos, and other formats can be previewed directly in the job artifacts browser without the need to download them.
> - Introduced in [GitLab 10.1][ce-14399], HTML files in a public project can be previewed directly in a new tab without the need to download them when [GitLab Pages](../../../administration/pages/index.md) is enabled. The same applies for textual formats (currently supported extensions: `.txt`, `.json`, and `.log`). > - Introduced in [GitLab 10.1][ce-14399], HTML files in a public project can be previewed directly in a new tab without the need to download them when [GitLab Pages](../../../administration/pages/index.md) is enabled. The same applies for textual formats (currently supported extensions: `.txt`, `.json`, and `.log`).
> - Introduced in [GitLab 12.4][gitlab-16675], artifacts in private projects can be previewed when [GitLab Pages access control](../../../administration/pages/index.md#access-control) is enabled. > - Introduced in [GitLab 12.4][gitlab-16675], artifacts in private projects can be previewed when [GitLab Pages access control](../../../administration/pages/index.md#access-control) is enabled.
......
...@@ -119,7 +119,7 @@ The next time a pipeline is scheduled, your credentials will be used. ...@@ -119,7 +119,7 @@ The next time a pipeline is scheduled, your credentials will be used.
NOTE: **Note:** NOTE: **Note:**
If the owner of a pipeline schedule doesn't have the ability to create pipelines If the owner of a pipeline schedule doesn't have the ability to create pipelines
on the target branch, the schedule will stop creating new pipelines. This can on the target branch, the schedule will stop creating new pipelines. This can
happen if, for example, the owner is blocked or removed from the project, or happen if the owner is blocked or removed from the project, or
the target branch or tag is protected. In this case, someone with sufficient the target branch or tag is protected. In this case, someone with sufficient
privileges must take ownership of the schedule. privileges must take ownership of the schedule.
......
...@@ -13,7 +13,7 @@ assets output by your CI system to use them, not just the raw source ...@@ -13,7 +13,7 @@ assets output by your CI system to use them, not just the raw source
code. code.
GitLab's **Releases** are a way to track deliverables in your project. Consider them GitLab's **Releases** are a way to track deliverables in your project. Consider them
a snapshot in time of the source, build output, and other metadata or artifacts a snapshot in time of the source, build output, artifacts, and other metadata
associated with a released version of your code. associated with a released version of your code.
There are several ways to create a Release: There are several ways to create a Release:
......
...@@ -104,7 +104,7 @@ Some things to note about precedence: ...@@ -104,7 +104,7 @@ Some things to note about precedence:
[Jupyter](https://jupyter.org/) Notebook (previously IPython Notebook) files are used for [Jupyter](https://jupyter.org/) Notebook (previously IPython Notebook) files are used for
interactive computing in many fields and contain a complete record of the interactive computing in many fields and contain a complete record of the
user's sessions and include code, narrative text, equations and rich output. user's sessions and include code, narrative text, equations, and rich output.
[Read how to use Jupyter notebooks with GitLab.](jupyter_notebooks/index.md) [Read how to use Jupyter notebooks with GitLab.](jupyter_notebooks/index.md)
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
[Jupyter](https://jupyter.org/) Notebook (previously IPython Notebook) files are used for [Jupyter](https://jupyter.org/) Notebook (previously IPython Notebook) files are used for
interactive computing in many fields and contain a complete record of the interactive computing in many fields and contain a complete record of the
user's sessions and include code, narrative text, equations and rich output. user's sessions and include code, narrative text, equations, and rich output.
When added to a repository, Jupyter Notebooks with a `.ipynb` extension will be When added to a repository, Jupyter Notebooks with a `.ipynb` extension will be
rendered to HTML when viewed. rendered to HTML when viewed.
......
...@@ -7,7 +7,7 @@ type: concepts, howto ...@@ -7,7 +7,7 @@ type: concepts, howto
[x509](https://en.wikipedia.org/wiki/X.509) is a standard format for public key [x509](https://en.wikipedia.org/wiki/X.509) is a standard format for public key
certificates issued by a public or private Public Key Infrastructure (PKI). certificates issued by a public or private Public Key Infrastructure (PKI).
Personal x509 certificates are used for authentication or signing purposes Personal x509 certificates are used for authentication or signing purposes
such as SMIME, but beside that, Git supports signing of commits and tags such as SMIME, but Git also supports signing of commits and tags
with x509 certificates in a similar way as with [GPG](../gpg_signed_commits/index.md). with x509 certificates in a similar way as with [GPG](../gpg_signed_commits/index.md).
The main difference is the trust anchor which is the PKI for x509 certificates The main difference is the trust anchor which is the PKI for x509 certificates
instead of a web of trust with GPG. instead of a web of trust with GPG.
......
...@@ -115,7 +115,7 @@ no longer actively maintained. Projects that have been archived can also be ...@@ -115,7 +115,7 @@ no longer actively maintained. Projects that have been archived can also be
unarchived. Only project Owners and Admin users have the unarchived. Only project Owners and Admin users have the
[permissions](../../permissions.md#project-members-permissions) to archive a project. [permissions](../../permissions.md#project-members-permissions) to archive a project.
When a project is archived, the repository, issues, merge requests and all When a project is archived, the repository, issues, merge requests, and all
other features are read-only. Archived projects are also hidden other features are read-only. Archived projects are also hidden
in project listings. in project listings.
......
...@@ -30,11 +30,11 @@ the Web IDE will make your direct editing even easier. ...@@ -30,11 +30,11 @@ the Web IDE will make your direct editing even easier.
The Web IDE currently provides: The Web IDE currently provides:
- Basic syntax colorization for a variety of programming, scripting and markup - Basic syntax colorization for a variety of programming, scripting and markup
languages such as XML, PHP, C#, C++, Markdown, Java, VB, Batch, Python, Ruby languages such as XML, PHP, C#, C++, Markdown, Java, VB, Batch, Python, Ruby,
and Objective-C. and Objective-C.
- IntelliSense and validation support (displaying errors and warnings, providing - IntelliSense and validation support (displaying errors and warnings, providing
smart completions, formatting, and outlining) for some languages. For example: smart completions, formatting, and outlining) for some languages. For example:
TypeScript, JavaScript, CSS, LESS, SCSS, JSON and HTML. TypeScript, JavaScript, CSS, LESS, SCSS, JSON, and HTML.
Because the Web IDE is based on the [Monaco Editor](https://microsoft.github.io/monaco-editor/), Because the Web IDE is based on the [Monaco Editor](https://microsoft.github.io/monaco-editor/),
you can find a more complete list of supported languages in the you can find a more complete list of supported languages in the
......
...@@ -38,7 +38,7 @@ automatically. For example, a title of `docs/my-page` will create a wiki ...@@ -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`. page with a path `/wikis/docs/my-page`.
Once you enter the page name, it's time to fill in its content. GitLab wikis Once you enter the page name, it's time to fill in its content. GitLab wikis
support Markdown, RDoc, AsciiDoc and Org. 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 [Markdown features](../../markdown.md) are supported and for links there is
some [wiki specific](../../markdown.md#wiki-specific-markdown) behavior. some [wiki specific](../../markdown.md#wiki-specific-markdown) behavior.
...@@ -121,7 +121,7 @@ The changes of a wiki page over time are recorded in the wiki's Git repository, ...@@ -121,7 +121,7 @@ The changes of a wiki page over time are recorded in the wiki's Git repository,
and you can view them by clicking the **Page history** button. and you can view them by clicking the **Page history** button.
From the history page you can see the revision of the page (Git commit SHA), its From the history page you can see the revision of the page (Git commit SHA), its
author, the commit message, when it was last updated and the page markup format. author, the commit message, when it was last updated, and the page markup format.
To see how a previous version of the page looked like, click on a revision To see how a previous version of the page looked like, click on a revision
number. number.
......
...@@ -119,7 +119,7 @@ Your [To-Do List](../todos.md#gitlab-to-do-list) can be searched by "to do" and ...@@ -119,7 +119,7 @@ Your [To-Do List](../todos.md#gitlab-to-do-list) can be searched by "to do" and
You can [filter](../todos.md#filtering-your-to-do-list) them per project, You can [filter](../todos.md#filtering-your-to-do-list) them per project,
author, type, and action. Also, you can sort them by author, type, and action. Also, you can sort them by
[**Label priority**](../../user/project/labels.md#label-priority), [**Label priority**](../../user/project/labels.md#label-priority),
**Last created** and **Oldest created**. **Last created**, and **Oldest created**.
## Projects ## Projects
......
...@@ -34,7 +34,7 @@ These shortcuts are available in most areas of GitLab ...@@ -34,7 +34,7 @@ These shortcuts are available in most areas of GitLab
| <kbd>p</kbd> + <kbd>b</kbd> | Show/hide the Performance Bar. | | <kbd>p</kbd> + <kbd>b</kbd> | Show/hide the Performance Bar. |
Additionally, the following shortcuts are available when editing text in text fields, Additionally, the following shortcuts are available when editing text in text fields,
for example comments, replies, or issue and merge request descriptions: for example comments, replies, issue descriptions, and merge request descriptions:
| Keyboard Shortcut | Description | | Keyboard Shortcut | Description |
| ---------------------------------------------------------------------- | ----------- | | ---------------------------------------------------------------------- | ----------- |
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment