Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Conf.pm
index 6a02b0b,c410f63..ed72354
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -900,7 -900,7 +900,7 @@@ my $validate_email = sub { $_[0] =
    {
      'key'         => 'email-to-voice_domain',
      'section'     => 'email_to_voice_services',
-     'description' => 'The domain name used to send emails to a 3rd party email to voice service.  You will be able to select a phone number to append to this domain on the email customer page or when using the email to voice billing event action.',
+     'description' => 'The domain name that phone numbers will be attached to for sending email to voice emails via a 3rd party email to voice service.  You will get this domain from your email to voice service provider.  This is utilized on the email customer page or when using the email to voice billing event action.  There you will be able to select the phone number for the email to voice service.',
      'type'        => 'text',
      'per_agent'   => 1,
    },
@@@ -4488,7 -4488,7 +4488,7 @@@ and customer address. Include units.'
      'section'     => 'addresses',
      'description' => 'The year to use in census tract lookups.  NOTE: you need to select 2012 or 2013 for Year 2010 Census tract codes.  A selection of 2011 provides Year 2000 Census tract codes.  Use the freeside-censustract-update tool if exisitng customers need to be changed.',
      'type'        => 'select',
 -    'select_enum' => [ qw( 2013 2012 2011 ) ],
 +    'select_enum' => [ qw( 2017 2016 2015 ) ],
    },
  
    {