Browse Source

bug 494422 - update geolocation page; also add draft privacy policy page

Unknown 15 years ago
parent
commit
17ca031568

+ 8 - 2
lib/sitemap.xml

@@ -385,7 +385,7 @@ http://www.damowmow.com/portal/ (use the "Indentify" field)
       <page url="doc/2.0/system-requirements" title="System Requirements" id="system-requirements-2.0" />
       <page url="doc/2.0/install-and-uninstall" title="Installation and Uninstallation" id="install-uninstall-2.0" />
       <page url="doc/2.0/profiles" title="Profiles" id="profiles-2.0" />
-      <page url="doc/2.0/geolocation" title="Geolocation" id="geolocation-2.0" />
+      <page url="doc/2.0/geolocation" title="Location-Aware Browsing" id="geolocation-2.0" />
     </page>
   </page>
 
@@ -400,7 +400,13 @@ http://www.damowmow.com/portal/ (use the "Indentify" field)
     <page url="dev/project-areas" title="Project Areas" id="project-areas" />
     <page url="dev/review-and-flags" title="Review &amp;amp; Flags" id="review-and-flags" />
     <page url="dev/artwork" title="Artwork" id="artwork" />
-    <page url="dev/trademark" title="Trademark Rules" id="trademark" />
+  </page>
+
+  <page url="legal/" title="Legal Resources" id="legal">
+    <page url="legal/trademark" title="Trademark Rules" id="trademark" />
+    <page url="legal/privacy" title="SeaMonkey Privacy Policy" id="privacy">
+      <page url="legal/third-party" title="Third-Party Service Providers for SeaMonkey" id="third-party" />
+    </page>/>
   </page>
 
   <page url="about" title="About" id="about" />

+ 1 - 1
lib/wrapper.tmpl

@@ -166,7 +166,7 @@
         <li><a href="[% toplink %]about">[% strings.About %]</a></li>
         <li><a href="[% toplink %]about#contact">[% strings.Contact %]</a></li>
       </ul>
-      <p class="tLicense">[% strings.TrademarkPre %]<a href="[% toplink %]dev/trademark">[% strings.TrademarkLink %]</a>[% strings.TrademarkMid %]<a href="http://www.mozilla.org/foundation/">[% strings.TrademarkMoFo %]</a>[% strings.TrademarkPost %]</p>
+      <p class="tLicense">[% strings.TrademarkPre %]<a href="[% toplink %]legal/trademark">[% strings.TrademarkLink %]</a>[% strings.TrademarkMid %]<a href="http://www.mozilla.org/foundation/">[% strings.TrademarkMoFo %]</a>[% strings.TrademarkPost %]</p>
       <p class="tLicense">[% strings.LicenseCC %] | <a href="http://www.mozilla.org/foundation/licensing/website-content.html">[% strings.Details %]</a>.</p>
       [% IF document.links.license -%]
       <p class="tLicense">[% strings.LicenseIs %]

+ 3 - 0
src/.htaccess

@@ -13,6 +13,9 @@ RedirectMatch temp ^/security/(.*)$ http://www.mozilla.org/security/$1
 # hu-HU 1.x package has wrong URL for updates, redirect to correct one
 Redirect permanent /releases/releases/updates/hu-HU.rdf http://www.seamonkey-project.org/releases/updates/hu-HU.rdf
 
+# pages moved since site existence
+RedirectMatch permanent ^/dev/trademark http://www.seamonkey-project.org/legal/trademark
+
 <FilesMatch "-atom(\..+)?$">
   ForceType application/atom+xml
   #ForceType application/xml

+ 1 - 1
src/dev/index.en.html

@@ -130,7 +130,7 @@ and other people around you about our great software.
 <p>
 You can use our <a href="artwork">logo &amp; artwork</a> for pointing other
 people to SeaMonkey, as that is explicitly allowed by our
-<a href="trademark">SeaMonkey trademark policy</a>.
+<a href="../legal/trademark">SeaMonkey trademark policy</a>.
 </p>
 
 <p>

+ 92 - 54
src/doc/2.0/geolocation.en.html

@@ -11,27 +11,27 @@
 <link rel="top" href="../../" title="SeaMonkey Project">
 <link rel="up" href="./" title=">SeaMonkey 2 Documentation">
 
-<title>Geolocation in SeaMonkey</title>
+<title>Location-Aware Browsing in SeaMonkey</title>
 </head>
 <body>
 
-<h1>Geolocation in SeaMonkey</h1>
+<h1>Location-Aware Browsing in SeaMonkey</h1>
 
 <p>SeaMonkey 2 can tell websites where you're located so you can find info
 that's more relevant and more useful. It's about making the Web smarter – and is
-done in a way that totally respects your privacy.</p>
+done in a way that totally respects your privacy.
+<a href="http://3liz.com/geolocation/">Give it a try!</a></p>
 
 <h2 id="faq">Frequently Asked Questions</h2>
 
-<h3 id="what">What is Geolocation?</h3>
+<h3 id="what">What is Location-Aware Browsing?</h3>
 
-<p>Geolocation lets websites know where you are in order to bring you more
-relevant information, or to save you time while searching. It's about making the
-Web smarter, more intuitive and easier to use.</p>
-
-<p>For example, if you're looking for pizza restaurants in your area, a simple
-search for "pizza" will bring you the answers you need&hellip; no further
-information or extra typing required.</p>
+<p>Websites that use location-aware browsing (also known as "geolocation") will
+ask where you are in order to bring you more relevant information, or to save
+you time while searching. Let's say you’re looking for a pizza restaurant in
+your area. A website will be able to ask you to share your location so that
+simply searching for "pizza" will bring you the answers you need&hellip; no
+further information or extra typing required.</p>
 
 <p>Or, if you're mapping out directions to get somewhere, SeaMonkey will know
 where you're starting from so all you have to do is tell it where you want to
@@ -44,74 +44,112 @@ to ease adoption by Web developers.</p>
 
 <h3 id="how">How does it work?</h3>
 
-<p>Some modern websites offer services that are richer and easier to use if they
-know your location (such as online mapping, or searching for specific things in
-your area). When you visit one of these sites, SeaMonkey will ask you if you want
-it to provide the site with your current location.</p>
+<p>When you visit a location-aware website, SeaMonkey will ask you if you want
+to share your location.</p>
+
+<p>If you consent, SeaMonkey gathers information about nearby wireless access
+points and your computer's IP address. Then SeaMonkey sends this information to
+the default geolocation service provider, Google Location Services, to get an
+estimate of your location. That location estimate is then shared with the
+requesting website.</p>
 
-<p>If you choose to allow Geolocation, SeaMonkey first looks for relevant
-location markers such as location data provided by a GPS device built into or
-attached to your computer or browsing device, the signal strength of nearby
-wireless hot spots and/or cell phone towers, and/or your computer or device's
-IP address.</p>
+<p>If you say that you do not consent, SeaMonkey will not do anything.</p>
 
-<p>Next, it attempts to your determine your location using these location
-markers. SeaMonkey sends that information to Google Location Services in order
-to derive a physical location (ex. your latitude and longitude) from this
-data.</p>
+<h3 id="accuracy">How accurate are the locations?</h3>
 
-<p>In the end, this means a smarter Web, and easier access to the information
-you need.</p>
+<p>Accuracy varies greatly from location to location. In some places, our
+service providers may be able to provide a location to within a few meters.
+However, in other areas it might be much more than that. All locations returned
+by our service providers are estimates only and we do not guarantee the accuracy
+of the locations provided. Please do not use this information for emergencies.
+Always use common sense.</p>
 
-<h3 id="privacy">How do you protect my privacy?</h3>
+<h3 id="privacy">What information is being sent, and to whom? How is my privacy
+protected?</h3>
 
 <p>Your privacy is extremely important to us, and SeaMonkey never shares your
 location without your direct permission. When you visit a page that requests
-your information, you'll get a notification that you can accept or deny before
-any information is shared.</p>
+your information, you'll be asked before any information is shared with the
+requesting website and our third-party service provider.</p>
 
-<p>If you do authorize Geolocation, the following information is sent from
-SeaMonkey to Google to retrieve your location based on WiFi and/or IP:</p>
+<p>By default, SeaMonkey uses Google Location Services to determine your
+location by sending:</p>
 
 <ul>
-  <li>your IP address</li>
-  <li>information about nearby wireless access points</li>
-  <li>a temporary cookie-like identifier</li>
+  <li>your computer's IP address,</li>
+  <li>information about nearby wireless access points, and</li>
+  <li>a random client identifier, which is assigned by Google, that expires
+    every 2 weeks.</li>
 </ul>
 
-<p>This information is sent via an encrypted SSL connection to further protect
-your privacy. Google Location Services sends back to SeaMonkey an estimate of
-your location which SeaMonkey provides to the requesting web page. Google does
-not know the URL or domain of the requesting page.</p>
+<p>For a complete description of information collected and used by SeaMonkey,
+please see the
+<a href="../../legal/privacy">SeaMonkey privacy policy</a>.</p>
+
+<p>Google Location Services then returns your estimated geolocation (e.g.,
+latitude and longitude). For a complete description of information collected and
+used by Google, please see the
+<a href="http://www.google.com/privacy-lsf.html" class="external">Google
+Geolocation Privacy Policy</a>.</p>
+
+<p>The information is exchanged over an encrypted connection to protect your
+privacy. Once SeaMonkey has your location information, it passes it to the
+website that requested it. At no time is the name or location of the website you
+are visiting, or are any cookies, ever shared with Google Location Services.</p>
 
-<p>For information about what the website does with your location, please
-consult that website's privacy policy.</p>
+<p>Neither Mozilla/SeaMonkey or Google will ever use the information collected
+by Google Location Services to identify or spy on you.</p>
 
-<p>Most importantly, if you're still not comfortable with the concept of
-Geolocation, it's a totally optional service: SeaMonkey will never provide your
-location data to a site without your explicit consent.</p>
+<p>For information about what the requesting website does with your location
+information, please refer to that website's privacy policy.</p>
 
-<p>For more information, read the
-<a href="../../legal/privacy/seamonkey">SeaMonkey privacy policy</a>.</p>
+<p>For more information about your privacy, you should also read:</p>
 
-<h3 id="tracking">Am I being tracked?</h3>
+<ul>
+  <li><a href="../../legal/privacy">SeaMonkey privacy policy</a></li>
+  <li><a href="http://www.google.com/privacy-lsf.html"
+         class="external">Google privacy policy</a></li>
+</ul>
+
+<h3 id="tracking">Am I being tracked as I browse the web?</h3>
 
 <p>No. SeaMonkey only requests a location when a website makes a request, and
 only shares your location when the user has approved the request. SeaMonkey does
-not track or remember your location between sessions, never sends your location
-to any third party, and never sends it to any of Mozilla's servers.</p>
+not track or remember your location as you browse.</p>
 
-<h3 id="undo">How do I undo a permission granted to a site?</h3>
+<h3 id="undo-permission">How do I undo a permission granted to a site?</h3>
 
-<p>If you've given a site permission to track your location and later change
-your mind, you can easily undo that permission. Here's how:</p>
+<p>If you've given SeaMonkey permission to always give your location to a site
+and later change your mind, you can easily revoke that permission. Here's how:</p>
 
 <p>For all platforms:</p>
 
 <ul>
-  <li>Go to the Tools menu, then select Clear Private Data&hellip;</li>
-  <li>Ensure that Cookies is selected</li>
-  <li>Click on Clear Private Data Now</li>
+  <li>Navigate to the site to which you've given permission</li>
+  <li>Go to the <em>View</em> menu, then select <em>Page Info</em></li>
+  <li>Select the <em>Permissions</em> tab</li>
+  <li>Change the setting for <em>Share Location</em></li>
+</ul>
+
+<h3 id="clear-idnum">How do I clear the "random client identification number"?</h3>
+
+<ul>
+  <li>Go to the <em>Tools</em> menu, then select <em>Clear Private Data</em></li>
+  <li>Ensure that <em>Cookies</em> is selected</li>
+  <li>Click on <em>Clear Private Data Now</em></li>
+</ul>
+
+<h3 id="deactivate">How do I turn off Location-Aware Browsing permanently?</h3>
+
+<p>Location-Aware Browsing is always opt-in in SeaMonkey 2.0. No location
+information is ever sent without your permission. If you wish to disable the
+feature completely, please follow this set of steps:</p>
+
+<ul>
+  <li>In the URL bar, type <code>about:config</code></li>
+  <li>Type <code>geo.enabled</code></li>
+  <li>Double click on the <em>geo.enabled</em> preference</li>
+  <li>Location-Aware Browsing is now disabled</li>
 </ul>
 
 </body>

+ 76 - 0
src/legal/index.en.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+
+<link rel="maintainer" href="mailto:kairo@kairo.at" title="Robert Kaiser">
+<link rel="top" href="../" title="SeaMonkey Project">
+<link rel="up" href="../" title="Home">
+
+<title>Legal Resources</title>
+</head>
+<body>
+<h1>SeaMonkey Legal Resources</h1>
+<p>
+The SeaMonkey Project is an open source project hosted by and und the legal
+protection of the <a href="http://www.mozilla.org/foundation/">Mozilla
+Foundation</a>.
+</p>
+
+<ul class="toc">
+<li><a href="#license">Licenses</a></li>
+<li><a href="#trademark">Trademarks</a></li>
+<li><a href="#privacy">Privacy</a></li>
+</ul>
+
+<h2 id="license">Licenses</h2>
+
+<p>
+As a project that believes in open source and software freedom, our licenses are
+very important to us as they ensure open collaboration with and wthin our
+project. As a Mozilla project, we generally follow the
+<a href="http://www.mozilla.org/foundation/licensing.html">Mozilla Licensing
+Policies</a>
+<p>
+
+<p>
+Our <a href="https://developer.mozilla.org/en/comm-central">source code</a> is
+licensed under a <a href="http://www.mozilla.org/MPL/">MPL/GPL/LGPL tri-licsense</a>,
+allowing our code to be easily reused in different environments.
+</p>
+
+<p>
+Our release packages and other binaries are released under the
+<a href="http://www.mozilla.org/legal/eula/seamonkey-en.html">SeaMonkey End-User
+License Agreement</a> as provided by the Mozilla Foundation.
+</p>
+
+<p>
+Content on the SeaMonkey website is published under a
+<a href="http://www.mozilla.org/foundation/licensing/website-content.html">Creative
+Commons Attribution Share-alike license</a>, just like other Mozilla website
+content.
+</p>
+
+<h2 id="trademark">Trademarks</h2>
+
+<p>
+The SeaMonkey logo and word are registered trademarks in the USA, Europe and
+Japan, and their use is goverend by the <a href="trademark">SeaMonkey
+trademark policy</a>.
+</p>
+
+<h2 id="privacy">Privacy</h2>
+
+<p>
+The merchandise available from the
+<a href="http://www.cafepress.com/SeaMonkeySuite">SeaMonkey shop</a> can also
+help you in spreading the word.
+</p>
+
+</body>
+</html>

+ 380 - 0
src/legal/privacy.en.html

@@ -0,0 +1,380 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+
+<link rel="maintainer" title="Robert Kaiser" href="mailto:kairo@kairo.at">
+<link rel="top" href="../" title="SeaMonkey Project">
+<link rel="up" href="./" title="Legal Resources">
+
+<title>SeaMonkey Privacy Policy</title>
+</head>
+<body>
+
+<p class="important">
+This document is a draft, this policy has not been finalized yet!
+</p>
+
+<h1>SeaMonkey Privacy Policy</h1>
+
+<p>
+We're working hard to protect your privacy while delivering products and
+services that bring you the performance and protection you desire in your
+personal computing. This privacy policy explains how Mozilla Foundation
+("Mozilla"), collects and uses information about users of the official SeaMonkey
+Internet suite ("SeaMonkey"). It does not apply to other Mozilla websites,
+products or services.
+</p>
+
+<h2 id="info-types">Types of Information</h2>
+
+<p>
+As with most Internet products, SeaMonkey sends certain information to the
+websites that you visit. This information falls into the following categories:
+</p>
+
+<ul>
+  <li><i>"Personal Information"</i> is information that you provide to us that
+    personally identifies you, such as your name, phone number or email address.
+    Except as described below, Mozilla does not collect or require end-users of
+    SeaMonkey to furnish Personal Information.</li>
+  <li><i>"Non-Personal Information"</i> is information that cannot be directly
+    associated with a specific person or entity. Non-Personal Information
+    includes but is not limited to your computer's configuration and the version
+    of SeaMonkey you use.</li>
+  <li><i>"Potentially Personal Information"</i> is information that is
+    Non-Personal Information in and of itself but that could be used in
+    conjunction with other information to personally identify you. For example,
+    Uniform Resource Locators ("URLs") (the addresses of web pages) and Internet
+    Protocol ("IP") addresses (the addresses of computers on the internet),
+    which are Non-Personal Information in and of themselves, could be Personal
+    Information when combined with internet service provider ("ISP") records.</li>
+  <li><i>"Aggregate Data"</i> is information that is recorded about users and
+    collected into groups so that it no longer reflects or references an
+    individually identifiable user.</li>
+</ul>
+
+<h2 id="websites">Information SeaMonkey Sends to Websites</h2>
+
+<p>
+Like most web browsers, SeaMonkey sends information to the websites you visit,
+including (1) Non-Personal Information of the type that web browsers typically
+make available, such as the type of browser you are using, your language
+preference, the referring site, and the date and time of your visit; and
+(2) Potentially Personal Information such as your IP address. This information
+may be logged on the websites you visit. What information is logged and how that
+information is used depends on the policies of each of the websites you visit.
+</p>
+
+<p>
+Each website determines its own privacy policy for the distribution and use of
+this Non-Personal Information and Potentially Personal Information. If you are
+concerned about how a website will use this information, check out its privacy
+policy. To find out more about how Mozilla uses this information on its own
+websites, see the
+<a href="http://www.mozilla.org/about/policies/privacy-policy.html">Mozilla
+Privacy Policy</a>.
+</p>
+
+<h3 id="features">Interactive Product Features</h3>
+
+<p>
+<i>Crash-Reporting Feature</i>. SeaMonkey has a crash-reporting feature that
+sends a report to Mozilla when SeaMonkey crashes. Mozilla uses the information
+in the crash reports to diagnose and correct the problems in SeaMonkey that
+caused the crash. Though this feature starts automatically after SeaMonkey
+crashes, it does not send information to Mozilla until you explicitly authorize
+it to do so. By default, this feature sends a variety of Non-Personal
+Information to Mozilla, including the stack trace (a detailed description of
+which parts of the SeaMonkey code were active at the time of the crash) and the
+type of computer you are using. Additional information is collected by the crash
+reporting feature. Which crash reporting feature is used and what additional
+information collected by SeaMonkey depends on which version of SeaMonkey you're
+using.
+</p>
+
+<dl>
+  <dt style="text-decoration: underline;">SeaMonkey 1.x.</dt>
+  <dd>
+  <p>These earlier versions of SeaMonkey don't include a crash reporting feature
+    at all, no information about crashes is sent to Mozilla at any time.
+  </p>
+  </dd>
+  <dt style="text-decoration: underline;">SeaMonkey 2.x.</dt>
+  <dd>
+  <p>For the current versions of SeaMonkey, "SeaMonkey Crash Reporter" is
+    SeaMonkey's crash reporting feature. With this feature, you have the option
+    to include the URL of the site you were visiting when SeaMonkey crashed, a
+    comment, and your email address in the report. SeaMonkey Crash Reporter also
+    sends a list of all add-ons that you were using at the time of the crash,
+    the time since (i) the last crash, (ii) the last install, and (iii) the
+    start-up of the program. Mozilla only makes Non-Personal Information (i.e.,
+    generic information about your computer, the stack trace, and any comment
+    given by the user) in the public reports available online at
+    <a href="http://crash-stats.mozilla.com/">http://crash-stats.mozilla.com/</a>.
+  </p>
+  </dd>
+</dl>
+
+<p>
+To safeguard your privacy, Mozilla makes the Personal Information, such as your
+name and email address, and Potentially Personal Information, such are the URL
+of the site you last visited, only available to its employees, contractors, and
+selected contributors who signed confidentiality agreements that prohibit them
+from using or disclosing such information other than for internal Mozilla purposes.
+</p>
+
+<p>
+<i>Report Broken Web Site Feature</i>. SeaMonkey's Report Broken Web Site
+feature lets you notify Mozilla when a website you visit improperly displays or
+incorrectly functions. The feature sends the URL of the broken website to
+Mozilla. You may also choose to send your email address and a description of the
+problem. This feature also sends a variety of Non-Personal Information to
+Mozilla, including but not limited to the version of SeaMonkey you are using and
+your language preference. Except for your email address, Mozilla makes all of
+this information public. This feature does not send information to Mozilla until
+you explicitly authorize SeaMonkey to do so. To prevent this public release of
+Personal and Potentially Personal Information, don't report a website if the
+website's URL contains your Personal and Potentially Personal Information, and
+don't include Personal Information in your description of the problem. To
+prevent the release of any information, don't use this feature to report a
+broken website.
+</p>
+
+<p>
+<i>Automated Update Service</i>. SeaMonkey's automatic update feature (only
+included in SeaMonkey 2.x) periodically checks to see if an updated version of
+SeaMonkey and installed add-ons are available from Mozilla.
+</p>
+
+<dl>
+  <dt style="text-decoration: underline;">SeaMonkey</dt>
+  <dd>
+  <p>This feature sends Non-Personal Information to Mozilla, including the
+    version of SeaMonkey you are using, build ID and target, update channel,
+    your operating system, and your language preference. This feature also sends
+    Potentially Personal Information to Mozilla in the form of a cookie named
+    "aus" that contains a unique numeric value to distinguish individual
+    SeaMonkey installs. Mozilla uses this information to provide you with
+    updated versions of SeaMonkey and to understand the usage patterns of
+    SeaMonkey users. We use this information to improve our products and
+    services and to support decision making regarding feature and capacity
+    planning.
+  </p>
+  </dd>
+  <dt style="text-decoration: underline;">Add-Ons</dt>
+  <dd>
+  <p>The add-ons update version check sends Non-Personal Information to Mozilla,
+    including the version of SeaMonkey you are using, version of the add-ons you
+    have installed, build ID and target, update channel, your operating system,
+    and your language preference with each check of an add-on that uses
+    https://addons.mozilla.org/en-US/seamonkey/ as its update host. If any of
+    your add-ons use a third party update URL, SeaMonkey will check that URL for
+    updates to those add-ons.
+  </p>
+  </dd>
+</dl>
+
+<p>
+We do not collect or track any Personal Information or any information about
+the Web sites you visit, and we do not release the raw information we obtain
+from these features to the public. We may release reports containing Aggregate
+Data so that our global community can make better product and design decisions.
+To prevent Mozilla from obtaining this information, you can turn this feature
+off in SeaMonkey's preferences (in the Advanced > Software Installation panel).
+</p>
+
+<p>
+SeaMonkey 1.x includes an update notification instead of the Automated Update
+Service used in SeaMonkey 2.x. The notification only requests a web document
+from the SeaMonkey website (the usual Non-Personal Information listed in the
+<a href="websites">Websites topic</a> of this page is sent, but nothing else).
+SeaMonkey then determines if the installed version is older than the one offered
+on the website, and if so, displays an update notification.
+</p>
+
+<p>
+<i>Add-ons Features.</i> One thing that makes SeaMonkey so flexible is the
+ability for you to add various add-ons, extensions, and themes to SeaMonkey,
+thereby creating a custom browser that fits your needs. The following features
+show how SeaMonkey 2.x provides both the ability to obtain additional add-ons
+easily and to protect against potentially harmful add-ons.
+</p>
+
+<dl>
+  <dt style="text-decoration: underline;">Get Add-ons Feature</dt>
+  <dd>
+  <p>SeaMonkey 2.x offers a Get Add-ons Feature. This feature creates a list of
+    recommended add-ons and extensions to try. You access this recommended list
+    by clicking on the "Get Add-ons" tab from the SeaMonkey Add-ons Manager. We
+    do not collect any Personal Information. To display the recommended list,
+    SeaMonkey sends Non-Personal Information to Mozilla, including the type of
+    computer and version of SeaMonkey you are using as well as any cookies set
+    by https://addons.mozilla.org.
+  </p>
+  </dd>
+  <dt style="text-decoration: underline;">Blocklist Feature</dt>
+  <dd>
+  <p>SeaMonkey 2.x also offers a Blocklist feature. With this feature, once a
+    day SeaMonkey does a regularly scheduled, automatic check to see if you have
+    any harmful add-ons or plug-ins installed. If so, this feature disables
+    add-ons or plug-ins that Mozilla has determined contain known
+    vulnerabilities or major user facing issues or fatal bugs (e.g., client
+    crashes on startup or something causing an endless loop of unusability).
+    You may view <a href="http://www.mozilla.com/blocklist/">Firefox's current
+    list of Blocklisted items</a>, SeaMonkey's list is a subset of those,
+    blocking only those that affect SeaMonkey in any way. This feature sends
+    Non-Personal Information to Mozilla, including the version of SeaMonkey you
+    are using, operating system version, build ID and target, update channel,
+    and your language preference. In addition, Mozilla also uses this feature to
+    count the number of active SeaMonkey users. Currently there is no basic user
+    interface to disable the Blocklist feature. An
+    <a href="http://www.support.mozilla.com/kb/Firefox+makes+unrequested+connections#Extensions_blocklist_updating">article
+    in the Firefox Knowledge Base</a> explains how you may disable the Blocklist
+    feature, this explanation holds true for SeaMonkey as well. Disabling the
+    Blocklist feature is not recommended as it may result in using extensions
+    know to be untrustworthy. More information about the Blocklist feature may
+    be found at <a href="https://wiki.mozilla.org/Extension_Blocklisting">https://wiki.mozilla.org/Extension_Blocklisting</a>.
+  </p>
+  </dd>
+  <dt style="text-decoration: underline;">Location-aware Feature</dt>
+  <dd>
+  <p>SeaMonkey 2.x offers a <a href="../doc/2.0/geolocation">Location-Aware
+    Feature</a>, parts of which may be provided by <a href="third-party">third
+    party service providers</a>.
+  </p>
+  <dl>
+    <dt style="text-decoration: underline;">You Elect to Use the
+      Location-Aware Feature</dt>
+    <dd>
+    <p>This feature remains inoperative until you visit a website that
+      requests your location and you choose to opt in to the feature. If you
+      elect not to, nothing happens. Each time you visit such a website,
+      SeaMonkey asks you if you want it to provide the site with your current
+      location. Additionally, you may elect to have SeaMonkey remember your
+      choice to allow or not allow the feature for each site. Any such
+      election is domain specific. You are able to
+      <a href="geolocation#undo-permission">opt out</a> at any time of having
+      SeaMonkey remember your choice, just like any other preference setting.
+    </p>
+    </dd>
+    <dt style="text-decoration: underline;">What Information SeaMonkey Collects</dt>
+    <dd>
+    <p>If you choose to allow it, the SeaMonkey Location-Aware Feature first
+      collects one or more of the following relevant location markers:
+      (i) location provided by a GPS device built into or attached to your
+      computer or device and/or geolocation services provided by the operating
+      system; (ii) the wifi routers closest to you; (iii) cell ids of the cell
+      towers closest to you; (iv) the signal strength of nearby wireless
+      access points and/or cellular phone towers; and/or (v) your computer or
+      device’s IP address. Next, it attempts to determine your location using
+      these location markers. Any information SeaMonkey uses, receives or
+      sends as part of this Location-aware Feature is not received by any
+      Mozilla servers or by Mozilla. SeaMonkey does not track or remember your
+      location. SeaMonkey does remember a random client identifier, the
+      temporary ID assigned by our third party provider to process your
+      request, for two weeks.
+    </p>
+    </dd>
+    <dt style="text-decoration: underline;">What Information Third Parties
+      Receive &amp; Provide</dt>
+    <dd>
+    <p>If necessary, SeaMonkey sends the information above, except any GPS
+      information and/or geolocation data provided by the operating system,
+      plus you user agent information (e.g, version of SeaMonkey you're using),
+      along with a temporary client identifier, to its third party service
+      provider(s) capable of deriving a physical location from the information
+      SeaMonkey has collected (e.g., convert a set of WiFi signal strengths
+      into latitude and longitude). This information is sent over an encrypted
+      connection. The connection between SeaMonkey and the service provider
+      does not use any cookies. Neither the domain name nor the URL of the
+      site you’re visiting are sent to our service providers. Our providers
+      estimate your location and return it to SeaMonkey. SeaMonkey provides
+      your location information to the webpage that made the request. For any
+      information the webpage sends back to the website, please see that
+      website's privacy policy.
+    </p>
+    </dd>
+    <dt style="text-decoration: underline;">Third Party Websites</dt>
+    <dd>
+    <p>Please carefully consider any website's privacy practices before
+      agreeing to share your location with that website.
+    </p>
+    <ul>
+      <li><em>Requesting Websites</em>. For any information the webpage sends
+        back to the website, please see that website's privacy policy.</li>
+      <li><em>Location-aware Service Providers</em>. In addition, our service
+        providers have their own <a href="third-party">privacy policy</a>.</li>
+      <li><em>ISP and Mobile Carrier</em>. All requests must be sent through
+        your internet service provider or mobile carrier network and your
+        service provider or carrier may have access to the request. For
+        information regarding your service provider's or carrier's treatment
+        of your information, please consult their privacy policies.</li>
+    </ul>
+    </dd>
+  </dl>
+  <p>For more information, please see <a href="../doc/2.0/geolocation">Learn
+    More</a> for this feature.
+  </p>
+  </dd>
+</dl>
+
+<h2 id="security">Security Features</h2>
+
+<p>
+<i>Secure Website Certificate Verification</i>. When you visit a secure website,
+SeaMonkey will check with the certificate provider to validate that website's
+certificate. SeaMonkey sends only the certificate identification to the
+certificate provider, not the exact URL you are visiting. If the certificate is
+not valid, you will receive an error page that states the certificate was
+revoked and you will not be able to access that website. The technical name for
+this process is OCSP or On-line Certificate Status Protocol. You may completely
+turn off the secure website certificate verification feature in SeaMonkey's
+preferences under the Validation panel in the Privacy &amp; Security category.
+If you do this, none of the information discussed here will be sent to any third
+party certificate provider.
+</p>
+
+<h2 id="cookies">Cookies</h2>
+
+<p>
+A cookie is a small string of information that a website stores on your computer
+and that web browsers make available to that website each time you return.
+SeaMonkey stores cookies on your computer when requested to do so by websites.
+A website uses cookies to help identify and track visitors, the use of the
+website, and visitors' website access preferences across multiple requests and
+visits. It is possible to include Personally-Identifying Information, or
+references to such information, in cookies, thereby enabling websites to track
+the online movements of particular individuals. To prevent SeaMonkey from
+sending cookies to specific websites, configure SeaMonkey to prompt you when a
+website wants to set a cookie. To prevent SeaMonkey from sending cookies to any
+website, configure it to disable cookies.
+</p>
+
+<h2 id="changes">Privacy Policy Changes</h3>
+
+<p>
+Mozilla may change the SeaMonkey Privacy Policy from time to time. Any and
+all changes will be reflected on this page. When Mozilla changes this policy in
+a material way, a notice will be posted on the
+<a href="/en-US/">www.mozilla.com</a> Web site.
+Substantive changes may also be announced through the standard mechanisms by
+which Mozilla communicates with its users and community, including Mozilla's
+"announce" <a href="https://lists.mozilla.org/listinfo/announce">mailing list
+and newsgroup</a>. It is your responsibility to ensure that you understand the
+terms of this Privacy Policy. You should periodically check this page for any
+changes to the current policy.
+</p>
+
+<h2 id="more-info">For More Information</h2>
+
+<p>
+If you have questions about this privacy policy, please contact the SeaMonkey
+Council at: <em>seamonkey-council at mozilla dot org</em>.</p>
+
+</body>
+</html>

+ 56 - 0
src/legal/third-party.en.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="en">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<meta http-equiv="Content-Script-Type" content="text/javascript">
+
+<link rel="maintainer" title="Robert Kaiser" href="mailto:kairo@kairo.at">
+<link rel="top" href="../" title="SeaMonkey Project">
+<link rel="up" href="privacy" title="SeaMonkey Privacy Policy">
+
+<title>Third-Party Service Providers for SeaMonkey</title>
+</head>
+<body>
+
+<p class="important">
+This document is a draft, this policy has not been finalized yet!
+</p>
+
+<h1>Third-Party Service Providers for SeaMonkey</h1>
+
+<p>
+This page describes the third-party services providers used by Mozilla&reg;
+for its SeaMonkey&reg; Internet suite. Each of our third-party providers are
+under licensing agreements with Mozilla and will not release Personal or
+Potentially Personal Information to the public. These third party providers only
+use this information in conjunction with the service(s) they are providing. In
+no event will these third party service providers correlate any such SeaMonkey
+user data with any other data collected through other products, services or
+web properties of that provider. Each third-party provider has its own
+privacy policy that is linked below.
+</p>
+
+<h2>Interactive Product Features</h2>
+<h3>Mozilla Foundation</h3>
+<ul>
+  <li><a href="https://addons.mozilla.org">SeaMonkey Add-ons</a></li>
+</ul>
+<h3>Google Inc.</h3>
+<ul>
+  <li><a href="http://www.google.com/privacy-lsf.html">Google Geolocation
+    Privacy Policy</a></li>
+</ul>
+
+<h2>For More Information</h2>
+
+<p>
+If you have feedback or questions about the SeaMonkey Privacy Policy or these
+procedures, please contact the SeaMonkey Council at: <em>seamonkey-council at
+mozilla dot org</em>.</p>
+<p>
+
+</body>
+</html>

+ 3 - 6
src/dev/trademark.en.html → src/legal/trademark.en.html

@@ -9,14 +9,11 @@
 
 <link rel="maintainer" title="Robert Kaiser" href="mailto:kairo@kairo.at">
 <link rel="top" href="../" title="SeaMonkey Project">
-<link rel="up" href="./" title="Development">
+<link rel="up" href="./" title="Legal Resources">
 
 <title>SeaMonkey Trademark Policy</title>
 </head>
 <body>
-<p class="important">
-This document is a draft, this policy has not been finalized yet!
-</p>
 
 <h1>Trademark Policy</h1>
 
@@ -56,9 +53,9 @@ contact us if:
 <li>You want to use the logo in a desktop background. Go right ahead! We may
   create a gallery in the future and would love to have user contributions
   there! Logos for such use can be found on the
-  <a href="artwork">SeaMonkey artwork page</a>.</li>
+  <a href="../dev/artwork">SeaMonkey artwork page</a>.</li>
 <li>You want to link to our website from your site. Buttons can be found on the
-  <a href="artwork">SeaMonkey artwork page</a>.</li>
+  <a href="../dev/artwork">SeaMonkey artwork page</a>.</li>
 </ul>
 
 <p>