summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorEwan Edwards <eedwards@perforce.com>2015-02-03 15:18:40 -0800
committerEwan Edwards <eedwards@perforce.com>2015-02-03 15:18:40 -0800
commitad6c372eeee5d112ad199dd4e487df584976445d (patch)
tree802124a688c9d90861c033a23342512008a56665 /doc/integration
parente6e337088bbb4736983119928b6b6b451bd3ef20 (diff)
downloadgitlab-ce-ad6c372eeee5d112ad199dd4e487df584976445d.tar.gz
Fix a number of discovered typos, capitalization of developer and
product names, plus a couple of instances of bad Markdown markup.
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/README.md2
-rw-r--r--doc/integration/external-issue-tracker.md2
-rw-r--r--doc/integration/gitlab_buttons_in_gmail.md4
-rw-r--r--doc/integration/shibboleth.md8
4 files changed, 8 insertions, 8 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index 357ed038314..0087167bb84 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -13,7 +13,7 @@ Jenkins support is [available in GitLab EE](http://doc.gitlab.com/ee/integration
## Project services
-Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, PivotalTracker and Slack are available in the from of a Project Service.
+Integration with services such as Campfire, Flowdock, Gemnasium, HipChat, Pivotal Tracker, and Slack are available in the form of a Project Service.
You can find these within GitLab in the Services page under Project Settings if you are at least a master on the project.
Project Services are a bit like plugins in that they allow a lot of freedom in adding functionality to GitLab, for example there is also a service that can send an email every time someone pushes new commits.
Because GitLab is open source we can ship with the code and tests for all plugins.
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 87af94512ed..ba4df9f8fe0 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -6,7 +6,7 @@ GitLab has a great issue tracker but you can also use an external issue tracker
- clicking 'New issue' on the project dashboard creates a new JIRA issue;
- To reference JIRA issue PROJECT-1234 in comments, use syntax PROJECT-1234. Commit messages get turned into HTML links to the corresponding JIRA issue.
-![jira screenshot](jira-integration-points.png)
+![Jira screenshot](jira-integration-points.png)
You can configure the integration in the gitlab.yml configuration file.
diff --git a/doc/integration/gitlab_buttons_in_gmail.md b/doc/integration/gitlab_buttons_in_gmail.md
index 0816509c557..a9885cef109 100644
--- a/doc/integration/gitlab_buttons_in_gmail.md
+++ b/doc/integration/gitlab_buttons_in_gmail.md
@@ -1,4 +1,4 @@
-# GitLab buttons in gmail
+# GitLab buttons in Gmail
GitLab supports [Google actions in email](https://developers.google.com/gmail/markup/actions/actions-overview).
@@ -25,4 +25,4 @@ If you receive "No errors detected" message from the tester you can send the ema
```bash
bundle exec rake gitlab:mail_google_schema_whitelisting RAILS_ENV=production SEND=true
-``
+```
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index 1b03197b6c7..ea11f1afeab 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -2,7 +2,7 @@
This documentation is for enabling shibboleth with gitlab-omnibus package.
-In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider.
+In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however I did not found way to easily configure Nginx that is bundled in gitlab-omnibus package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider.
To enable the Shibboleth OmniAuth provider you must:
@@ -10,7 +10,7 @@ To enable the Shibboleth OmniAuth provider you must:
1. Configure Apache shibboleth module. Installation and configuration of module it self is out of scope of this document.
Check https://wiki.shibboleth.net/ for more info.
-1. You can find Apache config in gitlab-reciepes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf)
+1. You can find Apache config in gitlab-recipes (https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/apache/gitlab-ssl.conf)
Following changes are needed to enable shibboleth:
@@ -34,7 +34,7 @@ protect omniauth-shibboleth callback URL:
```
exclude shibboleth URLs from rewriting, add "RewriteCond %{REQUEST_URI} !/Shibboleth.sso" and "RewriteCond %{REQUEST_URI} !/shibboleth-sp", config should look like this:
```
- #apache equivalent of nginx try files
+ # Apache equivalent of Nginx try files
RewriteEngine on
RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !/Shibboleth.sso
@@ -50,7 +50,7 @@ File it should look like this:
external_url 'https://gitlab.example.com'
gitlab_rails['internal_api_url'] = 'https://gitlab.example.com'
-# disable nginx
+# disable Nginx
nginx['enable'] = false
gitlab_rails['omniauth_allow_single_sign_on'] = true