From 0743687bf6555366f4bf2f85ea52e1e191fb683c Mon Sep 17 00:00:00 2001 From: "bzrmirror%bugzilla.org" Date: Mon, 21 Jul 2014 15:45:48 +0000 Subject: [PATCH] Bug 950363 - The description of the 'smtpserver' parameter should specify that it accepts a port number r=dkl,a=glob git-svn-id: svn://10.0.0.236/trunk@265463 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/.gitrev | 2 +- .../bugzilla/template/en/default/admin/params/mta.html.tmpl | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index e53ef400e53..7061abd9eaa 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9084 \ No newline at end of file +9085 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index a69be62d651..8309b215f62 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -ffec3478b0b02ffd8e7e248f5c8f52f0a4a02ff5 \ No newline at end of file +edea6b841633c154ebb7f85917db1597a118a86c \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/params/mta.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/params/mta.html.tmpl index 4aee7090ddb..86a7a22cbf7 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/params/mta.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/params/mta.html.tmpl @@ -42,7 +42,8 @@ _ " won't get sent). This affects all mail sent by Bugzilla," _ " not just $terms.bug updates.", - smtpserver => "The SMTP server address (if using SMTP for mail delivery).", + smtpserver => "The SMTP server address with optional port number (if using SMTP" _ + " for mail delivery). eg: example.com or example.com:1234", smtp_username => "The username to pass to the SMTP server for SMTP authentication. " _ "Leave this field empty if your SMTP server doesn't require authentication.",