From 5c20fbc966bfc23d2bce3e6fbcbb6ea8dd706e89 Mon Sep 17 00:00:00 2001
From: "steffen.wilberg%web.de"
 <steffen.wilberg%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 17 Sep 2007 20:56:06 +0000
Subject: [PATCH] Bug 355060: Phishing Protection - false sense of security due
 to poor documentation. r=jwalden, a=mconnor

git-svn-id: svn://10.0.0.236/trunk@236140 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/locales/en-US/chrome/help/prefs.xhtml    | 12 ++++++++----
 .../browser/locales/en-US/chrome/help/search-db.rdf  |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml b/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
index eee11131237..53a3a75fc8a 100644
--- a/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
+++ b/mozilla/browser/locales/en-US/chrome/help/prefs.xhtml
@@ -409,11 +409,15 @@ Contributors:
   a specific site, click <em>Exceptions...</em>, enter the site name, and click
   <em>Allow</em>.  Uncheck this &pref.singular; to disable the warning for all
   sites.</p>
-    
-<p><em>Tell me if the site I'm visiting is a suspected forgery</em><br/>
+
+<p id="phishing"><em>Tell me if the site I'm visiting is a suspected forgery</em><br/>
   Check this &pref.singular; if you want &brandShortName; to actively check
   whether the site you are visiting may be an attempt to mislead you into
-  providing personal information (this is often referred to as <em>phishing</em>).</p>
+  providing personal information (this is often referred to as <em>phishing</em>).<br/>
+  Note that the absence of a warning does not guarantee that a site is trustworthy.
+  If you come across a "phishing" site which is not marked as such, please report
+  it using <span class="menuPath">Help &gt; Report Web Forgery...</span>, as
+  explained in the <a href="menu_reference.xhtml#web_forgery">menu reference</a>.</p>
 
 <p><em>Check using a downloaded list of suspected sites</em><br/>
   With this &pref.singular; selected, &brandShortName; will check the current
@@ -685,7 +689,7 @@ Contributors:
       than the one in &brandShortName;, click the <em>Security Devices</em>
       button.</p>
 
-<div class="contentsBox"><em>12 September 2006</em></div>
+<div class="contentsBox"><em>17 September 2007</em></div>
 <p>Copyright &copy; &copyright.years; Contributors to the Mozilla Help Viewer Project.</p>
 
 </body>
diff --git a/mozilla/browser/locales/en-US/chrome/help/search-db.rdf b/mozilla/browser/locales/en-US/chrome/help/search-db.rdf
index 8aac72b8e85..4569d77b118 100644
--- a/mozilla/browser/locales/en-US/chrome/help/search-db.rdf
+++ b/mozilla/browser/locales/en-US/chrome/help/search-db.rdf
@@ -14,6 +14,8 @@
         -->
         <li><Description nc:name="Accessibility Options" nc:link="prefs.xhtml#accessibility" nc:platform="win os2"/></li>
         <li><Description nc:name="Accessibility Preferences" nc:link="prefs.xhtml#accessibility" nc:platform="unix mac"/></li>
+        <li><Description nc:name="Anti-Phishing Options" nc:link="prefs.xhtml#phishing" nc:platform="win os2"/></li>
+        <li><Description nc:name="Anti-Phishing Preferences" nc:link="prefs.xhtml#phishing" nc:platform="unix mac"/></li>
         <li><Description nc:name="authentication (definition)" nc:link="glossary.xhtml#authentication"/></li>
         <li><Description nc:name="Back Button" nc:link="using_firebird.xhtml#retracing_your_steps"/></li>
         <li><Description nc:name="Block Popups" nc:link="popup.xhtml"/></li>