From: C. Braun <information@lx-office-hosting.de>
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/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/915e943a8fa8ab2a32576d4609632d598898cf20?ds=inline;hp=-c

Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
---

915e943a8fa8ab2a32576d4609632d598898cf20
diff --combined config/lx_office.conf.default
index 44c290b53,bc350c7d1..c8924efd4
--- a/config/lx_office.conf.default
+++ b/config/lx_office.conf.default
@@@ -35,7 -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 +65,8 @@@ eur = 
  # "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]
@@@ -222,7 -222,8 +222,8 @@@ global_level = NON
  # default.
  watch_form = 0
  
- # Include menu options for debugging in the HTML menu
+ # Include menu options for debugging in the HTML menu. Works only in
+ # FastCGI mode.
  show_debug_menu = 0
  
  # If you want to debug the creation of LaTeX files then set this to 1.