summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-08 11:06:17 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-08 11:06:17 +0200
commitdeb487ec1fd4f7c647211b33d341b408db70f6a9 (patch)
tree3e2673e3ed2fe7ae0b93ccf75a61d4f7ab3b959e /doc
parentb9452d7bcd76f519f391595559531cf893960ab6 (diff)
parente21bd9490c70e56b6cc471a2fec1a7a797a2a58a (diff)
downloadgitlab-ce-deb487ec1fd4f7c647211b33d341b408db70f6a9.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'doc')
-rw-r--r--doc/project_services/irker.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/project_services/irker.md b/doc/project_services/irker.md
index 1dbca20baf9..25c0c3ad2a6 100644
--- a/doc/project_services/irker.md
+++ b/doc/project_services/irker.md
@@ -34,7 +34,7 @@ need to follow the firsts steps of the next section.
in the `Server host` field on the Web page
1. Enter the server port of `irkerd` (e.g. defaults to 6659) in the
`Server port` field on the Web page.
-1. Optional: if `Default irc uri` is set, it has to be in the format
+1. Optional: if `Default IRC URI` is set, it has to be in the format
`irc[s]://domain.name` and will be prepend to each and every channel provided
by the user which is not a full URI.
1. Specify the recipients (e.g. #channel1, user1, etc.)