From: Mark Wells <mark@freeside.biz>
Date: Thu, 8 Sep 2016 21:40:39 +0000 (-0700)
Subject: Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=162097d4e2bd08efd71d998406c14cbfeb108d0b;hp=cda0cfbe3c69fa260ba7e5ce9b50853dfba7cc97;p=freeside.git

Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index a4eba607b..7610b63d7 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -5508,8 +5508,8 @@ and customer address. Include units.',
 
   {
     'key'         => 'cust_bill-latex_lineitem_maxlength',
-    'section'     => 'invoicing',
-    'description' => 'Truncate long line items to this number of characters on typeset invoices, to avoid losing things off the right margin.  Defaults to 50.  ',
+    'section'     => 'deprecated',
+    'description' => 'With old invoice_latex template, truncate long line items to this number of characters on typeset invoices, to avoid losing things off the right margin.  (With current invoice_latex template, this is handled internally in the template itself instead.)',
     'type'        => 'text',
   },