[Rt-commit] rt branch, development, updated. 899a826adf7d9a6cd5679b695a42aa00dd5bdf80

[Thomas Sibley]

The branch, development has been updated
       via  899a826adf7d9a6cd5679b695a42aa00dd5bdf80 (commit)
      from  20bfa574ab81b459843ef324687eb160bdfd2dd0 (commit)

Summary of changes:
 lib/RT/Action/ConfigSystem.pm |    2 ++
 lib/RT/Config.pod             |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 899a826adf7d9a6cd5679b695a42aa00dd5bdf80
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Jul 20 17:07:12 2010 -0400

    Fix some system email config nits

diff --git a/lib/RT/Action/ConfigSystem.pm b/lib/RT/Action/ConfigSystem.pm
index 3241175..6a885d8 100644
--- a/lib/RT/Action/ConfigSystem.pm
+++ b/lib/RT/Action/ConfigSystem.pm
@@ -17,6 +17,8 @@ sub arguments {
     my %labels = (
         rtname      => 'RT Name',
         time_zone   => 'Timezone',
+        smtp_server => 'SMTP server',
+        smtp_from   => 'SMTP "From:"',
     );
 
     my $configs = RT::Model::ConfigCollection->new;
diff --git a/lib/RT/Config.pod b/lib/RT/Config.pod
index feebece..6481b88 100644
--- a/lib/RT/Config.pod
+++ b/lib/RT/Config.pod
@@ -298,14 +298,14 @@ These options only take effect if C<mail_command> is 'smtp'
 
 C<smtp_server> should be set to the hostname of the SMTP server to use
 
-Default: C<undef>
+Default: C<''>
 
 =item C<smtp_from>
 
 C<smtp_from> should be set to the 'From' address to use, if not the
 email's 'From'
 
-Default: C<undef>
+Default: C<''>
 
 =item C<smtp_debug> 
 

-----------------------------------------------------------------------