Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: pages/privacy.md

Issue 29811582: Fixes #88 - Made short policy lists inline and semicolon separated on privacy page (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Patch Set: Created June 20, 2018, 3:25 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | static/css/defaults.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 title=Privacy Policy 1 title=Privacy Policy
2 description=This Privacy Policy describes how we use, process and protect inform ation that we collect from you online through our websites and our products. 2 description=This Privacy Policy describes how we use, process and protect inform ation that we collect from you online through our websites and our products.
3 notoc=True 3 notoc=True
4 4
5 <style>
6
7 .horizontal-list.semicolon-separated
ire 2018/06/20 18:33:19 See my comment below about the classes being appli
8 {
9 display: list-item;
10 list-style: inherit;
11 }
12
13 .horizontal-list.semicolon-separated ul
14 {
15 display: inline;
16 padding: 0;
17 }
18
19 .horizontal-list.semicolon-separated li
ire 2018/06/20 18:33:19 These styles are already covered by the .horizonta
20 {
21 display: inline;
22 list-style: none;
23 }
24
25 .semicolon-separated li:after
26 {
27 content: "; ";
28 }
29
30 [lang="fr"] .semicolon-separated li:after
31 {
32 content: " ; ";
33 }
34
35 .semicolon-separated li:last-of-type:after
36 {
37 content: "";
38 }
39
40 </style>
41
5 <script src="/js/address-masking.js"></script> 42 <script src="/js/address-masking.js"></script>
6 43
7 - [{{ privacy-notice-short-link[link to heading] Privacy Notice (short version) }}](#privacy-policy-short) 44 - [{{ privacy-notice-short-link[link to heading] Privacy Notice (short version) }}](#privacy-policy-short)
8 - [{{ privacy-policy-long-link[link to heading] Privacy Policy (long version) }} ](#privacy-policy-long) 45 - [{{ privacy-policy-long-link[link to heading] Privacy Policy (long version) }} ](#privacy-policy-long)
9 46
10 ## {{ privacy-policy-short-heading[heading] Privacy Notice (short version) }} {: #privacy-policy-short } 47 ## {{ privacy-policy-short-heading[heading] Privacy Notice (short version) }} {: #privacy-policy-short }
11 48
12 {{ privacy-policy-short-paragraph The following privacy notice shall provide you with a general overview about the collection, processing and use (hereinafter t ogether referred to as "processing") of your personal data. For more information regarding our processing activities, please view our complete [Privacy Policy]( #privacy-policy-long). }} 49 {{ privacy-policy-short-paragraph The following privacy notice shall provide you with a general overview about the collection, processing and use (hereinafter t ogether referred to as "processing") of your personal data. For more information regarding our processing activities, please view our complete [Privacy Policy]( #privacy-policy-long). }}
13 50
14 ### {{ data-processed-heading[heading] What kind of personal data do we process? }} {: #data-processed } 51 ### {{ data-processed-heading[heading] What kind of personal data do we process? }} {: #data-processed }
15 52
16 1. {{ data-processed-item-1[list item] While using our products: Adblock Plus or Adblock Browser (automatically, except for Issue Reporter) }} 53 1. {{ data-processed-item-1[list item] While using our products: Adblock Plus or Adblock Browser (automatically, except for Issue Reporter) }}
17 - {{ data-processed-item-2[list item] Extension updates, subscription downlo ads, emergency notifications: }} 54 - {{ data-processed-item-2[list item] Extension updates, subscription downlo ads, emergency notifications: }}
55 {: .horizontal-list .semicolon-separated }
ire 2018/06/20 18:33:19 NIT: These classes are being applied to the <li>,
juliandoucette 2018/06/21 12:17:59 Ack. I'm trying to keep this page in markdown and
18 - {{ data-processed-item-3[list item] Browser version }} 56 - {{ data-processed-item-3[list item] Browser version }}
19 - {{ data-processed-item-4[list item] Extension version }} 57 - {{ data-processed-item-4[list item] Extension version }}
20 - {{ data-processed-item-5[list item] Operating system }} 58 - {{ data-processed-item-5[list item] Operating system }}
21 - {{ data-processed-item-6[list item] Date of last update }} 59 - {{ data-processed-item-6[list item] Date of last update }}
22 - {{ data-processed-item-7[list item] IP address }} 60 - {{ data-processed-item-7[list item] IP address }}
23 - {{ data-processed-item-8[list item] Additionally, you may manually sub mit the following information about a web page with a bug using the [Issue Repor ter](#issue-reporter): URL, blockable items, matching filters, active filter lis ts (voluntary) }} 61 - {{ data-processed-item-8[list item] Additionally, you may manually sub mit the following information about a web page with a bug using the [Issue Repor ter](#issue-reporter): URL, blockable items, matching filters, active filter lis ts (voluntary) }}
24 - {{ data-processed-item-9[list item] Adblock Browser for Android }} 62 - {{ data-processed-item-9[list item] Adblock Browser for Android }}
63 {: .horizontal-list .semicolon-separated }
25 - {{ data-processed-item-10[list item] eyeo collects no data. Adblock Br owser, being based on Mozilla Firefox, provides Firefox specific functionality w hich, however, may send data to Mozilla. }} 64 - {{ data-processed-item-10[list item] eyeo collects no data. Adblock Br owser, being based on Mozilla Firefox, provides Firefox specific functionality w hich, however, may send data to Mozilla. }}
26 - {{ data-processed-item-11[list item] Adblock Browser for iOS (automaticall y): }} 65 - {{ data-processed-item-11[list item] Adblock Browser for iOS (automaticall y): }}
66 {: .horizontal-list .semicolon-separated }
27 - {{ data-processed-item-12[list item] Error and crash report data: }} 67 - {{ data-processed-item-12[list item] Error and crash report data: }}
28 - {{ data-processed-item-13[list item] Bundle identifier, bundle ver sion and short bundle version string of Adblock Browser for iOS }} 68 - {{ data-processed-item-13[list item] Bundle identifier, bundle ver sion and short bundle version string of Adblock Browser for iOS }}
29 - {{ data-processed-item-14[list item] Device type, CPU architecture and version of the operating system }} 69 - {{ data-processed-item-14[list item] Device type, CPU architecture and version of the operating system }}
30 - {{ data-processed-item-15[list item] Timestamp of crash }} 70 - {{ data-processed-item-15[list item] Timestamp of crash }}
31 - {{ data-processed-item-16[list item] UUID }} 71 - {{ data-processed-item-16[list item] UUID }}
32 - {{ data-processed-item-17[list item] Plain-text class name and mes sage value of the exception }} 72 - {{ data-processed-item-17[list item] Plain-text class name and mes sage value of the exception }}
33 - {{ data-processed-item-18[list item] Instruction pointer, method o r function names, signal data, pointer registers and information about the loade d binary images }} 73 - {{ data-processed-item-18[list item] Instruction pointer, method o r function names, signal data, pointer registers and information about the loade d binary images }}
34 - {{ data-processed-item-19[list item] String / function name identi fying the error }} 74 - {{ data-processed-item-19[list item] String / function name identi fying the error }}
35 1. {{ data-processed-item-20[list item] While using our websites: }} 75 1. {{ data-processed-item-20[list item] While using our websites: }}
36 - {{ data-processed-item-21[list item] Automatically: }} 76 - {{ data-processed-item-21[list item] Automatically: }}
77 {: .horizontal-list .semicolon-separated }
37 - {{ data-processed-item-22[list item] IP address (stored separately) }} 78 - {{ data-processed-item-22[list item] IP address (stored separately) }}
38 - {{ data-processed-item-23[list item] The time at which the request was made }} 79 - {{ data-processed-item-23[list item] The time at which the request was made }}
39 - {{ data-processed-item-24[list item] The web address accessed }} 80 - {{ data-processed-item-24[list item] The web address accessed }}
40 - {{ data-processed-item-25[list item] The browser identifier }} 81 - {{ data-processed-item-25[list item] The browser identifier }}
41 - {{ data-processed-item-26[list item] The referring page }} 82 - {{ data-processed-item-26[list item] The referring page }}
42 - {{ data-processed-item-32[list item] For adblock.ai only: analytics da ta }} 83 - {{ data-processed-item-32[list item] For adblock.ai only: analytics da ta }}
43 - {{ data-processed-item-27[list item] Voluntary: }} 84 - {{ data-processed-item-27[list item] Voluntary: }}
85 {: .horizontal-list .semicolon-separated }
44 - {{ data-processed-item-28[list item] Forum registration data }} 86 - {{ data-processed-item-28[list item] Forum registration data }}
45 - {{ data-processed-item-29[list item] Email address }} 87 - {{ data-processed-item-29[list item] Email address }}
46 - {{ data-processed-item-30[list item] Data you provide in comments }} 88 - {{ data-processed-item-30[list item] Data you provide in comments }}
47 - {{ data-processed-item-31[list item] Feedback and filter data }} 89 - {{ data-processed-item-31[list item] Feedback and filter data }}
48 90
49 ### {{ how-we-collect-heading[heading] How do we collect data? }} {: #how-we-col lect-data } 91 ### {{ how-we-collect-heading[heading] How do we collect data? }} {: #how-we-col lect-data }
50 92
51 {{ list-of-tools[preface] List of techniques and tools we use for data collectio n: }} 93 {{ list-of-tools[preface] List of techniques and tools we use for data collectio n: }}
52 94
53 1. {{ tools-item-1[list item] In our products: }} 95 1. {{ tools-item-1[list item] In our products: }}
96 {: .horizontal-list .semicolon-separated }
54 - {{ tools-item-2[list item] Update checks }} 97 - {{ tools-item-2[list item] Update checks }}
55 - {{ tools-item-3[list item] Subscription downloads }} 98 - {{ tools-item-3[list item] Subscription downloads }}
56 - {{ tools-item-4[list item] Sending issue reports }} 99 - {{ tools-item-4[list item] Sending issue reports }}
57 - {{ tools-item-5[list item] Emergency notification checks }} 100 - {{ tools-item-5[list item] Emergency notification checks }}
58 2. {{ tools-item-6[list item] On our websites: }} 101 2. {{ tools-item-6[list item] On our websites: }}
102 {: .horizontal-list .semicolon-separated }
59 - {{ tools-item-7[list item] Cookies, only where you can log in }} 103 - {{ tools-item-7[list item] Cookies, only where you can log in }}
60 - {{ tools-item-8[list item] Log files }} 104 - {{ tools-item-8[list item] Log files }}
61 - {{ tools-item-9[list item] Data, like name and / or email address, sent by you when using our forum or blog, or when sharing manually added filters }} 105 - {{ tools-item-9[list item] Data, like name and / or email address, sent by you when using our forum or blog, or when sharing manually added filters }}
62 - {{ tools-item-10[list item] For adblock.ai only: via Google Analytics }} 106 - {{ tools-item-10[list item] For adblock.ai only: via Google Analytics }}
63 107
64 ### {{ why-we-process-heading[heading] How and why do we process your data? }} { : #why-we-process-data } 108 ### {{ why-we-process-heading[heading] How and why do we process your data? }} { : #why-we-process-data }
65 109
66 - {{ why-we-process-item-1[list item] In order to inform you about urgent issues in connection with our products. }} 110 - {{ why-we-process-item-1[list item] In order to inform you about urgent issues in connection with our products. }}
67 - {{ why-we-process-item-2[list item] To improve and to evaluate our products by processing and analyzing subscription downloads, extension updates, emergency d ownloads and issue reports you send to us. }} 111 - {{ why-we-process-item-2[list item] To improve and to evaluate our products by processing and analyzing subscription downloads, extension updates, emergency d ownloads and issue reports you send to us. }}
68 - {{ why-we-process-item-3[list item] For technical purposes, such as, but not l imited to, preventing security attacks, to improve our website / products, to en sure website / product security. }} 112 - {{ why-we-process-item-3[list item] For technical purposes, such as, but not l imited to, preventing security attacks, to improve our website / products, to en sure website / product security. }}
69 - {{ why-we-process-item-4[list item] To analyze aggregated website logs and - a t adblock.ai only - analytics data, to improve our website. }} 113 - {{ why-we-process-item-4[list item] To analyze aggregated website logs and - a t adblock.ai only - analytics data, to improve our website. }}
70 - {{ why-we-process-item-5[list item] For communication and assistance purposes in our forum and blog. }} 114 - {{ why-we-process-item-5[list item] For communication and assistance purposes in our forum and blog. }}
71 115
72 ### {{ what-is-legal[heading] What is the legal basis of data processing? }} {: #what-is-legal } 116 ### {{ what-is-legal[heading] What is the legal basis of data processing? }} {: #what-is-legal }
73 117
74 {{ what-is-legal We process your personal data in compliance with the European G eneral Data Protection Regulation (Regulation (EU) 2016/679) (“GDPR”), the appli cable EU laws and German national data protection laws. }} 118 {{ what-is-legal We process your personal data in compliance with the European G eneral Data Protection Regulation (Regulation (EU) 2016/679) (“GDPR”), the appli cable EU laws and German national data protection laws. }}
75 119
76 ### {{ how-long[heading] How long do we keep data? }} {: #how-long } 120 ### {{ how-long[heading] How long do we keep data? }} {: #how-long }
77 121
78 1. {{ how-long-item-1[list item] For a period of 30 days: }} 122 1. {{ how-long-item-1[list item] For a period of 30 days: }}
123 {: .horizontal-list .semicolon-separated }
79 - {{ how-long-item-2[list item] Issue report data }} 124 - {{ how-long-item-2[list item] Issue report data }}
80 - {{ how-long-item-3[list item] Crash and error reporter data }} 125 - {{ how-long-item-3[list item] Crash and error reporter data }}
81 - {{ how-long-item-4[list item] Website logs }} 126 - {{ how-long-item-4[list item] Website logs }}
82 - {{ how-long-item-5[list item] Data related to subscription downloads, exte nsion update checks, emergency notifications }} 127 - {{ how-long-item-5[list item] Data related to subscription downloads, exte nsion update checks, emergency notifications }}
83 - {{ how-long-item-7[list item] Google Analytics data }} 128 - {{ how-long-item-7[list item] Google Analytics data }}
84 2. {{ how-long-item-6[list item] Blog and forum data as long as the respective c omment / account exists }} 129 2. {{ how-long-item-6[list item] Blog and forum data as long as the respective c omment / account exists }}
85 130
131
86 {{ how-long-paragraph **Note**: “Aggregated usage statistics” and other data wit hout any connection to single users may be retained beyond these periods. }} 132 {{ how-long-paragraph **Note**: “Aggregated usage statistics” and other data wit hout any connection to single users may be retained beyond these periods. }}
87 133
88 ### {{ our-values-heading[heading] Our values }} {: #our-values } 134 ### {{ our-values-heading[heading] Our values }} {: #our-values }
89 135
90 {{ our-values-paragraph We collect as little data as possible. As far as anonymo us or pseudonymous use is possible we anonymize or pseudonymize your data. }} 136 {{ our-values-paragraph We collect as little data as possible. As far as anonymo us or pseudonymous use is possible we anonymize or pseudonymize your data. }}
91 137
92 ### {{ your-rights-heading[heading] What rights do you have? }} {: #your-rights } 138 ### {{ your-rights-heading[heading] What rights do you have? }} {: #your-rights }
93 139
94 - {{ your-right-item-1[list item] Receive information about the personal data pr ocessed by us and how we process your data as well as to gain access to such dat a. }} 140 - {{ your-right-item-1[list item] Receive information about the personal data pr ocessed by us and how we process your data as well as to gain access to such dat a. }}
95 - {{ your-right-item-2[list item] Rectify inaccurate personal data and restrict details. }} 141 - {{ your-right-item-2[list item] Rectify inaccurate personal data and restrict details. }}
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 ###### {{ retention-communications-heading[heading] Email collection }} {: #rete ntion-communications } 448 ###### {{ retention-communications-heading[heading] Email collection }} {: #rete ntion-communications }
403 449
404 {{ retention-communications-paragraph-1 Data provided by you in connection with our blog and our forum will be retained for the same time as the comment and / o r your account exists. }} 450 {{ retention-communications-paragraph-1 Data provided by you in connection with our blog and our forum will be retained for the same time as the comment and / o r your account exists. }}
405 451
406 {{ retention-communications-paragraph-2 In general, we do not store your email a ddress unless it’s specifically required to execute the related campaign (i.e. e mail signups for a newsletter or signing up to get notified about a product laun ch). In cases where we do store your email address, we only store it for the len gth of time that is needed to execute the campaign (i.e. once you’ve been notifi ed of the launch). }} 452 {{ retention-communications-paragraph-2 In general, we do not store your email a ddress unless it’s specifically required to execute the related campaign (i.e. e mail signups for a newsletter or signing up to get notified about a product laun ch). In cases where we do store your email address, we only store it for the len gth of time that is needed to execute the campaign (i.e. once you’ve been notifi ed of the launch). }}
407 453
408 <time datetime="2018-06">{{ publication-date June 2018 }}</time> 454 <time datetime="2018-06">{{ publication-date June 2018 }}</time>
409 455
410 *[{{ gdpr-abbr[GDPR abbreviation] GDPR }}]: {{gdpr-abbr-dfn[General Data Protect ion Regulation abbreviation definition] General Data Protection Regulation }} 456 *[{{ gdpr-abbr[GDPR abbreviation] GDPR }}]: {{gdpr-abbr-dfn[General Data Protect ion Regulation abbreviation definition] General Data Protection Regulation }}
411 *[{{ eu-abbr[EU abbreviation] EU }}]: {{eu-abbr-dfn[European Union abbreviation definition] European Union }} 457 *[{{ eu-abbr[EU abbreviation] EU }}]: {{eu-abbr-dfn[European Union abbreviation definition] European Union }}
OLDNEW
« no previous file with comments | « no previous file | static/css/defaults.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld