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 e4991fd0c716b63de70c67448b5a765a5ec725eb..5f7f272a4dd4e0c4443166a58dffea35a051b6ca 100644 (file)
--- a/config/lx_office.conf.default
+++ b/config/lx_office.conf.default
@@ -222,7 +222,7 @@ global_level = NONE
 # default.
 watch_form = 0
 
-# Im HTML Menü ein Hilfsmenü zur Debugsteuerung zeigen.
+# Include menu options for debugging in the HTML menu
 show_debug_menu = 0
 
 # If you want to debug the creation of LaTeX files then set this to 1.

diff --git a/scripts/console b/scripts/console
index fa570c3beb90680e74a11bb9edf97e62dc8aba68..8443321e1aff57d664c72c3b491e775c4f5c765c 100755 (executable)
--- a/scripts/console
+++ b/scripts/console
@@ -18,7 +18,7 @@ SL::LxOfficeConf->read;
 
 my $login        = shift || $::lx_office_conf{console}{login}        || 'demo';
 my $history_file =          $::lx_office_conf{console}{history_file} || '/tmp/lxoffice_console_history.log'; # fallback if users is not writable
-my $debug_file   =          $::lx_office_conf{Console}{log_file}     || '/tmp/lxoffice_console_debug.log';
+my $debug_file   =          $::lx_office_conf{console}{log_file}     || '/tmp/lxoffice_console_debug.log';
 my $autorun      =          $::lx_office_conf{console}{autorun};
 
 # will be configed eventually
@@ -132,7 +132,7 @@ __END__
 
 =head1 NAME
 
-scripts/console - Lx Office Console
+scripts/console - Lx-Office console
 
 =head1 SYNOPSIS