From 8ff48b43011d7a26cc9b0996ea76fd668074f002 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 7 Jan 2014 11:10:18 -0500
Subject: Bug 957134 - Insecure transition

---
 template/en/default/search/search-google.html.tmpl | 34 +++++++---------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/template/en/default/search/search-google.html.tmpl b/template/en/default/search/search-google.html.tmpl
index 080887abb..f363248a5 100644
--- a/template/en/default/search/search-google.html.tmpl
+++ b/template/en/default/search/search-google.html.tmpl
@@ -1,40 +1,28 @@
-[%# The contents of this file are subject to the Mozilla Public
-  # License Version 1.1 (the "License"); you may not use this file
-  # except in compliance with the License. You may obtain a copy of
-  # the License at http://www.mozilla.org/MPL/
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   #
-  # Software distributed under the License is distributed on an "AS
-  # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-  # implied. See the License for the specific language governing
-  # rights and limitations under the License.
-  #
-  # The Original Code is the Bugzilla Bug Tracking System.
-  #
-  # The Initial Developer of the Original Code is the Mozilla Foundation
-  # Portions created by the Initial Developers are Copyright (C) 2011 the
-  # Initial Developer. All Rights Reserved.
-  #
-  # Contributor(s):
-  #   Dave Lawrence <dkl@mozilla.com>
-  #%] 
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% PROCESS global/header.html.tmpl 
+[% PROCESS global/header.html.tmpl
   title = "Search " _ terms.Bugs _ " using Google"
 %]
 
 [% WRAPPER search/tabs.html.tmpl %]
 
 <p>
-  Use the <a href="http://www.google.com">Google</a> search engine to search 
+  Use the <a href="http://www.google.com">Google</a> search engine to search
   for [% terms.Bugzilla +%] [%+ terms.bugs %]. Find the [% terms.bugs %] you are
   looking for by entering words that best describe it.
 </p>
 
 <p>
-  For example, if the [% terms.bug %] you are looking for is a browser crash when 
-  you go to a secure web site with an embedded Flash animation, you might search 
+  For example, if the [% terms.bug %] you are looking for is a browser crash when
+  you go to a secure web site with an embedded Flash animation, you might search
   for "crash secure SSL flash".
 </p>
 
@@ -43,7 +31,7 @@
   Google only indexes publicly viewable [% terms.bugs %] and all may not be represented.
 <p>
 
-<form method="get" action="http://www.google.com/search">
+<form method="get" action="https://www.google.com/search">
 <input type="hidden" name="sitesearch" value="bugzilla.mozilla.org">
   <nobr>
     <input type="text" name="q" size="60" maxlength="255" value="">
-- 
cgit v1.2.3-24-g4f1b