Commit 4f5a1818 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'docs-aqualls-20200430-spelling2' into 'master'

Docs: fix spelling errors, update exceptions list

See merge request gitlab-org/gitlab!30908
parents 56119371 32126b38
...@@ -90,6 +90,7 @@ dotenv ...@@ -90,6 +90,7 @@ dotenv
downvoted downvoted
downvotes downvotes
Dpl Dpl
Dreamweaver
Elasticsearch Elasticsearch
enablement enablement
enqueued enqueued
...@@ -121,6 +122,8 @@ Gzip ...@@ -121,6 +122,8 @@ Gzip
hardcode hardcode
hardcoded hardcoded
hardcodes hardcodes
heatmap
heatmaps
Helm Helm
Heroku Heroku
Herokuish Herokuish
...@@ -133,6 +136,7 @@ hotfixes ...@@ -133,6 +136,7 @@ hotfixes
hotfixing hotfixing
http http
https https
idempotence
Ingress Ingress
initializer initializer
initializers initializers
...@@ -177,6 +181,7 @@ mergeable ...@@ -177,6 +181,7 @@ mergeable
Microsoft Microsoft
middleware middleware
middlewares middlewares
Minikube
MinIO MinIO
mitmproxy mitmproxy
misconfigure misconfigure
...@@ -242,6 +247,7 @@ rebase ...@@ -242,6 +247,7 @@ rebase
rebased rebased
rebases rebases
rebasing rebasing
Redcarpet
Redis Redis
Redmine Redmine
reCAPTCHA reCAPTCHA
...@@ -283,6 +289,7 @@ Sentry ...@@ -283,6 +289,7 @@ Sentry
serverless serverless
Sidekiq Sidekiq
sharding sharding
shfmt
Shibboleth Shibboleth
sanitization sanitization
serializer serializer
...@@ -296,9 +303,13 @@ Splunk ...@@ -296,9 +303,13 @@ Splunk
SSH SSH
storable storable
strace strace
strikethrough
strikethroughs
subpath subpath
subfolder subfolder
subfolders subfolders
subgraph
subgraphs
sublicense sublicense
sublicensed sublicensed
sublicenses sublicenses
...@@ -340,6 +351,7 @@ unchecking ...@@ -340,6 +351,7 @@ unchecking
unchecks unchecks
uncomment uncomment
uncommented uncommented
uncommenting
unencode unencode
unencoded unencoded
unencoder unencoder
...@@ -358,12 +370,14 @@ unoptimize ...@@ -358,12 +370,14 @@ unoptimize
unoptimized unoptimized
unoptimizes unoptimizes
unoptimizing unoptimizing
unprioritized
unprotect unprotect
unprotects unprotects
unprotected unprotected
unpublish unpublish
unpublished unpublished
unpublishes unpublishes
unpublishing
unreferenced unreferenced
unresolve unresolve
unresolved unresolved
...@@ -373,6 +387,9 @@ unstage ...@@ -373,6 +387,9 @@ unstage
unstaged unstaged
unstages unstages
unstaging unstaging
unstash
unstashed
unstashing
untarred untarred
untracked untracked
untrusted untrusted
......
...@@ -460,12 +460,12 @@ documentation](index.md#3-gitaly-server-configuration). ...@@ -460,12 +460,12 @@ documentation](index.md#3-gitaly-server-configuration).
1. Configure the storage location for Git data by setting `git_data_dirs` in 1. Configure the storage location for Git data by setting `git_data_dirs` in
`/etc/gitlab/gitlab.rb`. Each Gitaly node should have a unique storage name `/etc/gitlab/gitlab.rb`. Each Gitaly node should have a unique storage name
(eg `gitaly-1`). (such as `gitaly-1`).
Instead of configuring `git_data_dirs` uniquely for each Gitaly node, it is Instead of configuring `git_data_dirs` uniquely for each Gitaly node, it is
often easier to have include the configuration for all Gitaly nodes on every often easier to have include the configuration for all Gitaly nodes on every
Gitaly node. This is supported because the Praefect `virtual_storages` Gitaly node. This is supported because the Praefect `virtual_storages`
configuration maps each storage name (eg `gitaly-1`) to a specific node, and configuration maps each storage name (such as `gitaly-1`) to a specific node, and
requests are routed accordingly. This means every Gitaly node in your fleet requests are routed accordingly. This means every Gitaly node in your fleet
can share the same configuration. can share the same configuration.
...@@ -573,7 +573,7 @@ Particular attention should be shown to: ...@@ -573,7 +573,7 @@ Particular attention should be shown to:
}) })
``` ```
1. Allow Gitaly to listen on a tcp port by editing 1. Allow Gitaly to listen on a TCP port by editing
`/etc/gitlab/gitlab.rb` `/etc/gitlab/gitlab.rb`
```ruby ```ruby
...@@ -742,13 +742,13 @@ strategy in the future. ...@@ -742,13 +742,13 @@ strategy in the future.
## Identifying Impact of a Primary Node Failure ## Identifying Impact of a Primary Node Failure
When a primary Gitaly node fails, there is a chance of dataloss. Dataloss can occur if there were outstanding replication jobs the secondaries did not manage to process before the failure. The Praefect `dataloss` subcommand helps identify these cases by counting the number of dead replication jobs for each repository within a given timeframe. When a primary Gitaly node fails, there is a chance of data loss. Data loss can occur if there were outstanding replication jobs the secondaries did not manage to process before the failure. The Praefect `dataloss` sub-command helps identify these cases by counting the number of dead replication jobs for each repository within a given time frame.
```shell ```shell
sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dataloss -from <rfc3339-time> -to <rfc3339-time> sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dataloss -from <rfc3339-time> -to <rfc3339-time>
``` ```
If the timeframe is not specified, dead replication jobs from the last six hours are counted: If the time frame is not specified, dead replication jobs from the last six hours are counted:
```shell ```shell
sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dataloss sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dataloss
...@@ -759,7 +759,7 @@ example/repository-2: 4 jobs ...@@ -759,7 +759,7 @@ example/repository-2: 4 jobs
example/repository-3: 2 jobs example/repository-3: 2 jobs
``` ```
To specify a timeframe in UTC, run: To specify a time frame in UTC, run:
```shell ```shell
sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dataloss -from 2020-01-02T00:00:00+00:00 -to 2020-01-02T00:02:00+00:00 sudo /opt/gitlab/embedded/bin/praefect -config /var/opt/gitlab/praefect/config.toml dataloss -from 2020-01-02T00:00:00+00:00 -to 2020-01-02T00:02:00+00:00
...@@ -779,7 +779,7 @@ When a Praefect backend node fails and is no longer able to ...@@ -779,7 +779,7 @@ When a Praefect backend node fails and is no longer able to
replicate changes, the backend node will start to drift from the primary. If replicate changes, the backend node will start to drift from the primary. If
that node eventually recovers, it will need to be reconciled with the current that node eventually recovers, it will need to be reconciled with the current
primary. The primary node is considered the single source of truth for the primary. The primary node is considered the single source of truth for the
state of a shard. The Praefect `reconcile` subcommand allows for the manual state of a shard. The Praefect `reconcile` sub-command allows for the manual
reconciliation between a backend node and the current primary. reconciliation between a backend node and the current primary.
Run the following command on the Praefect server after all placeholders Run the following command on the Praefect server after all placeholders
......
...@@ -428,7 +428,7 @@ installations from source. ...@@ -428,7 +428,7 @@ installations from source.
This file contains logging information about jobs before they are start This file contains logging information about jobs before they are start
being processed by Sidekiq, for example before being enqueued. being processed by Sidekiq, for example before being enqueued.
This logfile follows the same structure as This log file follows the same structure as
[`sidekiq.log`](#sidekiqlog), so it will be structured as JSON if [`sidekiq.log`](#sidekiqlog), so it will be structured as JSON if
you've configured this for Sidekiq as mentioned above. you've configured this for Sidekiq as mentioned above.
...@@ -523,7 +523,7 @@ User clone/fetch activity using SSH transport appears in this log as `executing ...@@ -523,7 +523,7 @@ User clone/fetch activity using SSH transport appears in this log as `executing
## Gitaly Logs ## Gitaly Logs
This file lives in `/var/log/gitlab/gitaly/current` and is produced by [runit](http://smarden.org/runit/). `runit` is packaged with Omnibus and a brief explanation of its purpose is available [in the omnibus documentation](https://docs.gitlab.com/omnibus/architecture/#runit). [Log files are rotated](http://smarden.org/runit/svlogd.8.html), renamed in unix timestamp format and `gzip`-compressed (e.g. `@1584057562.s`). This file lives in `/var/log/gitlab/gitaly/current` and is produced by [runit](http://smarden.org/runit/). `runit` is packaged with Omnibus and a brief explanation of its purpose is available [in the omnibus documentation](https://docs.gitlab.com/omnibus/architecture/#runit). [Log files are rotated](http://smarden.org/runit/svlogd.8.html), renamed in Unix timestamp format and `gzip`-compressed (e.g. `@1584057562.s`).
### `grpc.log` ### `grpc.log`
...@@ -761,7 +761,7 @@ For Omnibus installations, NGINX logs reside in: ...@@ -761,7 +761,7 @@ For Omnibus installations, NGINX logs reside in:
- `/var/log/gitlab/nginx/gitlab_pages_access.log` contains a log of requests made to Pages static sites. - `/var/log/gitlab/nginx/gitlab_pages_access.log` contains a log of requests made to Pages static sites.
- `/var/log/gitlab/nginx/gitlab_pages_error.log` contains a log of NGINX errors for Pages static sites. - `/var/log/gitlab/nginx/gitlab_pages_error.log` contains a log of NGINX errors for Pages static sites.
- `/var/log/gitlab/nginx/gitlab_registry_access.log` contains a log of requests made to the Container Registry. - `/var/log/gitlab/nginx/gitlab_registry_access.log` contains a log of requests made to the Container Registry.
- `/var/log/gitlab/nginx/gitlab_registry_error.log` contains a log of NGINX errors for the Container Regsitry. - `/var/log/gitlab/nginx/gitlab_registry_error.log` contains a log of NGINX errors for the Container Registry.
- `/var/log/gitlab/nginx/gitlab_mattermost_access.log` contains a log of requests made to Mattermost. - `/var/log/gitlab/nginx/gitlab_mattermost_access.log` contains a log of requests made to Mattermost.
- `/var/log/gitlab/nginx/gitlab_mattermost_error.log` contains a log of NGINX errors for Mattermost. - `/var/log/gitlab/nginx/gitlab_mattermost_error.log` contains a log of NGINX errors for Mattermost.
......
...@@ -72,7 +72,7 @@ and they will assist you with any issues you are having. ...@@ -72,7 +72,7 @@ and they will assist you with any issues you are having.
This is the principle of Kubernetes, read [Twelve-factor app](https://12factor.net/) This is the principle of Kubernetes, read [Twelve-factor app](https://12factor.net/)
for details. for details.
- How to get cronjobs configured on a cluster - How to get cron jobs configured on a cluster
```shell ```shell
kubectl get cronjobs kubectl get cronjobs
...@@ -206,7 +206,7 @@ all Kubernetes resources and dependent charts: ...@@ -206,7 +206,7 @@ all Kubernetes resources and dependent charts:
helm get manifest <release name> helm get manifest <release name>
``` ```
## Installation of minimal GitLab config via Minukube on macOS ## Installation of minimal GitLab config via Minikube on macOS
This section is based on [Developing for Kubernetes with Minikube](https://docs.gitlab.com/charts/development/minikube/index.html) This section is based on [Developing for Kubernetes with Minikube](https://docs.gitlab.com/charts/development/minikube/index.html)
and [Helm](https://docs.gitlab.com/charts/installation/tools.html#helm). Refer and [Helm](https://docs.gitlab.com/charts/installation/tools.html#helm). Refer
......
...@@ -267,7 +267,7 @@ to your review app. ...@@ -267,7 +267,7 @@ to your review app.
​After determining the ID for the merge request to link to a visual review app, you ​After determining the ID for the merge request to link to a visual review app, you
can supply the ID by either:​​ can supply the ID by either:​​
- Hardcoding it in the script tag via the data attribute `data-merge-request-id` of the app. - Hard-coding it in the script tag via the data attribute `data-merge-request-id` of the app.
- Dynamically adding the `data-merge-request-id` value during the build of the app. - Dynamically adding the `data-merge-request-id` value during the build of the app.
- Supplying it manually through the visual review form in the app. - Supplying it manually through the visual review form in the app.
......
...@@ -382,7 +382,7 @@ use for storing things like passwords, SSH keys, and credentials. ...@@ -382,7 +382,7 @@ use for storing things like passwords, SSH keys, and credentials.
Group-level variables can be added by: Group-level variables can be added by:
1. Navigating to your group's **Settings > CI/CD** page. 1. Navigating to your group's **Settings > CI/CD** page.
1. Inputing variable types, keys, and values in the **Variables** section. 1. Inputting variable types, keys, and values in the **Variables** section.
Any variables of [subgroups](../../user/group/subgroups/index.md) will be inherited recursively. Any variables of [subgroups](../../user/group/subgroups/index.md) will be inherited recursively.
Once you set them, they will be available for all subsequent pipelines. Any group-level user defined variables can be viewed in projects by: Once you set them, they will be available for all subsequent pipelines. Any group-level user defined variables can be viewed in projects by:
......
...@@ -159,7 +159,7 @@ During this phase, the idea is to collect as much information as possible about ...@@ -159,7 +159,7 @@ During this phase, the idea is to collect as much information as possible about
The analysis usually takes a full milestone to complete, though it's not impossible to start the implementation in the same milestone. The analysis usually takes a full milestone to complete, though it's not impossible to start the implementation in the same milestone.
In particular, the upload request can have some [requirements in the GitLab Workhorse project](#file-uploads). This project has a different release cycle than the rails backend. It's **strongly** recommended that you open an issue there as soon as the upload request analysis is done. This way GitLab Worhorse is already ready when the upload request is implemented on the rails backend. In particular, the upload request can have some [requirements in the GitLab Workhorse project](#file-uploads). This project has a different release cycle than the rails backend. It's **strongly** recommended that you open an issue there as soon as the upload request analysis is done. This way GitLab Workhorse is already ready when the upload request is implemented on the rails backend.
### Implementation ### Implementation
......
...@@ -624,7 +624,7 @@ Here are some common pitfalls and how to overcome them: ...@@ -624,7 +624,7 @@ Here are some common pitfalls and how to overcome them:
Gitlab::Elastic::Indexer::Error: time="2020-01-23T09:13:00Z" level=fatal msg="health check timeout: no Elasticsearch node available" Gitlab::Elastic::Indexer::Error: time="2020-01-23T09:13:00Z" level=fatal msg="health check timeout: no Elasticsearch node available"
``` ```
You probably have not used either `http://` or `https://` as part of your value in the **"URL"** field of the Elasticseach Integration Menu. Please make sure you are using either `http://` or `https://` in this field as the [Elasticsearch client for Go](https://github.com/olivere/elastic) that we are using [needs the prefix for the URL to be accepted as valid](https://github.com/olivere/elastic/commit/a80af35aa41856dc2c986204e2b64eab81ccac3a). You probably have not used either `http://` or `https://` as part of your value in the **"URL"** field of the Elasticsearch Integration Menu. Please make sure you are using either `http://` or `https://` in this field as the [Elasticsearch client for Go](https://github.com/olivere/elastic) that we are using [needs the prefix for the URL to be accepted as valid](https://github.com/olivere/elastic/commit/a80af35aa41856dc2c986204e2b64eab81ccac3a).
Once you have corrected the formatting of the URL, delete the index (via the [dedicated Rake task](#gitlab-elasticsearch-rake-tasks)) and [reindex the content of your instance](#adding-gitlabs-data-to-the-elasticsearch-index). Once you have corrected the formatting of the URL, delete the index (via the [dedicated Rake task](#gitlab-elasticsearch-rake-tasks)) and [reindex the content of your instance](#adding-gitlabs-data-to-the-elasticsearch-index).
### Low level troubleshooting ### Low level troubleshooting
......
...@@ -107,7 +107,7 @@ When visiting one of these views, you can now hover over a code reference to see ...@@ -107,7 +107,7 @@ When visiting one of these views, you can now hover over a code reference to see
## Sourcegraph for GitLab.com ## Sourcegraph for GitLab.com
Sourcegraph powered code intelligence is avaialable for all public projects on GitLab.com. Sourcegraph powered code intelligence is available for all public projects on GitLab.com.
Support for private projects is currently not available for GitLab.com; Support for private projects is currently not available for GitLab.com;
follow the epic [&2201](https://gitlab.com/groups/gitlab-org/-/epics/2201) follow the epic [&2201](https://gitlab.com/groups/gitlab-org/-/epics/2201)
......
...@@ -39,7 +39,7 @@ it by running in your terminal: ...@@ -39,7 +39,7 @@ it by running in your terminal:
xcode-select --install xcode-select --install
``` ```
Click **Install** to download and install it. Alternativelly, you can install Click **Install** to download and install it. Alternatively, you can install
the entire [XCode](https://developer.apple.com/xcode/) package through the the entire [XCode](https://developer.apple.com/xcode/) package through the
macOS App Store. macOS App Store.
......
...@@ -105,7 +105,7 @@ changing how standard Markdown is used: ...@@ -105,7 +105,7 @@ changing how standard Markdown is used:
| Standard Markdown | Extended Markdown in GitLab | | Standard Markdown | Extended Markdown in GitLab |
| ------------------------------------- | ------------------------- | | ------------------------------------- | ------------------------- |
| [blockquotes](#blockquotes) | [multiline blockquotes](#multiline-blockquote) | | [blockquotes](#blockquotes) | [multi-line blockquotes](#multiline-blockquote) |
| [code blocks](#code-spans-and-blocks) | [colored code and syntax highlighting](#colored-code-and-syntax-highlighting) | | [code blocks](#code-spans-and-blocks) | [colored code and syntax highlighting](#colored-code-and-syntax-highlighting) |
| [emphasis](#emphasis) | [multiple underscores in words](#multiple-underscores-in-words-and-mid-word-emphasis) | [emphasis](#emphasis) | [multiple underscores in words](#multiple-underscores-in-words-and-mid-word-emphasis)
| [headers](#headers) | [linkable Header IDs](#header-ids-and-links) | | [headers](#headers) | [linkable Header IDs](#header-ids-and-links) |
...@@ -353,7 +353,7 @@ However, the wrapping tags can't be mixed: ...@@ -353,7 +353,7 @@ However, the wrapping tags can't be mixed:
- [- deletion -} - [- deletion -}
``` ```
If your diff includes words in `` `code` `` font, make sure to escape each bactick `` ` `` with a If your diff includes words in `` `code` `` font, make sure to escape each backtick `` ` `` with a
backslash `\`, otherwise the diff highlight won't render correctly: backslash `\`, otherwise the diff highlight won't render correctly:
```markdown ```markdown
...@@ -396,8 +396,8 @@ a^2+b^2=c^2 ...@@ -396,8 +396,8 @@ a^2+b^2=c^2
_Be advised that KaTeX only supports a [subset](https://katex.org/docs/supported.html) of LaTeX._ _Be advised that KaTeX only supports a [subset](https://katex.org/docs/supported.html) of LaTeX._
NOTE: **Note:** This also works for the asciidoctor `:stem: latexmath`. For details see NOTE: **Note:** This also works for the Asciidoctor `:stem: latexmath`. For details see
the [asciidoctor user manual](https://asciidoctor.org/docs/user-manual/#activating-stem-support). the [Asciidoctor user manual](https://asciidoctor.org/docs/user-manual/#activating-stem-support).
### Special GitLab references ### Special GitLab references
...@@ -608,7 +608,7 @@ Quote break. ...@@ -608,7 +608,7 @@ Quote break.
> If this is not rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#multiline-blockquote). > If this is not rendered correctly, [view it in GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md#multiline-blockquote).
GFM extends the standard Markdown standard by also supporting multiline blockquotes GFM extends the standard Markdown standard by also supporting multi-line blockquotes
fenced by `>>>`: fenced by `>>>`:
```markdown ```markdown
...@@ -1216,7 +1216,7 @@ Some text to show that the reference links can follow later. ...@@ -1216,7 +1216,7 @@ Some text to show that the reference links can follow later.
- This is an [inline-style link](https://www.google.com) - This is an [inline-style link](https://www.google.com)
- This is a [link to a repository file in the same directory](index.md) - This is a [link to a repository file in the same directory](index.md)
- This is a [relative link to a readme one directory higher](../README.md) - This is a [relative link to a README one directory higher](../README.md)
- This is a [link that also has title text](https://www.google.com "This link takes you to Google!") - This is a [link that also has title text](https://www.google.com "This link takes you to Google!")
Using header ID anchors: Using header ID anchors:
...@@ -1244,7 +1244,7 @@ will point the link to `wikis/style` only when the link is inside of a wiki Mark ...@@ -1244,7 +1244,7 @@ will point the link to `wikis/style` only when the link is inside of a wiki Mark
#### URL auto-linking #### URL auto-linking
GFM will autolink almost any URL you put into your text: GFM will auto-link almost any URL you put into your text:
```markdown ```markdown
- https://www.google.com - https://www.google.com
......
...@@ -171,7 +171,7 @@ When the changes are merged, your changes are added to the upstream repository a ...@@ -171,7 +171,7 @@ When the changes are merged, your changes are added to the upstream repository a
the branch as per specification. After your work is merged, if you don't intend to the branch as per specification. After your work is merged, if you don't intend to
make any other contributions to the upstream project, you can unlink your make any other contributions to the upstream project, you can unlink your
fork from its upstream project in the **Settings > Advanced Settings** section by fork from its upstream project in the **Settings > Advanced Settings** section by
[removing the forking relashionship](../settings/index.md#removing-a-fork-relationship). [removing the forking relationship](../settings/index.md#removing-a-fork-relationship).
For further details, [see the forking workflow documentation](../repository/forking_workflow.md). For further details, [see the forking workflow documentation](../repository/forking_workflow.md).
......
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