Skip to content

Commit

Permalink
Automatic update
Browse files Browse the repository at this point in the history
  • Loading branch information
floort committed Nov 20, 2011
1 parent 09f5732 commit 0143be4
Show file tree
Hide file tree
Showing 18 changed files with 2,025 additions and 1,292 deletions.
10 changes: 5 additions & 5 deletions files/apple_privacy.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h3>What personal information we collect</h3>

<h3>How we use your personal information</h3>
<ul class="square">
<li>The personal information we collect allows us to keep you posted on Apple’s latest product announcements, software updates, and upcoming events. It also helps us to improve our services, content, and advertising. If you don’t want to be on our mailing list, you can opt out anytime by <a href="https://myinfo.apple.com/cgi-bin/WebObjects/MyInfo.woa">updating your preferences</a>.</li>
<li>The personal information we collect allows us to keep you posted on Apple’s latest product announcements, software updates, and upcoming events. It also helps us to improve our services, content, and advertising. If you don’t want to be on our mailing list, you can opt out anytime by <a href="https://appleid.apple.com/">updating your preferences</a>.</li>
<li>We also use personal information to help us develop, deliver, and improve our products, services, content, and advertising.</li>
<li>From time to time, we may use your personal information to send important notices, such as communications about purchases and changes to our terms, conditions, and policies. Because this information is important to your interaction with Apple, you may not opt out of receiving these communications.</li>
<li>We may also use personal information for internal purposes such as auditing, data analysis, and research to improve Apple’s products, services, and customer communications.</li>
Expand All @@ -128,13 +128,13 @@ <h2>Collection and Use of Non-Personal Information</h2>
</p>
<ul class="square">
<li>We may collect information such as occupation, language, zip code, area code, unique device identifier, location, and the time zone where an Apple product is used so that we can better understand customer behavior and improve our products, services, and advertising. </li>
<li>We also may collect information regarding customer activities on our website, MobileMe service, and iTunes Store and from our other products and services. This information is aggregated and used to help us provide more useful information to our customers and to understand which parts of our website, products, and services are of most interest. Aggregated data is considered non-personal information for the purposes of this Privacy Policy.</li>
<li>We also may collect information regarding customer activities on our website, iCloud and MobileMe services, and iTunes Store and from our other products and services. This information is aggregated and used to help us provide more useful information to our customers and to understand which parts of our website, products, and services are of most interest. Aggregated data is considered non-personal information for the purposes of this Privacy Policy.</li>
</ul>
<p>If we do combine non-personal information with personal information the combined information will be treated as personal information for as long as it remains combined.</p>
<h2>Cookies and Other Technologies</h2>
<p>Apple’s website, online services, interactive applications, email messages, and advertisements may use “cookies” and other technologies such as pixel tags and web beacons. These technologies help us better understand user behavior, tell us which parts of our website people have visited, and facilitate and measure the effectiveness of advertisements and web searches. We treat information collected by cookies and other technologies as non-personal information. However, to the extent that Internet Protocol (IP) addresses or similar identifiers are considered personal information by local law, we also treat these identifiers as personal information. Similarly, to the extent that non-personal information is combined with personal information, we treat the combined information as personal information for the purposes of this Privacy Policy.</p>
<p>Apple and its partners use cookies and other technologies in mobile advertising services to control the number of times you see a given ad, deliver ads that relate to your interests, and measure the effectiveness of ad campaigns. If you do not want to receive ads with this level of relevance on your mobile device, you can opt out by accessing the following link on your device: <a href="http://oo.apple.com">http://oo.apple.com</a>. If you opt out, you will continue to receive the same number of mobile ads, but they may be less relevant because they will not be based on your interests. You may still see ads related to the content on a web page or in an application or based on other non-personal information. This opt-out applies only to Apple advertising services and does not affect interest-based advertising from other advertising networks.</p>
<p>Apple and our partners also use cookies and other technologies to remember personal information when you use our website, online services, and applications. Our goal in these cases is to make your experience with Apple more convenient and personal. For example, knowing your first name lets us welcome you the next time you visit the Apple Online Store. Knowing your country and language − and if you are an educator, your school − helps us provide a customized and more useful shopping experience. Knowing someone using your computer or device has shopped for a certain product or used a particular service helps us make our advertising and email communications more relevant to your interests. And knowing your contact information, product serial numbers, and information about your computer or device helps us register your products, personalize your operating system, set up your MobileMe service, and provide you with better customer service. </p>
<p>Apple and our partners also use cookies and other technologies to remember personal information when you use our website, online services, and applications. Our goal in these cases is to make your experience with Apple more convenient and personal. For example, knowing your first name lets us welcome you the next time you visit the Apple Online Store. Knowing your country and language − and if you are an educator, your school − helps us provide a customized and more useful shopping experience. Knowing someone using your computer or device has shopped for a certain product or used a particular service helps us make our advertising and email communications more relevant to your interests. And knowing your contact information, product serial numbers, and information about your computer or device helps us register your products, personalize your operating system, set up your iCloud service, and provide you with better customer service. </p>
<p>If you want to disable cookies and you’re using the Safari web browser, go to Safari preferences and then to the Security pane to disable cookies. On your Apple mobile device, go to Settings, then Safari, and then to the Cookies section. For other browsers, check with your provider to find out how to disable cookies. Please note that certain features of the Apple website will not be available once cookies are disabled. </p>
<p>As is true of most websites, we gather some information automatically and store it in log files. This information includes Internet Protocol (IP) addresses, browser type and language, Internet service provider (ISP), referring and exit pages, operating system, date/time stamp, and clickstream data.</p>
<p>We use this information to understand and analyze trends, to administer the site, to learn about user behavior on the site, and to gather demographic information about our user base as a whole. Apple may use this information in our marketing and advertising services.</p>
Expand All @@ -159,7 +159,7 @@ <h2>Children</h2>
<p>We do not knowingly collect personal information from children under 13. If we learn that we have collected the personal information of a child under 13 we will take steps to delete the information as soon as possible.</p>
<h2>Location-Based Services</h2>
<p>To provide location-based services on Apple products, Apple and our partners and licensees may collect, use, and share precise location data, including the real-time geographic location of your Apple computer or device. This location data is collected anonymously in a form that does not personally identify you and is used by Apple and our partners and licensees to provide and improve location-based products and services. For example, we may share geographic location with application providers when you opt in to their location services.</p>
<p>Some location-based services offered by Apple, such as the MobileMe “Find My iPhone” feature, require your personal information for the feature to work. </p>
<p>Some location-based services offered by Apple, such as the “Find My iPhone” feature, require your personal information for the feature to work. </p>
<h2>Third-Party Sites and Services</h2>
<p>Apple websites, products, applications, and services may contain links to third-party websites, products, and services. Our products and services may also use or offer products or services from third parties − for example, a third-party iPhone app. Information collected by third parties, which may include such things as location data or contact details, is governed by their privacy practices. We encourage you to learn about the privacy practices of those third parties.</p>
<h2>International Users</h2>
Expand All @@ -174,7 +174,7 @@ <h2>Privacy Questions</h2>

<p>Apple may update its Privacy Policy from time to time. When we change the policy in a material way, a notice&nbsp;will be posted on our website along with the updated Privacy Policy.</p>
<p>Apple Inc. 1 Infinite Loop, Cupertino, California, USA, 95014</p>
<p class="last"><em>Last updated: June 21, 2010</em></p>
<p class="last"><em>Last updated: October 21, 2011</em></p>

</div>
<div class="column last">
Expand Down
57 changes: 24 additions & 33 deletions files/dropbox_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
- Simplify your life
</title>

<link rel="shortcut icon" href="/static/19184/images/favicon.ico"/>
<link rel="shortcut icon" href="/static/20351/images/favicon.ico"/>

<link href="/static/19184/css/main.css" rel="stylesheet" type="text/css"/>
<link href="/static/19184/css/lib.css" rel="stylesheet" type="text/css" media="screen"/>
<link href="/static/19184/css/sprites.css" rel="stylesheet" type="text/css" media="screen"/>
<link href="/static/20351/css/main.css" rel="stylesheet" type="text/css"/>

<link rel="apple-touch-icon" href="/static/19184/images/dropbox_webclip.png"/>
<link rel="apple-touch-icon" href="/static/20351/images/dropbox_webclip.png"/>
<link rel="P3Pv1" href="/w3c/p3p.xml"/>


Expand All @@ -36,7 +34,7 @@
protocol: 'https',
uid: '',
root_ns: '',
SVN_REV: '19184',
SVN_REV: '20351',
TOKEN: '',
IS_PROD: 1,
WIT_ENABLED: 0,
Expand All @@ -50,34 +48,29 @@
USER_LOCALE: 'en'
};
</script>
<script type="text/javascript" src="/static/19184/javascript/lib-mini.js"></script>
<script type="text/javascript">
function global_report_exception (e, f, l, tb, force) {
if (!window.reported_exception || force) {
var stack_str = "";
try {
if (!tb) {
var stack = get_stack_rep();
stack.pop(); // remove global_report_exception
stack.pop(); // remove onerror handler
stack.pop();
stack.pop();
stack_str = stack.join("\n");
}
} catch (e) { }
var dbr = new Ajax.Request("/jse", {parameters: {'e': e, 'f': f || window.location.href, 'l': l, 'loc': window.location.href, 'ref': Constants.referrer, 'tb': tb || stack_str }});
window.reported_exception = true;
}
}
window.LoadedJsSuccessfully = false; // this constant gets set to true at the bottom of dropbox.js
Event.observe(window, "load", function () {
if (!window.LoadedJsSuccessfully) {
global_report_exception("Failed to load javascript!");
}
});
window.LoadedJsSuccessfully = false;

window.onerror = function (e, f, l) {
global_report_exception(e, f, l);
};
</script>
<script type="text/javascript" src="/static/19184/javascript/dropbox-mini.js"></script>
<script type="text/javascript" src="/static/20351/javascript/dropbox-mini.js"></script>

<script type="text/javascript">
if (self != top) {
Expand All @@ -88,7 +81,7 @@


<style type="text/css">
.hny-qwvoew { display: none; }
.hny-ndsf { display: none; }
</style>
<style type="text/css">
.graybox { background: #f6f6f6; border: 1px solid #ccc; padding: 20px; }
Expand Down Expand Up @@ -138,7 +131,7 @@ <h2 id="modal-title"></h2>
<textarea class="textinput act_as_block" name="content" id="feedback_textarea" rows="1" cols="1"></textarea>

<div align="right">
<input type="text" name="email" class="hny-qwvoew"/>
<input type="text" name="email" class="hny-ndsf"/>
<input type="submit" value="Send feedback" class="button" />
</div>
</form>
Expand Down Expand Up @@ -212,7 +205,7 @@ <h2 id="modal-title"></h2>
<div id="login-hover-cover"></div>
<div id="login-hover-cont" class="offscreen">
<form action="https://www.dropbox.com/login" method="post">
<input type="hidden" name="t" value="791206fc33" />
<input type="hidden" name="t" value="7eec60c91c" />
<p>
Email<br/>
<input id="login_email_elm" type="text" name="login_email" class="textinput" tabindex="1" />
Expand All @@ -234,7 +227,7 @@ <h2 id="modal-title"></h2>
</div>
</li>
</ul>
<a href="/" id="logo"><img border="0" id="logo_img" alt="Dropbox - Secure backup, sync and sharing made easy." src="/static/19184/images/logo.png"/>
<a href="/" id="logo"><img border="0" id="logo_img" alt="Dropbox - Secure backup, sync and sharing made easy." src="/static/20351/images/logo.png"/>

</a>
</div>
Expand Down Expand Up @@ -547,7 +540,7 @@ <h2>How to Add Your Own Layer of Encryption to Dropbox</h2>

<h2>I think I've found a security exploit. Where do I report security concerns?</h2>
<p>We take a number of measures to ensure that the data you store on Dropbox is safe and secure. While we're very confident in our technology, we recognize that no system can guarantee data security with 100% certainty. For that reason, we will continue to innovate to make sure that our security measures are state of the art, and we will investigate any and all reported security issues concerning Dropbox's services or software. For a direct line to our security experts, report security issues to <a href="mailto:[email protected]">[email protected]</a>.</p>

<p>We'll fully credit anybody whose reports lead to the improvement of Dropbox security. A list of those who have contributed reports leading to a bug or security issue can be found on our <a href="/special_thanks">special thanks page</a>.</p>
</div>
</div>
<div id="acceptable_use-content" class="content-tab" style="display:none;">
Expand Down Expand Up @@ -610,22 +603,11 @@ <h2>Dropbox Acceptable Use Policy</h2>
<li><a href="/install">Install</a></li>
<li><a href="/anywhere">Mobile</a></li>
<li><a href="/pricing">Pricing</a></li>
<li><a href="/teams">For Business</a></li>
<li><a href="/features">Features</a></li>
<li><a href="/tour">Tour</a></li>
</ul>
</div>
<div class="footer-col">
<ul>
<li class="header">Community</li>
<li><a href="/referrals" onmouseup="javascript: MCLog.log('referrals_via_footer');">Referrals</a></li>
<li><a href="http://twitter.com/dropbox" target="_blank">Twitter</a></li>
<li><a href="http://facebook.com/Dropbox" target="_blank">Facebook</a></li>
<li><a href="http://wiki.dropbox.com/">Wiki</a></li>
<li><a href="/developers">Developers</a></li>
<li><a href="/anywhere/apps">Partners</a></li>

</ul>
</div>
<div class="footer-col">
<ul>
<li class="header">About Us</li>
Expand All @@ -648,6 +630,15 @@ <h2>Dropbox Acceptable Use Policy</h2>
<li><a href="/dmca">Copyright</a></li>
</ul>
</div>
<div class="footer-col">
<ul>
<li class="header">Community</li>
<li><a href="/referrals" onmouseup="javascript: MCLog.log('referrals_via_footer');">Referrals</a></li>
<li><a href="http://twitter.com/dropbox" target="_blank">Twitter</a></li>
<li><a href="http://facebook.com/Dropbox" target="_blank">Facebook</a></li>
<li><a href="/developers">Developers</a></li>
</ul>
</div>
<div class="clear"></div>
</div>
</div>
Expand Down
Loading

0 comments on commit 0143be4

Please sign in to comment.