diff options
author | Stan Hu <stanhu@gmail.com> | 2015-12-11 01:30:24 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-12-11 01:30:24 +0300 |
commit | e2b6a4621ba41b412403ee1b4e081dc90611804f (patch) | |
tree | adf56cbd6408ad4968ceb7cae018f4b8126cc848 /doc | |
parent | 667065700bc2ef4c687043d9e6ef5eb500df09a3 (diff) | |
parent | d6e0a1883b9b0eb0faabc77f6c439d981e64a84a (diff) |
Merge pull request #9850 from davydovanton/doc-fix-typos
Fix typos in all docs
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/settings.md | 2 | ||||
-rw-r--r-- | doc/development/db_dump.md | 2 | ||||
-rw-r--r-- | doc/raketasks/backup_restore.md | 4 | ||||
-rw-r--r-- | doc/release/monthly.md | 2 | ||||
-rw-r--r-- | doc/web_hooks/web_hooks.md | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index d1b93a09c02..96867c67915 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -57,7 +57,7 @@ Parameters: - `default_project_visibility` - what visibility level new project receives - `default_snippet_visibility` - what visibility level new snippet receives - `restricted_signup_domains` - force people to use only corporate emails for signup -- `user_oauth_applications` - allow users to create oauth applicaitons +- `user_oauth_applications` - allow users to create oauth applications - `after_sign_out_path` - where redirect user after logout All parameters are optional. You can send only one that you want to change. diff --git a/doc/development/db_dump.md b/doc/development/db_dump.md index 21f1b3edecd..e4ff72aa349 100644 --- a/doc/development/db_dump.md +++ b/doc/development/db_dump.md @@ -1,4 +1,4 @@ -# Importing a database dump into a staging enviroment +# Importing a database dump into a staging environment Sometimes it is useful to import the database from a production environment into a staging environment for testing. The procedure below assumes you have diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md index b4d2786bd76..093450a6de3 100644 --- a/doc/raketasks/backup_restore.md +++ b/doc/raketasks/backup_restore.md @@ -357,8 +357,8 @@ If you are using backup restore procedures you might encounter the following war ``` psql:/var/opt/gitlab/backups/db/database.sql:22: ERROR: must be owner of extension plpgsql -psql:/var/opt/gitlab/backups/db/database.sql:2931: WARNING: no privileges could be revoked for "public" (two occurences) -psql:/var/opt/gitlab/backups/db/database.sql:2933: WARNING: no privileges were granted for "public" (two occurences) +psql:/var/opt/gitlab/backups/db/database.sql:2931: WARNING: no privileges could be revoked for "public" (two occurrences) +psql:/var/opt/gitlab/backups/db/database.sql:2933: WARNING: no privileges were granted for "public" (two occurrences) ``` diff --git a/doc/release/monthly.md b/doc/release/monthly.md index aff3f066b24..907c19e65a0 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -176,7 +176,7 @@ Tweet about the RC release: 1. Also check the CI changelog 1. Add a proposed tweet text to the blog post WIP MR description. 1. Create a WIP MR for the blog post -1. Make sure merge request title starts with `WIP` so it can not be accidently merged until ready. +1. Make sure merge request title starts with `WIP` so it can not be accidentally merged until ready. 1. Ask Dmitriy (or a team member with OS X) to add screenshots to the WIP MR. 1. Decide with core team who will be the MVP user. 1. Create WIP MR for adding MVP to MVP page on website diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md index 03746dd9df3..6420d65cf1b 100644 --- a/doc/web_hooks/web_hooks.md +++ b/doc/web_hooks/web_hooks.md @@ -188,7 +188,7 @@ X-Gitlab-Event: Note Hook { "object_kind": "note", "user": { - "name": "Adminstrator", + "name": "Administrator", "username": "root", "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" }, @@ -341,7 +341,7 @@ X-Gitlab-Event: Note Hook { "object_kind": "note", "user": { - "name": "Adminstrator", + "name": "Administrator", "username": "root", "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon" }, |