зеркало из https://github.com/mozilla/pjs.git
more tweaks from rachel
This commit is contained in:
wclouser%mozilla.com
Родитель
6de637f9e4
Коммит
43af48b5b2
|
|
@ -78,13 +78,13 @@ generation of Firefox. Thanks again for making the browser a better place!</p>
|
|||
|
||||
<p><a href=\"https://is4.instantsurvey.com/take?i=105913&h=0yU72vyhajHZpq6bAu_RGQ&email={$this->params['data']['User']['email']}&first={$this->params['data']['User']['firstname']}&last={$this->params['data']['User']['lastname']}\">Join the User Panel</a></p>
|
||||
|
||||
<p><small>Mozilla continues to take security and privacy issues seriously. Any data or
|
||||
information provided will never be given or sold to any other outside company for its
|
||||
use in marketing or solicitation.</small></p>
|
||||
<p><small>Mozilla continues to take security and privacy issues seriously. Mozilla
|
||||
will never rent or sell the information you provide in connection with the Firefox
|
||||
User Panel to any other third party for use in marketing or solicitation.</small></p>
|
||||
|
||||
<p><small>If you choose not to take this survey, you will be automatically unsubscribed from the Firefox User Panel.</small></p>
|
||||
<p><small>If you choose not to take this survey, you will be automatically unsubscribed from the Firefox User Panel or you can <a href=\"mailto:firefoxsurvey@mozilla.com?subject=Unsubscribe - Firefox User Panel\">let us know</a></small></p>
|
||||
|
||||
<p><small>If you think you received this in error, please <a href=\"mailto:firefoxsurvey@mozilla.com\">let us know</a>.</small></p>
|
||||
<p><small>If you think you received this in error, please <a href=\"mailto:firefoxsurvey@mozilla.com?subject=Firefox User Panel - Received in Error\">let us know</a></small></p>
|
||||
"
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -19,12 +19,15 @@
|
|||
<?php endif; ?>
|
||||
<p><?php echo $html->submit('Send') ?></p>
|
||||
</form>
|
||||
<p class="subtext">We will use your email address to send you a short survey and add you to the
|
||||
Firefox User Panel. As a member of the Firefox User Panel, you will receive occasional emails
|
||||
from us offering you ways to contribute to the future of the Firefox browser. As always, we
|
||||
promise to keep your email address private (see our
|
||||
<a href="http://userpanel.mozilla.com/privacy-policy.html">privacy policy</a> for more details),
|
||||
and we will never rent or sell it to others. If you ever want to unsubscribe, you can do so at
|
||||
any time. In addition, we promise that any information you give us as part of the user panel
|
||||
will only be used anonymously or in the aggregate without your explicit permission.</p>
|
||||
<p class="subtext">We will use your email address to send you a link to a short
|
||||
survey and add you to the Firefox User Panel Database. As a member of the Firefox
|
||||
User Panel, you will receive occasional emails from us offering you ways to
|
||||
contribute to the future of the Firefox browser. Mozilla will keep your name and/or
|
||||
email address private according to the terms set forth in our <a
|
||||
href="http://userpanel.mozilla.com/privacy-policy.html">Firefox User Panel Privacy Policy</a>
|
||||
and Mozilla will never rent or sell your name and/or email address to
|
||||
others. If you ever want to unsubscribe, you can do so at any time. Mozilla will
|
||||
only use and publish the information you give us as part of the Firefox User Panel
|
||||
anonymously or in the aggregate unless you explicitly give us permission to do
|
||||
otherwise.</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -23,9 +23,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div id="breadcrumbs">
|
||||
<div>
|
||||
<a href="/">Home</a> » <a href="http://www.mozilla.com/about/">About</a> » <span>Privacy Policy</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- Sidebar goes here. We will have none by default for now;
|
||||
The site should be navigatable without a sidebar, and we
|
||||
|
|
@ -38,55 +36,36 @@
|
|||
<hr class="hide">
|
||||
|
||||
<div id="content">
|
||||
|
||||
|
||||
|
||||
<h2>Mozilla Privacy Policy</h2>
|
||||
<h2>Mozilla Firefox User Panel Privacy Policy</h2>
|
||||
|
||||
<h3>Website Visitors</h3>
|
||||
|
||||
<p>Except as described below, the Mozilla Foundation and the Mozilla Corporation (collectively "Mozilla") do not collect or require visitors to its Web sites to furnish personally-identifying information such as names, email addresses and phone numbers. Like most Web site operators, Mozilla does collect non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, language preference, referring site, and date and time of each visitor request. Mozilla also collects potentially personally-identifying information like Internet Protocol (IP) addresses, which are non-personally-identifying in and of themselves but could be used in conjunction with other information to personally identify users.</p>
|
||||
<p>Except as described below, the Mozilla Foundation and the Mozilla Corporation (collectively "Mozilla") do not collect or require visitors to the Firefox User Panel Website (.Website.) to furnish personally-identifying information such as names, email addresses and phone numbers. Like most Web site operators, Mozilla collects non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, language preference, referring site, and date and time of each visitor request. Mozilla also collects potentially personally-identifying information like Internet Protocol (IP) addresses, which are non-personally-identifying in and of themselves but could be used in conjunction with other information to personally identify you.</p>
|
||||
|
||||
<p>Mozilla's purpose in collecting this information is to better understand how Mozilla's visitors use its Web sites. To that end, Mozilla may share potentially personally-identifying information with its employees, contractors and affiliated organizations. Mozilla may also release non-personally-identifying information about visitors, e.g. by publishing a report on Web site usage trends. Otherwise, Mozilla will not publicly release potentially personally-identifying information except under the same circumstances as Mozilla releases personally-identifying information. Those circumstances are explained in detail below.</p>
|
||||
<p>Mozilla's purpose in collecting this information is to better understand how Mozilla's visitors use its Web sites. To that end, Mozilla may share potentially personally-identifying information with its employees, contractors and affiliated organizations. Mozilla may also release non-personally-identifying information about visitors, e.g. by publishing a report on Web site usage trends. Otherwise, Mozilla will not publicly release potentially personally-identifying information except under the same circumstances as Mozilla releases personally-identifying information. Those circumstances are explained in detail below.</p>
|
||||
|
||||
<h3>Community Members</h3>
|
||||
|
||||
<p>Certain members of the Mozilla community (contributors, customers, etc.) choose to interact with Mozilla in ways that require Mozilla and others to know more about them. The amount and type of information that Mozilla gathers from those members depends on the nature of the interaction. For example, members who wish to post content to certain portions of Mozilla's Web sites are asked to provide usernames that identify that content as having been posted by a particular member. Developers, by comparison, are asked to provide contact information, up to and sometimes including telephone or fax numbers, so that they can be contacted as necessary. Customers of the Mozilla store are asked to provide even more information, including billing and shipping addresses and credit card or similar information. In each case, Mozilla collects personally-identifying information only insofar as is necessary to fulfill the purpose of the community member's interaction with Mozilla.</p>
|
||||
<p>Certain members of the Mozilla community such as contributors and participants, etc. (collectively, .Users.) choose to interact with Mozilla in ways that require Mozilla and others to know more about them. The amount and type of information that Mozilla gathers from those members depends on the nature of the interaction. For example, if a User chooses to participate in the Firefox User Panel by completing a survey, Mozilla will require the User to submit the User.s email address for the purpose of enabling Mozilla.s to send the User a link to a survey. The User has the option of also providing the User.s name. Mozilla stores the User.s name and/or email address to: (a) enable Mozilla to send the User a link to a survey; and (b) send the User emails to invite the User to participate in additional surveys. Mozilla collects personally-identifying information only insofar as is necessary to fulfill the purpose of the interaction with Mozilla. You can always refuse to supply personally-identifying information to Mozilla, with the caveat that it may prevent you from engaging in certain activities on or related to the Website.</p>
|
||||
|
||||
<p>Mozilla is an open organization that believes in sharing as much information as possible about its products, its operations and its associations. Accordingly, community members should assume - as should most folks who interact with Mozilla - that any personally-identifying information provided to Mozilla will be made available to the public. There are three broad exceptions to that rule:</p>
|
||||
|
||||
<ol>
|
||||
<li>Mozilla does not publicly release information gathered in connection with commercial transactions (i.e., transactions involving money), including transactions conducted through the Mozilla Store.</li>
|
||||
<li>Mozilla does not make publicly available information that is used to authenticate users the publication of which would compromise the security of Mozilla's Web sites (e.g., passwords).</li>
|
||||
<li>Mozilla does not make publicly available information that it specifically promises at the time of collection to maintain in confidence.</li>
|
||||
</ol>
|
||||
|
||||
<p>Outside those three contexts, users should assume that personally-identifying information provided through Mozilla's Web sites will be made available to the public.</p>
|
||||
|
||||
<h3>Interactive Product Features</h3>
|
||||
|
||||
<p>Certain Mozilla products contain features that report, or that permit users to report, the user's usage patterns and problems - whether caused by Mozilla's software, third party software, or third-party Web sites - to Mozilla. The reports generated by these features typically include non-personally-identifying information such as the configuration of the user's computer and the code running at the time the problem occurred. Some of these features give users the option of providing personally-identifying information, though none of these features require it. Some Mozilla software features that do permit users to provide personally-identifying information advise in advance that such information will not be made publicly available. Mozilla analyzes the information provided by these interactive product features to develop a better understanding of how its products are performing and being used. It does not use the information to track the usage of its products by identifiable individuals.</p>
|
||||
<p>Mozilla is an open organization that believes in sharing as much information as possible about its products, its operations and its associations. Accordingly, any personally-identifying information provided to Mozilla will be made available to the public with the following exception: Mozilla does not make publicly available information that it specifically promises at the time of collection to maintain in confidence. Outside of this context, you should assume that personally-identifying information provided through the Website will be made available to the public.</p>
|
||||
|
||||
<h3>Cookies</h3>
|
||||
|
||||
<p>A cookie is a string of information that a Web site stores on a visitor's computer, and that the visitor's browser provides to the Web site each time the visitor returns. Mozilla's Web sites use cookies to help Mozilla identify and track visitors, their usage of Mozilla Web sites, and their Web site access preferences across multiple requests and visits to Mozilla's Web sites. It is possible to link cookies to personally-identifying information, thereby permitting Web site operators to track the online movements of particular individuals. Mozilla, however, does not do so. Instead, it uses the information provided by cookies to develop a better understanding of how Mozilla's visitors use, and to facilitate those visitors' interactions with, Mozilla's Web sites. Mozilla visitors who do not wish to have cookies placed on their computers by Mozilla or its contractors should set their browsers to refuse cookies before linking to Mozilla's Web sites. Certain features of Mozilla's Web sites may not function properly without the aid of cookies.</p>
|
||||
<p>A cookie is a string of information that a Web site stores on a visitor's computer, and that the visitor's browser provides to the Web site each time the visitor returns. Mozilla's Web sites use cookies to help Mozilla identify and track visitors, their usage of Mozilla Web sites, and their Web site access preferences across multiple requests and visits to Mozilla's Web sites. It is possible to link cookies to personally-identifying information, thereby permitting Web site operators to track the online movements of particular individuals. Mozilla, however, does not do so. Instead, it uses the information provided by cookies to develop a better understanding of how Mozilla's visitors use, and to facilitate those visitors' interactions with, Mozilla's Web sites. Mozilla visitors who do not wish to have cookies placed on their computers by Mozilla or its contractors should set their browsers to refuse cookies before linking to Mozilla's Web sites. Certain features of Mozilla's Web sites may not function properly without the aid of cookies.</p>
|
||||
|
||||
<h3>Protection of Certain Personally-Identifying Information</h3>
|
||||
|
||||
<p>Where Mozilla has collected personally-identifying information subject to one of the three exceptions described in the Contributors and Customers section, above, it discloses that information only to those of its employees, contractors and affiliated organizations that need to know that information in order to process it on Mozilla's behalf and that have agreed not to disclose it to others. Some of those employees, contractors and affiliated organizations may be located outside of your home country; by using Mozilla's Web sites, you consent to the transfer of your information to them. Mozilla does not rent or sell such information to anyone. Other than to its employees, contractors and affiliated organizations, as described above, Mozilla discloses such information only when required to do so by law, or when Mozilla believes in good faith that disclosure is reasonably necessary to protect the property or rights of Mozilla, members of the Mozilla community, or the public at large. Mozilla takes all measures reasonably necessary to protect against the unauthorized access, use, alteration or destruction of such information</p>
|
||||
<p>Where Mozilla has collected personally-identifying information subject to the exception described in the Contributors and Customers section, above, it discloses that information only to those of its employees, contractors and affiliated organizations that need to know that information in order to process it on Mozilla's behalf and that have agreed not to disclose it to others. Some of those employees, contractors and affiliated organizations may be located outside of your home country; by using Mozilla's Web sites, you consent to the transfer of your information to them. Mozilla does not rent or sell such information to anyone. </p>
|
||||
|
||||
<h3>Updating of Personally-Identifying Information</h3>
|
||||
|
||||
<p>Mozilla permits users to freely update and correct their personally-identifying information as maintained by Mozilla. To do so, users need only look for the links and other tools available on Mozilla's Web sites or contact Mozilla by email.</p>
|
||||
<p>Mozilla permits Users to freely update and correct their personally-identifying information as maintained by Mozilla. To do so, Users need only look for the links and other tools available on Mozilla's Web sites or contact Mozilla by email. If you no longer wish to receive materials distributed by Mozilla, you should unsubscribe by using the unsubscribe link located in the email message.</p>
|
||||
|
||||
<h3>Privacy Policy Changes</h3>
|
||||
|
||||
<p>Although changes are likely to be minor, Mozilla may change its Privacy Policy from time to time. Any and all changes will be reflected on this page. Substantive changes will also be announced through the standard mechanisms through which Mozilla communicates with the Mozilla community, including Mozilla's "mozilla-announce" mailing lists.</p>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<p>Although changes are likely to be minor, Mozilla may change this Firefox User Panel Privacy Policy from time to time. Any and all changes will be reflected on this page. Substantive changes will also be announced through the standard mechanisms through which Mozilla communicates with the Mozilla community, including Mozilla's "mozilla-announce" mailing lists.</p>
|
||||
|
||||
</div><!-- end #content div -->
|
||||
|
||||
|
|
@ -96,7 +75,7 @@
|
|||
<div id="footer-contents">
|
||||
<ul id="footer-menu">
|
||||
<li><a href="http://www.mozilla.com/about/">About Us</a></li>
|
||||
<li><a href="http://userpanel.mozilla.com/privacy-policy.html">Privacy Policy</a></li>
|
||||
<li><a href="http://www.mozilla.com/privacy-policy.html">Privacy Policy</a></li>
|
||||
<li><a href="http://www.mozilla.com/about/legal.html">Legal Notices</a></li>
|
||||
</ul> <div id="locales" class="small-print">
|
||||
<p>Other Languages:</p>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче