X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=config%2Fkivitendo.conf.default;h=f4b8fe437c91c10e496757d7f2b861009485289d;hb=1918cfae42cdc2732863f1f7184bd8643b1b9358;hp=4bcae08df687cee32e5fa8a5d4650cfb4a639cc2;hpb=adbc100a920bc6b60a371067170b31640d3e353d;p=kivitendo-erp.git

diff --git a/config/kivitendo.conf.default b/config/kivitendo.conf.default
index 4bcae08df..f4b8fe437 100644
--- a/config/kivitendo.conf.default
+++ b/config/kivitendo.conf.default
@@ -64,6 +64,10 @@ bind_password =
 # Set language for login and admin forms. Currently "de" (German)
 # and "en" (English, not perfect) are available.
 language = de
+# MassPrint Timeout
+# must be less than cgi timeout
+#
+massprint_timeout = 30
 
 # Set default_manager for admin forms. Currently "german"
 # and "swiss" are available.
@@ -93,6 +97,10 @@ spool = spool
 templates = templates
 # Path to the old memberfile (ignored on new installations)
 memberfile = users/members
+# Path to ELSTER geierlein webserver path inside kivitendo
+# (must be inside kivitendo but you can set an ALIAS for apache/oe
+# if set the export to geierlein is enabled
+# geierlein_path = geierlein
 
 [mail_delivery]
 # Delivery method can be 'sendmail' or 'smtp'. For 'method = sendmail' the
@@ -276,7 +284,7 @@ dbix_log4perl_config = log4perl.logger = FATAL, LOGFILE
                      = log4perl.appender.A1.layout.ConversionPattern=%d %p> %F{1}:%L %M - %m%n
 
 # Activate certain global debug messages. If you want to combine
-# several options then list them seperated by spaces.
+# several options then list them separated by spaces.
 #
 # Possible values include:
 #   NONE   - no debug output (default)
@@ -290,6 +298,8 @@ dbix_log4perl_config = log4perl.logger = FATAL, LOGFILE
 #   REQUEST            - Log each request. Careful! Passwords get filtered, but
 #                        there may be confidential information being logged here
 #   WARN               - warnings
+#   SHOW_CALLER        - include the file name & line number from where a call
+#                        to "message" or "dump" was called
 #   ALL                - all possible debug messages
 #
 #   DEVEL              - sames as "INFO QUERY TRACE BACKTRACE_ON_ERROR REQUEST_TIMER"