From: Jan Büren <jan@lx-office-hosting.de>
Date: Fri, 13 May 2011 12:44:02 +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^2^2^2~1
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/f734534304287c27d97e58bc37009f1f17205c55?hp=2cd3c20c4f9853e5b0052907e3bd0b99ed9d7135

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 e4991fd0c..5f7f272a4 100644
--- 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 fa570c3be..8443321e1 100755
--- 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