Bug 494424 - Update help for geolocation. r=IanN, a=Help change

suite/locales/en-US/chrome/common/help/glossary.xhtml

@@ -322,6 +322,9 @@
   standard that allows users to transfer files from one computer to another
   over a network. You can use your browser to fetch files using FTP.</dd>
 
+<dt id="geolocation_service">geolocation service</dt><dd>A web service for
+  <a href="#location_aware_browsing">location aware browsing</a>.</dd>
+
 <dt id="gssapi">GSSAPI (Generic Security Services Application Program
   Interface)</dt><dd>See <a href="#kerberos">Kerberos</a>.</dd>
 
@@ -437,6 +440,15 @@
   directories from the Address Book. You can also set up Mail &amp; Newsgroups
   to use an LDAP directory for email address autocompletion.</dd>
 
+<dt id="location_aware_browsing">location aware browsing</dt><dd>A method to
+  determine a user&apos;s location to provide customized services for the
+  current position, or for the purpose of <a href="#user_tracking">user
+  tracking</a>. In addition to the <a href="#ip_address">IP address</a>,
+  provider-specific information like wireless access points are used to
+  determine longitude and latitude, altitude as well as speed and heading
+  (as available) for the requesting <a href="#website">website</a>.
+  Provided by a <a href="#geolocation_service">geolocation service</a>.</dd>
+
 <dt id="location_bar">Location Bar</dt><dd>The field (and associated buttons)
   near the top of a browser window where you can type a
   <a href="#url">URL</a> or search terms.</dd>

suite/locales/en-US/chrome/common/help/help-glossary.rdf

@@ -57,6 +57,7 @@
         <rdf:li> <rdf:Description nc:name="foreign cookie" nc:link="glossary.xhtml#foreign_cookie"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="frame" nc:link="glossary.xhtml#frame"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FTP" nc:link="glossary.xhtml#ftp"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="geolocation service" nc:link="glossary.xhtml#geolocation_service"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="GSSAPI" nc:link="glossary.xhtml#gssapi"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="helper application" nc:link="glossary.xhtml#helper_application"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="home page" nc:link="glossary.xhtml#home_page"/> </rdf:li>
@@ -76,6 +77,7 @@
         <rdf:li> <rdf:Description nc:name="LaTeX" nc:link="glossary.xhtml#latex"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="LDAP" nc:link="glossary.xhtml#ldap"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="language pack" nc:link="glossary.xhtml#language_pack"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="location aware browsing" nc:link="glossary.xhtml#location_aware_browsing"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Location Bar" nc:link="glossary.xhtml#location_bar"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Malware" nc:link="glossary.xhtml#malware"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="master key" nc:link="glossary.xhtml#master_key"/> </rdf:li>

suite/locales/en-US/chrome/common/help/help-index1.rdf

@@ -1002,6 +1002,11 @@
          nc:name="LDAP"
          nc:link="mailnews_addressbooks.xhtml#adding_and_removing_ldap_directories"/>
      </rdf:li>
+     <rdf:li>
+       <rdf:Description ID="location_aware_browsing"
+         nc:name="location aware browsing preferences"
+         nc:link="privsec_help.xhtml#location_aware_browsing"/>
+     </rdf:li>
      <rdf:li>
        <rdf:Description ID="lock_icon"
          nc:name="lock icon"

suite/locales/en-US/chrome/common/help/privacy_help.xhtml

@@ -223,6 +223,12 @@
     serve as a reference to your geographical location. Even without cookies,
     multiple accesses to one or more websites from the same location can be
     associated with each other in this way.</li>
+  <li><a href="privsec_help.xhtml#location_aware_browsing">Geolocation</a>:
+    Much more detailed information about the user&apos;s location can be
+    obtained with location aware browsing services. Based on additional
+    information gathered by the browser, such as wireless access points,
+    a user&apos;s position and (in certain situations) heading and speed can
+    be determined and used by the website to track the user.</li>
   <li><a href="#what_information_does_my_browser_give_to_a_website">Browser
     Fingerprinting</a>: This method attempts to identify specific users based
     on the characteristics of the browser that they are using. Such
@@ -248,6 +254,13 @@
     from a server. In this way, connections to such <em>known</em> tracking
     sites can be prevented upfront.</li>
   <!-- NOTE: link "Data Manager" below once bug 599097 has been fixed -->
+  <li><a href="privsec_help.xhtml#location_aware_browsing">Location Aware
+    Browsing</a>: Disabling geolocation services prevents a website from
+    obtaining location information beyond what can be derived from the IP
+    address of the access alone. Note though that this is always an opt-in
+    service, thus you will get a notification for each request unless you
+    gave a website permanent permission to use geolocation services.</li>
+  <!-- NOTE: link "Data Manager" below once bug 599097 has been fixed -->
   <li><a href="using_priv_help.xhtml#cookies">Cookies</a>: The power of
     tracking cookies is their persistence across sessions. Thus, when you
     restart &brandShortName;, the identifying cookie will still be sent to

suite/locales/en-US/chrome/common/help/privsec_help.xhtml

@@ -123,6 +123,59 @@
     window</a>, these options aren&apos;t present in the notification bar.</li>
 </ul>
 
+<h3 id="location_aware_browsing">Location Aware Browsing</h3>
+
+<p>Websites may want to obtain more detailed information about the user&apos;s
+  location, e.g., to offer specific services close to the current position. For
+  that purpose, they can request the longitude and latitude (along with other
+  information like altitude and heading, as available) from a browser.
+  &brandShortName; will never provide that information without the user&apos;s
+  consent. However, a notification is displayed for a page that requests the
+  location at least the first time that this site is visited. The preferences
+  located in the center section of the <a href="#privacy_and_security">Privacy
+  &amp; Security panel</a> allow you to disable this feature entirely:</p>
+
+<ul>
+  <li><strong>Prompt me for permission if a request is made</strong>: Select
+    this if you want &brandShortName; to prompt you if the website you are
+    visiting is requesting geolocation information. The notification provides
+    the following options:
+    <ul>
+      <li><strong>Share location</strong>: Select this option if you want the
+        current location to be determined and forwarded to the requesting site,
+        for <em>this</em> request only.</li>
+      <li><strong>Not for this request</strong>: Select this option if you do
+        <em>not</em> want the current location to be determined and forwarded
+        to the requesting site, prompt again for the next request.</li>
+      <li><strong>Always for this site</strong>: Select this option if you
+        want the current location to be determined and forwarded to the
+        requesting site, also for all <em>future</em> requests.</li>
+      <li><strong>Never for this site</strong>: Select this option if you do
+        <em>not</em> want the current location to be determined and forwarded
+        to the requesting site, also for all <em>future</em> requests.</li>
+    </ul>
+    Closing or dismissing the notification will not give any response to the
+    requesting page at all.</li>
+  <li><strong>Disable this feature and deny all requests</strong>: Select this
+    option for not being prompted for geolocation requests. &brandShortName;
+    will appear to a website as if it doesn&apos;t support this feature.</li>
+</ul>
+
+<p><strong>Notes</strong>:</p>
+
+<ul>
+  <li>Geolocation is a third-party web-based service. &brandShortName; collects
+    certain information about your internet access (e.g., wireless access
+    points) and sends those to this service.</li>
+  <li>The accuracy of the response varies and may range from city level to
+    within a few meters of your actual location.</li>
+  <li>No information about the requesting site itself is provided to the
+    geolocation service. The information returned by that service is provided
+    to the website by &brandShortName; in response to its request.</li>
+  <li>The requesting site receives an identification token that allows it to
+    track your movement for a limited time using the geolocation service.</li>
+</ul>
+
 <h3 id="safe_browsing">Safe Browsing</h3>
 
 <p>Some websites contain potentially dangerous content and may have been