Mercurial > kallithea

changeset 770:5f82a00b92b1 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs update
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 26 Nov 2010 10:00:17 +0100
parents 4bdcc08b04c4
children 16884b3e42cb
files docs/setup.rst
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/docs/setup.rst	Fri Nov 26 09:32:40 2010 +0100
+++ b/docs/setup.rst	Fri Nov 26 10:00:17 2010 +0100
@@ -82,7 +82,6 @@
 Setting up LDAP support
 -----------------------
 
-
 RhodeCode starting from version 1.1 supports ldap authentication. In order
 to use ldap, You have to install python-ldap package. This package is available
 via pypi, so You can install it by running
@@ -95,21 +94,21 @@
 
  pip install python-ldap
 
+.. note::
+   python-ldap requires some certain libs on Your system, so before installing 
+   it check that You have at least `openldap`, and `sasl` libraries.
 
-python-ldap requires some certain libs on Your system, so before installing it 
-check that You have at least `openldap`, and `sasl` libraries.
-
-ldap settings are located in admin->permissions section,
+ldap settings are located in admin->ldap section,
 
 Here's a typical ldap setup::
 
- Enable ldap  = checked                 #controlls if ldap access is enabled
- Host         = host.domain.org         #acctuall ldap server to connect
+ Enable ldap  = checked                 #controls if ldap access is enabled
+ Host         = host.domain.org         #actual ldap server to connect
  Port         = 389 or 689 for ldaps    #ldap server ports
  Enable LDAPS = unchecked               #enable disable ldaps
  Account      = <account>               #access for ldap server(if required)
  Password     = <password>              #password for ldap server(if required)
- Base DN      = CN=users,DC=host,DC=domain,DC=org
+ Base DN      = uid=%(user)s,CN=users,DC=host,DC=domain,DC=org
  
 
 `Account` and `Password` are optional, and used for two-phase ldap 
@@ -117,7 +116,7 @@
 support anonymous search/user lookups.
 
 If all data are entered correctly, and `python-ldap` is properly installed
-Users should be granted to access RhodeCode wit theire ldap accounts. When 
+Users should be granted to access RhodeCode wit ldap accounts. When 
 logging at the first time an special ldap account is created inside RhodeCode, 
 so You can control over permissions even on ldap users. If such user exists 
 already in RhodeCode database ldap user with the same username would be not