Mercurial > kallithea
diff docs/setup.rst @ 5412:2079e864ce51
spelling: use "email" consistently
The common English spelling is "email", not "e-mail" (and was indeed
also the most common, but not only, variant in the Kallithea UI).
http://grammarist.com/style/e-mail-email/
| author | Søren Løvborg <sorenl@unity3d.com> |
|---|---|
| date | Fri, 14 Aug 2015 17:07:49 +0200 |
| parents | faf943716616 |
| children | 22a3fa3c4254 |
line wrap: on
line diff
--- a/docs/setup.rst Fri Aug 14 17:07:49 2015 +0200 +++ b/docs/setup.rst Fri Aug 14 17:07:49 2015 +0200 @@ -199,7 +199,7 @@ Login Attribute = uid First Name Attribute = firstName Last Name Attribute = lastName - E-mail Attribute = mail + Email Attribute = mail If your user groups are placed in an Organisation Unit (OU) structure, the Search Settings configuration differs:: @@ -364,7 +364,7 @@ Login Attribute = sAMAccountName First Name Attribute = givenName Last Name Attribute = sn - E-mail Attribute = mail + Email Attribute = mail All other LDAP settings will likely be site-specific and should be appropriately configured. @@ -509,7 +509,7 @@ -------------------- Kallithea can use the distributed task queue system Celery_ to run tasks like -cloning repositories or sending mails. +cloning repositories or sending emails. Kallithea will in most setups work perfectly fine out of the box (without Celery), executing all tasks in the web server process. Some tasks can however