From c67b3b303adba379f3625aa88a61d5fb49bd319d Mon Sep 17 00:00:00 2001
From: Simon Green <mail@simon.green>
Date: Thu, 15 Sep 2016 18:49:50 +1000
Subject: Bug 399066 - Remove the 'cookiedomain' parameter

---
 template/en/default/admin/params/advanced.html.tmpl   | 7 -------
 template/en/default/admin/params/attachment.html.tmpl | 5 -----
 2 files changed, 12 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 1aedc9f9b..70171bd53 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -41,13 +41,6 @@
 [% END %]
 
 [% param_descs = {
-  cookiedomain => 
-    "If your website is at 'www.foo.com', setting this to"
-    _ " '.foo.com' will also allow 'bar.foo.com' to access"
-    _ " Bugzilla cookies. This is useful if you have more than"
-    _ " one hostname pointing at the same web server, and you"
-    _ " want them to share the Bugzilla cookie.",
-
   inbound_proxies =>
     "When inbound traffic to Bugzilla goes through a proxy,"
     _ " Bugzilla thinks that the IP address of every single"
diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index c850802ab..1e65f0ca4 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -31,11 +31,6 @@
     _ " that is not the same as <var>urlbase</var> or <var>sslbase</var>."
     _ " That is, a different domain name that resolves to this exact"
     _ " same Bugzilla installation.</p>"
-    _ "<p>Note that if you have set the"
-    _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><var>cookiedomain</var>"
-    _" parameter</a>, you should set <var>attachment_base</var> to use a"
-    _ " domain that would <em>not</em> be matched by"
-    _ " <var>cookiedomain</var>.</p>"
     _ "<p>For added security, you can insert <var>%bugid%</var> into the URL,"
     _ " which will be replaced with the ID of the current $terms.bug that"
     _ " the attachment is on, when you access an attachment. This will limit"
-- 
cgit v1.2.3-24-g4f1b