From ec9b5fd81dc74c7f69d221fa529be1c2543a12a0 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 21 Jul 2015 12:58:36 +0800
Subject: Bug 1180572 - create attachment_storage parameter

---
 .../en/default/admin/params/attachment.html.tmpl   | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'template/en/default/admin')

diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index 4075374bc..bdd20c676 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -57,19 +57,17 @@
     _ " (such as <tt>1234.your.domain.com</tt>) must point to this same"
     _ " $terms.Bugzilla instance.",
 
-  allow_attachment_deletion => "If this option is on, administrators will be able to delete " _
-                               "the content of attachments.",
+  allow_attachment_deletion =>
+    "If this option is on, administrators will be able to delete " _
+    "the content of attachments.",
 
-  maxattachmentsize => "The maximum size (in kilobytes) of attachments to be stored " _
-                       "in the database. If a file larger than this size is attached " _
-                       "to ${terms.abug}, $terms.Bugzilla will look at the " _
-                       "<a href=\"#maxlocalattachment\"><tt>maxlocalattachment</tt> parameter</a> " _
-                       "to determine if the file can be stored locally on the web server. " _
-                       "If the file size exceeds both limits, then the attachment is rejected. " _
-                       "Settings both parameters to 0 will prevent attaching files to ${terms.bugs}.",
+  maxattachmentsize =>
+    "The maximum size (in kilobytes) of attachments.",
 
-  maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _
-                        "locally on the web server. If set to a value lower than the " _
-                        "<a href=\"#maxattachmentsize\"><tt>maxattachmentsize</tt> parameter</a>, " _
-                        "attachments will never be kept on the local filesystem." }
+  attachment_storage =>
+    "Where attachment data should be stored.  If this value is changed you " _
+    "must use <tt>scripts/mmigrate-attachments</tt> to migrate existing " _
+    "attachments.",
+
+  }
 %]
-- 
cgit v1.2.3-24-g4f1b