Revisions to privacy policy and terms of service

(imported from commit 6f618c858a7c5b53d86a6c032fb7089521c62eb7)

templates/zephyr/privacy.html

@@ -9,15 +9,10 @@
 
 <h1>Privacy Policy</h1>
 
-<p>Last modified: October 25, 2012</p>
+<p>Last modified: October 29, 2012</p>
 
-<p>There are many different ways you can use our services – to search for and
+<p>As you use our services, we want you to be clear how we’re using information
-share information, to communicate with other people or to create new content.
+and the ways in which you can protect your privacy.</p>
-When you share information with us, for example by creating a Humbug Account,
-we can make those services even better – to show you more relevant search
-results and ads, to help you connect with people or to make sharing with others
-quicker and easier. As you use our services, we want you to be clear how we’re
-using information and the ways in which you can protect your privacy.</p>
 
 <p>Our Privacy Policy explains:</p>
 
@@ -27,19 +22,9 @@ using information and the ways in which you can protect your privacy.</p>
     <li>The choices we offer, including how to access and update information.</li>
 </ul>
 
-<p>We’ve tried to keep it as simple as possible, but if you’re not familiar
-with terms like cookies, IP addresses, pixel tags and browsers, then read about
-these key terms first. Your privacy matters to Humbug so whether you are new to
-Humbug or a long-time user, please do take the time to get to know our
-practices – and if you have any questions contact us.</p>
-
-
 <h3>Information we collect</h3>
 
-<p>We collect information to provide better services to all of our users – from
+<p>We collect information to provide better services to all of our users.</p>
-figuring out basic stuff like which language you speak, to more complex things
-like which ads you’ll find most useful or the people who matter most to you
-online.</p>
 
 <p>We collect information in two ways:</p>
 
@@ -47,15 +32,12 @@ online.</p>
 
 <li><p><strong>Information you give us.</strong> For example, many of our
 services require you to sign up for a Humbug Account. When you do, we’ll ask
-for personal information, like your name, email address, telephone number or
+for personal information, like your name, email address, or telephone
-credit card. If you want to take full advantage of the sharing features we
+number.</p></li>
-offer, we might also ask you to create a publicly visible Humbug Profile, which
-may include your name and photo.</p></li>
 
 <li><p><strong>Information we get from your use of our services.</strong> We
 may collect information about the services that you use and how you use them,
-like when you visit a website that uses our advertising services or you view
+like when you interact with our content.  This information includes:</p>
-and interact with our ads and content. This information includes:</p>
 
 <ul>
 
@@ -76,11 +58,7 @@ include:</p>
 
 <ul>
 
-<li><p>details of how you used our service, such as your search queries.</p></li>
+<li><p>details of how you used our service.</p></li>
-
-<li><p>telephony log information like your phone number, calling-party number,
-forwarding numbers, time and date of calls, duration of calls, SMS routing
-information and types of calls.</p></li>
 
 <li><p>Internet protocol address.</p></li>
 
@@ -95,15 +73,6 @@ Account.</p></li>
 
 </li>
 
-<li>
-<p><strong>Location information</strong></p>
-<p>When you use a location-enabled Humbug service, we may collect and process
-information about your actual location, like GPS signals sent by a mobile
-device. We may also use various technologies to determine location, such as
-sensor data from your device that may, for example, provide information on
-nearby Wi-Fi access points and cell towers.</p>
-</li>
-
 <li>
 <p><strong>Unique application numbers</strong></p>
 <p>Certain services include a unique application number. This number and
@@ -124,9 +93,9 @@ HTML 5) and application data caches.</p>
 <p><strong>Cookies and anonymous identifiers</strong></p>
 <p>We use various technologies to collect and store information when you visit
 a Humbug service, and this may include sending one or more cookies or anonymous
-identifiers to your device. We also use cookies and anonymous identifiers when
+identifiers to your device. We may also use cookies and anonymous identifiers
-you interact with services we offer to our partners, such as advertising
+when you interact with services we offer to our partners, such as Humbug
-services or Humbug features that may appear on other sites.</p>
+features that may appear on other sites.</p>
 </li>
 
 </ul>
@@ -140,8 +109,7 @@ services or Humbug features that may appear on other sites.</p>
 
 <p>We use the information we collect from all of our services to provide,
 maintain, protect and improve them, to develop new ones, and to protect Humbug
-and our users. We also use this information to offer you tailored content –
+and our users.</p>
-like giving you more relevant search results and ads.</p>
 
 <p>We may use the name you provide for your Humbug Profile across all of the
 services we offer that require a Humbug Account. In addition, we may replace
@@ -155,18 +123,13 @@ solve any issues you might be facing. We may use your email address to inform
 you about our services, such as letting you know about upcoming changes or
 improvements.</p>
 
-<p>We use information collected from cookies and other technologies, like pixel
+<p>We use information collected from cookies and other technologies to improve
-tags, to improve your user experience and the overall quality of our services.
+your user experience and the overall quality of our services.  We will not
-For example, by saving your language preferences, we’ll be able to have our
+associate a cookie or anonymous identifier with sensitive categories, such as
-services appear in the language you prefer. When showing you tailored ads, we
+those based on race, religion, sexual orientation or health.</p>
-will not associate a cookie or anonymous identifier with sensitive categories,
-such as those based on race, religion, sexual orientation or health.</p>
 
 <p>We may combine personal information from one service with information,
-including personal information, from other Humbug services – for example to
+including personal information, from other Humbug services.</p>
-make it easier to share things with people you know. We will not combine
-DoubleClick cookie information with personally identifiable information unless
-we have your opt-in consent.</p>
 
 <p>We will ask for your consent before using information for a purpose other
 than those that are set out in this Privacy Policy.</p>
@@ -176,43 +139,10 @@ around the world. We may process your personal information on a server located
 outside the country where you live.</p>
 
 
-<h3>Transparency and choice</h3>
-
-<p>People have different privacy concerns. Our goal is to be clear about what
-information we collect, so that you can make meaningful choices about how it is
-used. For example, you can:</p>
-
-<ul>
-
-<li><p>Review and control certain types of information tied to your Humbug
-Account by using Humbug Dashboard.</p></li>
-
-<li><p>View and edit your ads preferences, such as which categories might
-interest you, using the Ads Preferences Manager. You can also opt out of
-certain Humbug advertising services here.</p></li>
-
-<li><p>Use our editor to see and adjust how your Humbug Profile appears to
-particular individuals.</p></li>
-
-<li><p>Control who you share information with.</p></li>
-
-<li><p>Take information out of many of our services.</p></li>
-
-</ul>
-
-<p>You may also set your browser to block all cookies, including cookies
-associated with our services, or to indicate when a cookie is being set by us.
-However, it’s important to remember that many of our services may not function
-properly if your cookies are disabled. For example, we may not remember your
-language preferences.</p>
-
-
 <h3>Information you share</h3>
 
 <p>Many of our services let you share information with others. Remember that
-when you share information publicly, it may be indexable by search engines,
+when you share information publicly, it may be indexable by search engines.</p>
-including Humbug. Our services provide you with different options on sharing
-and removing your content.</p>
 
 
 <h3>Accessing and updating your personal information</h3>
@@ -256,16 +186,14 @@ opt-in consent for the sharing of any sensitive personal information.</p>
 <li>
 <p><strong>With domain administrators</strong>
 
-<p>If your Humbug Account is managed for you by a domain administrator (for
+<p>If your Humbug Account is managed for you by a domain administrator then
-example, for Humbug Apps users) then your domain administrator and resellers
+your domain administrator and resellers who provide user support to your
-who provide user support to your organization will have access to your Humbug
+organization will have access to your Humbug Account information (including
-Account information (including your email and other data). Your domain
+your email and other data). Your domain administrator may be able to:</p>
-administrator may be able to:</p>
 
 <ul>
 
-<li><p>view statistics regarding your account, like statistics regarding
+<li><p>view statistics regarding your account.</p></li>
-applications you install.</p></li>
 
 <li><p>change your account password.</p></li>
 
@@ -357,8 +285,8 @@ obligations.</p></li>
 
 <h3>Application</h3>
 
-<p>Our Privacy Policy applies to all of the services offered by Humbug Inc. and
+<p>Our Privacy Policy applies to all of the services offered by Humbug, Inc.
-its affiliates, including services offered on other sites (such as our
+and its affiliates, including services offered on other sites (such as our
 advertising services), but excludes services that have separate privacy
 policies that do not incorporate this Privacy Policy.</p>
 

templates/zephyr/terms.html

@@ -121,15 +121,14 @@ suggestions without obligation to you.</p>
 update automatically on your device once a new version or feature is available.
 Some Services may let you adjust your automatic update settings.</p>
 
-<p>Humbug gives you a personal, worldwide, royalty-free, revocable,
+<p>Humbug gives you a personal, worldwide, royalty-free, non-assignable and
-non-assignable and non-exclusive license to use the software provided to you by
+non-exclusive license to use the software provided to you by Humbug as part of
-Humbug as part of the Services. This license is for the sole purpose of
+the Services. This license is for the sole purpose of enabling you to use and
-enabling you to use and enjoy the benefit of the Services as provided by
+enjoy the benefit of the Services as provided by Humbug, in the manner
-Humbug, in the manner permitted by these terms. You may not copy, modify,
+permitted by these terms. You may not copy, modify, distribute, sell, or lease
-distribute, sell, or lease any part of our Services or included software, nor
+any part of our Services or included software, nor may you reverse engineer or
-may you reverse engineer or attempt to extract the source code of that
+attempt to extract the source code of that software, unless laws prohibit those
-software, unless laws prohibit those restrictions or you have our written
+restrictions or you have our written permission.</p>
-permission.</p>
 
 <p>Open source software is important to us. Some software used in our Services
 may be offered under an open source license that we will make available to you.
@@ -148,9 +147,9 @@ you go. Humbug may also stop providing Services to you, or add or create new
 limits to our Services at any time.</p>
 
 <p>We believe that you own your data and preserving your access to such data is
-important. If we discontinue a Service, where reasonably possible, we will give
+important. If we discontinue a Service, we will, if it is practical in our sole
-you reasonable advance notice and a chance to get information out of that
+discretion, give you reasonable advance notice and a chance to get information
-Service.</p>
+out of that Service.</p>
 
 
 <h3>Our Warranties and Disclaimers</h3>
@@ -225,7 +224,7 @@ those courts.</p>
 
 <br />
 
-<p>Last modified: October 24, 2012</p>
+<p>Last modified: October 29, 2012</p>
 
 </div>
 </div>