From 64479fd4ded500725e3b0bb124d9553083d5ccae Mon Sep 17 00:00:00 2001 From: kakwa Date: Tue, 21 Jul 2015 08:21:09 +0200 Subject: [PATCH] fix typos --- README.rst | 6 +++--- docs/deploy.rst | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/README.rst b/README.rst index 1a580a8..1100ec6 100644 --- a/README.rst +++ b/README.rst @@ -32,12 +32,12 @@ It's main features are: * roles management (as in "groups of groups") * autofill forms * password policy -* self modification of some selected fields by normal (non admin) users +* self modification of some selected fields by normal (non administrator) users * nice bootstrap interface -* modular through pluggable auth, password policy and backend modules +* modular through pluggable authentication, password policy and backend modules LdapCherry is not limited to ldap, it can handle virtually any user backend (ex: SQL database, htpasswd file, etc) -through the proper pluggin (provided that it is implemented ^^). +through the proper plugin (provided that it is implemented ^^). LdapCherry also aims to be as simple as possible to deploy: no crazy dependencies, few configuration files, extensive debug logs and full documentation. diff --git a/docs/deploy.rst b/docs/deploy.rst index ce05027..00a481d 100644 --- a/docs/deploy.rst +++ b/docs/deploy.rst @@ -95,7 +95,7 @@ If **type** is set to **stringlist** the parameter **values** must be filled wit Key attribute: ^^^^^^^^^^^^^^ -One attribute must be used as a unique key accross all backends: +One attribute must be used as a unique key across all backends: To set the key attribute, you must set **key** to **True** on this attribute. @@ -137,7 +137,7 @@ In such case, the parameter **self** must set to **True**: Autofill ^^^^^^^^ -LdapCherry has the possibility to autofill fields from other fields, +LdapCherry has the possibility to auto-fill fields from other fields, to use this functionnality **autofill** must be set. Example: @@ -161,12 +161,12 @@ Example: backends: ldap: gidNumber -Arguments of the autofill function work as follow: +Arguments of the **autofill** function work as follow: * if argument starts with **$**, for example **$my_field**, the value of form input **my_field** will be passed to the function. * otherwise, it will be treated as a fixed argument. -Available autofill functions: +Available **autofill** functions: * lcUid: generate 8 characters uid from 2 other fields (first letter of the first field, 7 first letters of the second): @@ -425,7 +425,7 @@ Logging LdapCherry has two loggers, one for errors and applicative actions (login, del/add, logout...) and one for access logs. -Each logger can be configured to log to syslog, file or be desactivated. +Each logger can be configured to log to syslog, file or be disabled. Logging parameters: @@ -461,6 +461,12 @@ Example: Other LdapCherry parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++---------------+-----------+--------------------------------+------------------------+ +| Parameter | Section | Description | Values | ++===============+===========+================================+========================+ +| template_dir | resources | LdapCherry template directory | path to template dir | ++---------------+-----------+--------------------------------+------------------------+ + .. sourcecode:: ini # resources parameters