From: C. Braun Date: Fri, 13 May 2011 13:46:47 +0000 (+0200) Subject: Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp X-Git-Tag: release-2.6.3~25^2~35 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=915e943a8fa8ab2a32576d4609632d598898cf20;hp=27ae86579fb8833067e9d6c02cf5429d98b28449;p=kivitendo-erp.git Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp --- diff --git a/config/lx_office.conf.default b/config/lx_office.conf.default index bc350c7d1..c8924efd4 100644 --- a/config/lx_office.conf.default +++ b/config/lx_office.conf.default @@ -35,7 +35,7 @@ password = # the LDAP server the passwords are verified against by doing a LDAP # bind operation. # -# At least the parameters 'host', 'aatribute' and 'base_dn' have to be +# At least the parameters 'host', 'attribute' and 'base_dn' have to be # specified. # # tls: Activate encryption via TLS @@ -65,8 +65,8 @@ eur = 1 # "de_DE" (new German) and "en" (English, not perfect) are available. language = de -# The database charset. Must match the database cluster you want to -# connect to. +# The database charset. Must match the encoding of the database cluster you want to +# connect to. (Used on the shell command to create a database "pg_createcluster". Option "-e ".) dbcharset = UTF-8 [features]