Commit 38fa9e8f authored by Robert Speicher's avatar Robert Speicher

Merge branch 'docs-typo-fixes' into 'master'

Fix various documentation typos and spelling mistakes

[ci skip]

See merge request !4345
parents f62133c6 9948a8fb
...@@ -5,7 +5,7 @@ This feature was [introduced][ce-3232] in GitLab 8.7. It is OFF by ...@@ -5,7 +5,7 @@ This feature was [introduced][ce-3232] in GitLab 8.7. It is OFF by
default because it still causes too many false alarms. default because it still causes too many false alarms.
Git has a built-in mechanism, [git fsck][git-fsck], to verify the Git has a built-in mechanism, [git fsck][git-fsck], to verify the
integrity of all data commited to a repository. GitLab administrators integrity of all data committed to a repository. GitLab administrators
can trigger such a check for a project via the project page under the can trigger such a check for a project via the project page under the
admin panel. The checks run asynchronously so it may take a few minutes admin panel. The checks run asynchronously so it may take a few minutes
before the check result is visible on the project admin page. If the before the check result is visible on the project admin page. If the
......
...@@ -39,7 +39,7 @@ Example response: ...@@ -39,7 +39,7 @@ Example response:
{ {
"name" : "critical", "name" : "critical",
"color" : "#d9534f", "color" : "#d9534f",
"description": "Criticalissue. Need fix ASAP", "description": "Critical issue. Need fix ASAP",
"open_issues_count": 1, "open_issues_count": 1,
"closed_issues_count": 3, "closed_issues_count": 3,
"open_merge_requests_count": 1 "open_merge_requests_count": 1
......
...@@ -16,8 +16,8 @@ PUT /projects/:id/services/asana ...@@ -16,8 +16,8 @@ PUT /projects/:id/services/asana
Parameters: Parameters:
- `api_key` (**required**) - User API token. User must have access to task,all comments will be attributed to this user. - `api_key` (**required**) - User API token. User must have access to task, all comments will be attributed to this user.
- `restrict_to_branch` (optional) - Comma-separated list of branches which will beautomatically inspected. Leave blank to include all branches. - `restrict_to_branch` (optional) - Comma-separated list of branches which will be automatically inspected. Leave blank to include all branches.
### Delete Asana service ### Delete Asana service
......
...@@ -116,7 +116,7 @@ Example with Arel: ...@@ -116,7 +116,7 @@ Example with Arel:
users = Arel::Table.new(:users) users = Arel::Table.new(:users)
users.group(users[:user_id]).having(users[:id].count.gt(5)) users.group(users[:user_id]).having(users[:id].count.gt(5))
#updtae other tables with this results #update other tables with these results
``` ```
Example with plain SQL and `quote_string` helper: Example with plain SQL and `quote_string` helper:
......
...@@ -81,7 +81,7 @@ errors during usage. ...@@ -81,7 +81,7 @@ errors during usage.
- More users? Run it on [multiple application servers](https://about.gitlab.com/high-availability/) - More users? Run it on [multiple application servers](https://about.gitlab.com/high-availability/)
We recommend having at least 1GB of swap on your server, even if you currently have We recommend having at least 1GB of swap on your server, even if you currently have
enough available RAM. Having swap will help reduce the chance of errors occuring enough available RAM. Having swap will help reduce the chance of errors occurring
if your available memory changes. if your available memory changes.
Notice: The 25 workers of Sidekiq will show up as separate processes in your process overview (such as top or htop) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about many you need of those. Notice: The 25 workers of Sidekiq will show up as separate processes in your process overview (such as top or htop) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about many you need of those.
......
## Log system ## Log system
GitLab has advanced log system so everything is logging and you can analize your instance using various system log files. GitLab has an advanced log system where everything is logged so that you can analyze your instance using various system log files.
In addition to system log files, GitLab Enterprise Edition comes with Audit Events. Find more about them [in Audit Events documentation](http://docs.gitlab.com/ee/administration/audit_events.html) In addition to system log files, GitLab Enterprise Edition comes with Audit Events. Find more about them [in Audit Events documentation](http://docs.gitlab.com/ee/administration/audit_events.html)
System log files are typically plain text in a standard log file format. This guide talks about how to read and use these system log files. System log files are typically plain text in a standard log file format. This guide talks about how to read and use these system log files.
...@@ -67,13 +67,13 @@ gitlab-shell is using by Gitlab for executing git commands and provide ssh acces ...@@ -67,13 +67,13 @@ gitlab-shell is using by Gitlab for executing git commands and provide ssh acces
``` ```
I, [2015-02-13T06:17:00.671315 #9291] INFO -- : Adding project root/example.git at </var/opt/gitlab/git-data/repositories/root/dcdcdcdcd.git>. I, [2015-02-13T06:17:00.671315 #9291] INFO -- : Adding project root/example.git at </var/opt/gitlab/git-data/repositories/root/dcdcdcdcd.git>.
I, [2015-02-13T06:17:00.679433 #9291] INFO -- : Moving existing hooks directory and simlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git. I, [2015-02-13T06:17:00.679433 #9291] INFO -- : Moving existing hooks directory and symlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git.
``` ```
#### unicorn_stderr.log #### unicorn_stderr.log
This file lives in `/var/log/gitlab/unicorn/unicorn_stderr.log` for omnibus package or in `/home/git/gitlab/log/unicorn_stderr.log` for installations from the source. This file lives in `/var/log/gitlab/unicorn/unicorn_stderr.log` for omnibus package or in `/home/git/gitlab/log/unicorn_stderr.log` for installations from the source.
Unicorn is a high-performance forking Web server which is used for serving GitLab application. You can look at this log, for example, if your application does not respond. This log cantains all information about state of unicorn processes at any given time. Unicorn is a high-performance forking Web server which is used for serving the GitLab application. You can look at this log if, for example, your application does not respond. This log contains all information about the state of unicorn processes at any given time.
``` ```
I, [2015-02-13T06:14:46.680381 #9047] INFO -- : Refreshing Gem list I, [2015-02-13T06:14:46.680381 #9047] INFO -- : Refreshing Gem list
......
...@@ -355,7 +355,7 @@ sudo chown git:git /var/opt/gitlab/gitlab-ci/builds ...@@ -355,7 +355,7 @@ sudo chown git:git /var/opt/gitlab/gitlab-ci/builds
``` ```
#### Problems when importing CI database to GitLab #### Problems when importing CI database to GitLab
If you were migrating CI database from MySQL to PostgreSQL manually you can see errros during import about missing sequences: If you were migrating CI database from MySQL to PostgreSQL manually you can see errors during import about missing sequences:
``` ```
ALTER SEQUENCE ALTER SEQUENCE
ERROR: relation "ci_builds_id_seq" does not exist ERROR: relation "ci_builds_id_seq" does not exist
......
...@@ -134,7 +134,7 @@ sudo -u git sh -c ' ...@@ -134,7 +134,7 @@ sudo -u git sh -c '
cat /var/opt/gitlab/transfer-logs/* | sort | uniq -u |\ cat /var/opt/gitlab/transfer-logs/* | sort | uniq -u |\
/usr/bin/env JOBS=10 \ /usr/bin/env JOBS=10 \
/opt/gitlab/embedded/service/gitlab-rails/bin/parallel-rsync-repos \ /opt/gitlab/embedded/service/gitlab-rails/bin/parallel-rsync-repos \
/var/opt/gitlab/transfer-logs/succes-$(date +%s).log \ /var/opt/gitlab/transfer-logs/success-$(date +%s).log \
/var/opt/gitlab/git-data/repositories \ /var/opt/gitlab/git-data/repositories \
/mnt/gitlab/repositories /mnt/gitlab/repositories
' '
...@@ -145,7 +145,7 @@ sudo -u git -H sh -c ' ...@@ -145,7 +145,7 @@ sudo -u git -H sh -c '
cat /home/git/transfer-logs/* | sort | uniq -u |\ cat /home/git/transfer-logs/* | sort | uniq -u |\
/usr/bin/env JOBS=10 \ /usr/bin/env JOBS=10 \
bin/parallel-rsync-repos \ bin/parallel-rsync-repos \
/home/git/transfer-logs/succes-$(date +%s).log \ /home/git/transfer-logs/success-$(date +%s).log \
/home/git/repositories \ /home/git/repositories \
/mnt/gitlab/repositories /mnt/gitlab/repositories
` `
...@@ -164,7 +164,7 @@ sudo gitlab-rake gitlab:list_repos SINCE='2015-10-1 12:00 UTC' |\ ...@@ -164,7 +164,7 @@ sudo gitlab-rake gitlab:list_repos SINCE='2015-10-1 12:00 UTC' |\
sudo -u git \ sudo -u git \
/usr/bin/env JOBS=10 \ /usr/bin/env JOBS=10 \
/opt/gitlab/embedded/service/gitlab-rails/bin/parallel-rsync-repos \ /opt/gitlab/embedded/service/gitlab-rails/bin/parallel-rsync-repos \
succes-$(date +%s).log \ success-$(date +%s).log \
/var/opt/gitlab/git-data/repositories \ /var/opt/gitlab/git-data/repositories \
/mnt/gitlab/repositories /mnt/gitlab/repositories
...@@ -174,7 +174,7 @@ sudo -u git -H bundle exec rake gitlab:list_repos SINCE='2015-10-1 12:00 UTC' |\ ...@@ -174,7 +174,7 @@ sudo -u git -H bundle exec rake gitlab:list_repos SINCE='2015-10-1 12:00 UTC' |\
sudo -u git -H \ sudo -u git -H \
/usr/bin/env JOBS=10 \ /usr/bin/env JOBS=10 \
bin/parallel-rsync-repos \ bin/parallel-rsync-repos \
succes-$(date +%s).log \ success-$(date +%s).log \
/home/git/repositories \ /home/git/repositories \
/mnt/gitlab/repositories /mnt/gitlab/repositories
``` ```
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