Skip to content

Commit

Permalink
Improve some text
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Aug 15, 2018
1 parent 058c4cd commit 276b39c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions PRIVACY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,43 @@ Even though Kap is open-source and not in the business of monetizing the product

The short version is that we respect your privacy, aim to give you as much choice and control as possible, and try to gather only the minimum amount of data absolutely necessary to help us make Kap better for you and everyone else.

### Security
### Security

All our traffic is served over [HTTPS](https://en.wikipedia.org/wiki/HTTPS). Our SSL/TLS certificate is issued by [Let's Encrypt](https://letsencrypt.org). In addition to encryption we do our best to stay vigilant and implement precautionary measures to avoid breaches or misuse.
All our traffic is served over [HTTPS](https://en.wikipedia.org/wiki/HTTPS). Our SSL/TLS certificate is issued by [Let's Encrypt](https://letsencrypt.org). In addition to encryption, we do our best to stay vigilant and implement precautionary measures to avoid breaches or misuse.

### Cookies

We do not allow any [third party cookies](https://en.wikipedia.org/wiki/HTTP_cookie#Third-party_cookie) and do not attempt to identify you, track you or associate your data across devices and services, nor do we use cookies to serve advertising.
We do not allow any [third-party cookies](https://en.wikipedia.org/wiki/HTTP_cookie#Third-party_cookie) and do not attempt to identify you, track you or associate your data across devices and services, nor do we use cookies to serve advertising.

**Authorised cookies:**
- `_g` for Google Analytics
- `_gat_gtag_UA_84705099_3` for Google Analytics
- `_gid` for Google Analytics

You are of course free to block and remove cookies, you'll typically find these options in the address bar of your browser.
You are of course free to block and remove cookies. You will typically find these options in the address bar of your browser.

[Learn more about our use of Google Analytics](#google-analytics-gdpr-compliant).
[Learn more about our use of Google Analytics](#google-analytics-gdpr-compliant).

## Third party services
## Third-party services

An overview of third party services that have access to, collect or generate data based on your usage.
An overview of third-party services that have access to, collect or generate data based on your usage.

### Google Analytics (GDPR Compliant)

We do not (and do not allow third parties to) use our Google Analytics data to track or collect personally identifiable information, nor do we (or do we allow any third party to) associate data gathered with any personally identifying information from any source.
We do not (and do not allow third-parties to) use our Google Analytics data to track or collect personally identifiable information, nor do we (or do we allow any third-party to) associate data gathered with any personally identifying information from any source.

[Google Analytics data is not shared with other Google products and services](https://support.google.com/analytics/answer/1011397), and is not accessible to Google technical support representatives or Google marketing specialists.
[Google Analytics data is not shared with other Google products and services](https://support.google.com/analytics/answer/1011397), and is not accessible to Google technical support representatives or Google marketing specialists.

We do not collect or use [user specific metrics](https://support.google.com/analytics/answer/2992042), nor do we [associate data from different devices](https://support.google.com/analytics/answer/3123662).
We do not collect or use [user specific metrics](https://support.google.com/analytics/answer/2992042), nor do we [associate data from different devices](https://support.google.com/analytics/answer/3123662).

No [Enhanced Link Attribution](https://support.google.com/analytics/answer/7377126) or [Demographics and Interests reports](https://support.google.com/analytics/answer/2799357) are used or generated, nor do we [track your search queries on our site](https://support.google.com/analytics/answer/1012264). We also do not collect data for [Display and Search Remarketing or Advertising Reporting features](https://support.google.com/analytics/answer/3450482).

Google Analytics data for inactive sessions is retained for the [shortest currently available time](https://support.google.com/analytics/answer/7667196) (14 months). We can however retain analytics data for active sessions longer.
Google Analytics data for inactive sessions are retained for the [shortest currently available time](https://support.google.com/analytics/answer/7667196) (14 months). We can however retain analytics data for active sessions longer.

We ask Google Analytics to [anonymize your IP address](https://support.google.com/analytics/answer/2763052).

- [Google Privacy Policy](https://policies.google.com/privacy)
- [How Google Analytics safeguards your data](https://support.google.com/analytics/answer/6004245)
- [How Google Analytics safeguards your data](https://support.google.com/analytics/answer/6004245)
- [Privacy Shield Certificate](https://www.privacyshield.gov/participant?id=a2zt000000001L5AAI)

### Sentry (GDPR Compliant)
Expand All @@ -53,7 +53,7 @@ We prevent Sentry from storing IP Addresses, in addition to requiring enhanced p

### MailChimp (GDPR Compliant)

We are compliant with [MailChimp Terms of Use and anti spam requirements](https://kb.mailchimp.com/accounts/compliance-tips/terms-of-use-and-anti-spam-requirements) (CAN-SPAM).
We are compliant with [MailChimp Terms of Use and anti-spam requirements](https://kb.mailchimp.com/accounts/compliance-tips/terms-of-use-and-anti-spam-requirements) (CAN-SPAM).

When you provide your name and email address to [receive email updates](http://eepurl.com/ch90_1) from us, you acknowledge that the information you provide will be transferred to MailChimp for processing in accordance with their [Privacy Policy](https://mailchimp.com/legal/privacy/) and [Terms](https://mailchimp.com/legal/terms/).

Expand All @@ -66,6 +66,6 @@ You can unsubscribe from emails regarding Kap at any time by using the unsubscri

## Help us do even better

We'd love to hear from you! [Open an issue](https://github.com/wulkano/kap/issues/new) or [send an email](mailto:[email protected]) to help shape and strengthen our stance on privacy.
We'd love to hear from you! [Open an issue](https://github.com/wulkano/kap/issues/new) or [send an email](mailto:[email protected]) to help shape and strengthen our stance on privacy.

*Updated May 24, 2018*
2 changes: 1 addition & 1 deletion maintaining.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ We strongly recommend installing an [XO editor plugin](https://github.com/sindre
- Check out the `beta` branch: `git checkout beta`
- Rebase from the `master` branch: `git pull --rebase origin master`
- Change the `version` number in `app/package.json`
- Ammend the "Beta build customizations" commit: `git add . && git commit --amend`
- Amend the "Beta build customizations" commit: `git add . && git commit --amend`
- Force push to the `beta` branch: `git push --force`
- Tag a release with the version number in package.json and push it: `git tag -a "v2.0.0-beta.3" -m "v2.0.0-beta.3" && git push --follow-tags`
- Wait for CircleCI to add the binaries to a new GitHub Releases draft
Expand Down

0 comments on commit 276b39c

Please sign in to comment.