projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
config
/
lx_office.conf.default
diff --git
a/config/lx_office.conf.default
b/config/lx_office.conf.default
index
bc350c7
..
c8924ef
100644
(file)
--- 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.
#
# the LDAP server the passwords are verified against by doing a LDAP
# bind operation.
#
-# At least the parameters 'host', 'a
a
tribute' and 'base_dn' have to be
+# At least the parameters 'host', 'a
t
tribute' and 'base_dn' have to be
# specified.
#
# tls: Activate encryption via TLS
# 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
# "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 <encoding>".)
dbcharset = UTF-8
[features]
dbcharset = UTF-8
[features]