From 9799f4beab387422c63e6ef48ca1e5cb5e298b7e Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Wed, 14 Aug 2013 09:55:46 +0200 Subject: [PATCH] Fix mistakes in the documentation files resolves #4503 --- doc/authentication.md | 7 +++++-- doc/resources.md | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/authentication.md b/doc/authentication.md index 2d54c2287..4590dc230 100644 --- a/doc/authentication.md +++ b/doc/authentication.md @@ -17,7 +17,9 @@ priority in case of an error. If the resource referenced in the first entry (the is not reachable, the next lower entry will be used for authentication. Please be aware that this behaviour is not valid for the authentication itself. The authentication will only be done against the one available resource with the highest -priority. +priority. When an account is only present in a backend with lower priority, it will not +be able to authenticate when a backend with higher priority is active that does not contain +this account. ### Backend @@ -46,7 +48,8 @@ in the *authentication.ini*, like described in the example configuration. ### target -The value of the configuration key *target* defines +The value of the configuration key *target* defines the type of authentication the described backend provides. +The allowed values are *user* for a backend that provides user authentication or *group* for group authentication. ## Technical description diff --git a/doc/resources.md b/doc/resources.md index 4873fb1ad..b407a4d46 100644 --- a/doc/resources.md +++ b/doc/resources.md @@ -1,9 +1,8 @@ # Resources The configuration file *config/resources.ini* contains data sources that can be referenced -in other configurations. This allows you to manage all connections to SQL databases in one -single place, avoiding the need to edit several different configuration files, when the -connection information of a resource change. +in other configurations. This allows you to manage all connections to databases at one central +place, avoiding the need to edit several different files, when the connection information of a resource change. ## Configuration @@ -14,7 +13,7 @@ Currently only the resource type *db* is available. ### db -This resource type represents a SQL database. The property *db* defines the used sql database, which +This resource type describes a SQL database. The property *db* defines the used database vendor, which could be a value like *mysql* or *pgsql*. The other properties like *host*, *password*, *username* and *dbname* are the connection information for the resource.