Commit 92b5274a authored by Evan Read's avatar Evan Read

Merge branch 'selhorn-remove-dummylanguage' into 'master'

Docs: Removed ableist language

See merge request gitlab-org/gitlab!43363
parents 31c0a3f3 251a9aee
...@@ -424,17 +424,17 @@ server (with `gitaly_address`) unless you setup with special ...@@ -424,17 +424,17 @@ server (with `gitaly_address`) unless you setup with special
storages: storages:
default: default:
gitaly_address: tcp://gitaly1.internal:8075 gitaly_address: tcp://gitaly1.internal:8075
path: /some/dummy/path path: /some/local/path
storage1: storage1:
gitaly_address: tcp://gitaly1.internal:8075 gitaly_address: tcp://gitaly1.internal:8075
path: /some/dummy/path path: /some/local/path
storage2: storage2:
gitaly_address: tcp://gitaly2.internal:8075 gitaly_address: tcp://gitaly2.internal:8075
path: /some/dummy/path path: /some/local/path
``` ```
NOTE: **Note:** NOTE: **Note:**
`/some/dummy/path` should be set to a local folder that exists, however no data will be stored in `/some/local/path` should be set to a local folder that exists, however no data will be stored in
this folder. This will no longer be necessary after this folder. This will no longer be necessary after
[this issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved. [this issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved.
...@@ -627,17 +627,17 @@ To configure Gitaly with TLS: ...@@ -627,17 +627,17 @@ To configure Gitaly with TLS:
storages: storages:
default: default:
gitaly_address: tls://gitaly1.internal:9999 gitaly_address: tls://gitaly1.internal:9999
path: /some/dummy/path path: /some/local/path
storage1: storage1:
gitaly_address: tls://gitaly1.internal:9999 gitaly_address: tls://gitaly1.internal:9999
path: /some/dummy/path path: /some/local/path
storage2: storage2:
gitaly_address: tls://gitaly2.internal:9999 gitaly_address: tls://gitaly2.internal:9999
path: /some/dummy/path path: /some/local/path
``` ```
NOTE: **Note:** NOTE: **Note:**
`/some/dummy/path` should be set to a local folder that exists, however no data will be stored `/some/local/path` should be set to a local folder that exists, however no data will be stored
in this folder. This will no longer be necessary after in this folder. This will no longer be necessary after
[Gitaly issue #1282](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved. [Gitaly issue #1282](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved.
......
...@@ -547,14 +547,14 @@ To configure Praefect with TLS: ...@@ -547,14 +547,14 @@ To configure Praefect with TLS:
storages: storages:
default: default:
gitaly_address: tls://praefect1.internal:3305 gitaly_address: tls://praefect1.internal:3305
path: /some/dummy/path path: /some/local/path
storage1: storage1:
gitaly_address: tls://praefect2.internal:3305 gitaly_address: tls://praefect2.internal:3305
path: /some/dummy/path path: /some/local/path
``` ```
NOTE: **Note:** NOTE: **Note:**
`/some/dummy/path` should be set to a local folder that exists, however no `/some/local/path` should be set to a local folder that exists, however no
data will be stored in this folder. This will no longer be necessary after data will be stored in this folder. This will no longer be necessary after
[this issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved. [this issue](https://gitlab.com/gitlab-org/gitaly/-/issues/1282) is resolved.
......
...@@ -71,7 +71,7 @@ The instructions make the assumption that you will be using the email address `i ...@@ -71,7 +71,7 @@ The instructions make the assumption that you will be using the email address `i
sudo postfix start sudo postfix start
``` ```
1. Send the new `incoming` user a dummy email to test SMTP, by entering the following into the SMTP prompt: 1. Send the new `incoming` user an email to test SMTP, by entering the following into the SMTP prompt:
```plaintext ```plaintext
ehlo localhost ehlo localhost
...@@ -251,7 +251,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo ...@@ -251,7 +251,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
If you get a `Connection refused` error instead, make sure your firewall is set up to allow inbound traffic on port 25. If you get a `Connection refused` error instead, make sure your firewall is set up to allow inbound traffic on port 25.
1. Send the `incoming` user a dummy email to test SMTP, by entering the following into the SMTP prompt: 1. Send the `incoming` user an email to test SMTP, by entering the following into the SMTP prompt:
```plaintext ```plaintext
ehlo gitlab.example.com ehlo gitlab.example.com
......
...@@ -663,10 +663,10 @@ Example response: ...@@ -663,10 +663,10 @@ Example response:
"weight": null, "weight": null,
"has_tasks": false, "has_tasks": false,
"_links": { "_links": {
"self": "http://gitlab.dummy:3000/api/v4/projects/1/issues/1", "self": "http://gitlab.example:3000/api/v4/projects/1/issues/1",
"notes": "http://gitlab.dummy:3000/api/v4/projects/1/issues/1/notes", "notes": "http://gitlab.example:3000/api/v4/projects/1/issues/1/notes",
"award_emoji": "http://gitlab.dummy:3000/api/v4/projects/1/issues/1/award_emoji", "award_emoji": "http://gitlab.example:3000/api/v4/projects/1/issues/1/award_emoji",
"project": "http://gitlab.dummy:3000/api/v4/projects/1" "project": "http://gitlab.example:3000/api/v4/projects/1"
}, },
"references": { "references": {
"short": "#1", "short": "#1",
......
...@@ -19,7 +19,7 @@ If you just want to delete everything and start over with an empty DB (approxima ...@@ -19,7 +19,7 @@ If you just want to delete everything and start over with an empty DB (approxima
bundle exec rake db:reset RAILS_ENV=development bundle exec rake db:reset RAILS_ENV=development
``` ```
If you just want to delete everything and start over with dummy data (approximately 4 minutes). This If you just want to delete everything and start over with sample data (approximately 4 minutes). This
also does `db:reset` and runs DB-specific migrations: also does `db:reset` and runs DB-specific migrations:
```shell ```shell
......
...@@ -27,7 +27,7 @@ Please note that [S/MIME signed](../administration/smime_signing_email.md) email ...@@ -27,7 +27,7 @@ Please note that [S/MIME signed](../administration/smime_signing_email.md) email
## Mailer previews ## Mailer previews
Rails provides a way to preview our mailer templates in HTML and plaintext using Rails provides a way to preview our mailer templates in HTML and plaintext using
dummy data. sample data.
The previews live in [`app/mailers/previews`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/app/mailers/previews) and can be viewed at The previews live in [`app/mailers/previews`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/app/mailers/previews) and can be viewed at
[`/rails/mailers`](http://localhost:3000/rails/mailers). [`/rails/mailers`](http://localhost:3000/rails/mailers).
......
...@@ -12,7 +12,7 @@ more repositories, by importing an SSH public key to your GitLab instance. ...@@ -12,7 +12,7 @@ more repositories, by importing an SSH public key to your GitLab instance.
This is useful for cloning repositories to your Continuous This is useful for cloning repositories to your Continuous
Integration (CI) server. By using deploy keys, you don't have to set up a Integration (CI) server. By using deploy keys, you don't have to set up a
dummy user account. fake user account.
There are two types of deploy keys: There are two types of deploy keys:
......
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