<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[7277] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main: Main: Fix typos and quotes</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/7277">7277</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7277","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-06-06 18:14:28 +0000 (Wed, 06 Jun 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Main: Fix typos and quotes
Props Presskopp, garrett-eclipse.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3635">#3635</a>, <a href="http://meta.trac.wordpress.org/ticket/3638">#3638</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacycookiesphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacyphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacycookiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php 2018-06-06 17:39:51 UTC (rev 7276)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-cookies.php 2018-06-06 18:14:28 UTC (rev 7277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'Our Privacy Policy explains our principles when it comes to the collection, processing, and storage of your information. This policy specifically explains how we, our partners, and users of our services deploy cookies, as well as the options you have to control them.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'What are cookies?', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Cookies are small pieces of data, stored in text files, that are stored on your computer or other device when websites are loaded in a browser. They are widely used to ‘remember’ you and your preferences, either for a single visit (through a ‘session cookie’) or for multiple repeat visits (using a ‘persistent cookie’). They ensure a consistent and efficient experience for visitors, and perform essential functions such as allowing users to register and remain logged in. Cookies may be set by the site that you are visiting (known as ‘first party cookies), or by third parties, such as those who serve content or provide advertising or analytics services on the website (‘third party cookies’).', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Cookies are small pieces of data, stored in text files, that are stored on your computer or other device when websites are loaded in a browser. They are widely used to ‘remember’ you and your preferences, either for a single visit (through a ‘session cookie’) or for multiple repeat visits (using a ‘persistent cookie’). They ensure a consistent and efficient experience for visitors, and perform essential functions such as allowing users to register and remain logged in. Cookies may be set by the site that you are visiting (known as ‘first party cookies’), or by third parties, such as those who serve content or provide advertising or analytics services on the website (‘third party cookies’).', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Cookies set by WordPress.org', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'We use cookies for a number of different purposes. Some cookies are necessary for technical reasons; some enable a personalized experience for both visitors and registered users; and some allow the display of advertising from selected third party networks. Some of these cookies may be set when a page is loaded, or when a visitor takes a particular action (clicking the ‘like’ or ‘follow’ button on a post, for example).', 'wporg' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php esc_html_e( 'Tracking', 'wporg' ); ?></strong>: <?php esc_html_e( 'These are set by trusted third party networks (e.g. Google Analytics) to track details such as the number of unique visitors, and pageviews to help improve the user experience.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php esc_html_e( 'Third Party/Embedded Content', 'wporg' ); ?></strong>: <?php esc_html_e( 'WordPress.org makes use of different third party applications and services to enhance the experience of website visitors. These include social media platforms such as Facebook and Twitter (through the use of sharing buttons), or embedded content from Youtube and Vimeo. As a result, cookies may be set by these third parties, and used by them to track your online activity. We have no direct control over the information that is collected by these cookies.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php esc_html_e( 'WordPress.org', 'wporg' ); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php esc_html_e( 'wordpress.org', 'wporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>devicePixelRatio</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'Browser default (1 year)', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to make the site responsive to the visitor\'s screen size.', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to make the site responsive to the visitor’s screen size.', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>wp-settings-{user_id}</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '1 year', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to persist a user\'s wp-admin configuration.', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to persist a user’s wp-admin configuration.', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'Yes', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php esc_html_e( 'Make.wordpress.org', 'wporg' ); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php esc_html_e( 'make.wordpress.org', 'wporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>welcome-{blog_id}</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'Permanent', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to record if you\'ve chosen to hidden the “Welcome” message at the top of the corresponding blog.', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to record if you’ve chosen to hidden the “Welcome” message at the top of the corresponding blog.', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,7 +179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3><?php esc_html_e( 'Codex.wordpress.org', 'wporg' ); ?></h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3><?php esc_html_e( 'codex.wordpress.org', 'wporg' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><span class="cx" style="display: block; padding: 0 10px"> <thead>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>codexToken</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '6 months', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to check whether the current visitor is a logged in WordPress.org user. Only set if you select "Keep me logged in\xE2"when logging in.', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to check whether the current visitor is a logged in WordPress.org user. Only set if you select “Keep me logged in” when logging in.', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'Yes', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>camptix_client_stats</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '1 year', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to track unique visitors to tickets page on a wordcamp site', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to track unique visitors to tickets page on a WordCamp site', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,19 +237,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>comment_author_{hash}</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '347 days', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to tracked comment author name, if "Save my name, email, and website in this browser for the next time I comment." is checked', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to tracked comment author name, if “Save my name, email, and website in this browser for the next time I comment.” is checked', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>comment_author_email_{hash}</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '347 days', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to tracked comment author email, if "Save my name, email, and website in this browser for the next time I comment." is checked', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to tracked comment author email, if “Save my name, email, and website in this browser for the next time I comment.” is checked', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>comment_author_url_{hash}</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '347 days', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to track comment author url, if "Save my name, email, and website in this browser for the next time I comment." checkbox is checked', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to track comment author url, if “Save my name, email, and website in this browser for the next time I comment.” checkbox is checked', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>wp-settings-{user}</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '1 year', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used to preserve user\'s wp admin settings', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used to preserve user’s wp-admin settings', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'Yes', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>tix_view_token</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '2 days', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Used for session managing private camptix content', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Used for session managing private CampTix content', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th>stnojs</th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( '2 days', 'wporg' ); ?></td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td><?php esc_html_e( 'Remember if user do not want JS', 'wporg' ); ?></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Remember if user do not want JavaScript executed', 'wporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php esc_html_e( 'No', 'wporg' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,12 +316,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Controlling Cookies', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Visitors may wish to restrict the use of cookies, or completely prevent them from being set. Most browsers provide for ways to control cookie behaviour such as the length of time they are stored — either through built-in functionality or by utilizing third party plugins.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Visitors may wish to restrict the use of cookies, or completely prevent them from being set. Most browsers provide for ways to control cookie behavior such as the length of time they are stored — either through built-in functionality or by utilizing third party plugins.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo wp_kses_post( __( 'To find out more on how to manage and delete cookies, visit <a href="http://aboutcookies.org/">aboutcookies.org</a>. For more details on advertising cookies, and how to manage them, visit <a href="http://www.youronlinechoices.eu/">youronlinechoices.eu</a> (EU based), or <a href="http://www.aboutads.info/choices/">aboutads.info</a> (US based).', 'wporg' ) ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Some specific opt out programs are available here:', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Some specific opt-out programs are available here:', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p>Quantcast - <a href="https://www.quantcast.com/opt-out/">https://www.quantcast.com/opt-out/</a><br/>
</span><span class="cx" style="display: block; padding: 0 10px"> Google Analytics - <a href="https://tools.google.com/dlpage/gaoptout">https://tools.google.com/dlpage/gaoptout</a></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'It\'s important to note that restricting or disabling the use of cookies can limit the functionality of sites, or prevent them from working correctly at all.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'It’s important to note that restricting or disabling the use of cookies can limit the functionality of sites, or prevent them from working correctly at all.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'WordPress.org', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png"></a></p>
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php 2018-06-06 17:39:51 UTC (rev 7276)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php 2018-06-06 18:14:28 UTC (rev 7277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $error_message ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <strong><?php esc_html_e( 'An error occured with your request:', 'wporg' ); ?></strong><br>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong><?php esc_html_e( 'An error occurred with your request:', 'wporg' ); ?></strong><br>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo $error_message; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $success ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_user_logged_in() ) wp_nonce_field( $nonce_action ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( "Please Note: Before we can begin processing your request, we'll require that you verify ownership of the email address. If the email address is associated with an account, we'll also require you to log in to that account first.", 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Please Note: Before we can begin processing your request, we’ll require that you verify ownership of the email address. If the email address is associated with an account, we’ll also require you to log in to that account first.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php 2018-06-06 17:39:51 UTC (rev 7276)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy.php 2018-06-06 18:14:28 UTC (rev 7277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-content row">
</span><span class="cx" style="display: block; padding: 0 10px"> <section class="col-8">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'WordPress.org websites (collectively “WordPress.org” in this document) refer to sites hosted on the WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and subdomains thereof. This privacy policy describes how WordPress.org uses and protects any information that you give us. We are committed to ensuring that your privacy is protected. If you provide us with personal information through WordPress.org, you can be assured that it will only be used in accordance with this privacy statement.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'WordPress.org websites (collectively “WordPress.org” in this document) refer to sites hosted on the WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and subdomains thereof. This privacy policy describes how WordPress.org uses and protects any information that you give us. We are committed to ensuring that your privacy is protected. If you provide us with personal information through WordPress.org, you can be assured that it will only be used in accordance with this privacy statement.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Website Visitors', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'Like most website operators, WordPress.org 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 the date and time of each visitor request. WordPress.org’s purpose in collecting non-personally identifying information is to better understand how WordPress.org’s visitors use its website. From time to time, WordPress.org may release non-personally-identifying information in the aggregate, e.g., by publishing a report on trends in the usage of its website.', 'wporg' ); ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'We will retain your personal information on our systems only for as long as we need to, for the success of the WordPress open source project and the programs that support WordPress.org. We keep contact information (such as mailing list information) until a user unsubscribes or requests that we delete that information from our live systems. If you choose to unsubscribe from a mailing list, we may keep certain limited information about you so that we may honor your request.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'WordPress.org will not delete personal data from logs or records necessary to the operation, development, or archives of the WordPress open source project.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'WordPress.org shall maintain WordCamp attendee data for 3 years to better track and foster community growth, and then automatically delete non-essential data collected via registration. Attendee names and email addresses will be retained indefinitely, to preserve our ability to respond to code of conduct reports.', 'wporg' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'On WordCamp.org sites, banking/financial data collected as part of a reimbursement request is deleted from WordCamp.org 7 days after the request is marked paid. The reason for the 7-day retention period is to prevent organizers having to re-enter their banking details if a wire fails or if a payment was marked “Paid” in error. Invoices and receipts related to WordCamp expenses are retained for 7 years after the close of the calendar year\'s audit, by instruction of our financial consultants (auditors & bookkeepers).', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'On WordCamp.org sites, banking/financial data collected as part of a reimbursement request is deleted from WordCamp.org 7 days after the request is marked paid. The reason for the 7-day retention period is to prevent organizers having to re-enter their banking details if a wire fails or if a payment was marked “Paid” in error. Invoices and receipts related to WordCamp expenses are retained for 7 years after the close of the calendar year’s audit, by instruction of our financial consultants (auditors & bookkeepers).', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'When deletion is requested or otherwise required, we will anonymise the data of data subjects and/or remove their information from publicly accessible sites if the deletion of data would break essential systems or damage the logs or records necessary to the operation, development, or archival records of the WordPress open source project.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Rights in relation to your information', 'wporg' ); ?></h3>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,13 +96,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php esc_html_e( 'If you would like to exercise these rights or understand if these rights apply to you, please follow the instructions at the end of this Privacy statement.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Third Party Links', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Our website may contain links to other websites provided by third parties not under our control. When following a link and providing information to a 3rd-party website, please be aware that we are not responsible for the data provided to that third party. This privacy policy only applies to the websites listed at the beginning of this document, so when you visit other websites, even when you click on a link posted on WordPress.org, you should read their own privacy policies.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Our website may contain links to other websites provided by third parties not under our control. When following a link and providing information to a 3rd-party website, please be aware that we are not responsible for the data provided to that third party. This privacy policy only applies to the websites listed at the beginning of this document, so when you visit other websites, even when you click on a link posted on WordPress.org, you should read their own privacy policies.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Aggregated Statistics', 'wporg' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo wp_kses_post( __( 'WordPress.org may collect statistics about the behavior of visitors to its websites. For instance, WordPress.org may reveal how many times a particular version of WordPress was downloaded or report on which plugins are the most popular, based on data gathered by <code>api.wordpress.org</code>, a web service used by WordPress installations to check for new versions of WordPress and plugins. However, WordPress.org does not disclose personally-identifying information other than as described in this policy.', 'wporg' ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Cookies', 'wporg' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( 'Additionally, information about how you use our website is collected automatically using “cookies”. Cookies are text files placed on your computer to collect standard internet log information and visitor behaviour information. This information is used to track visitor use of the website and to compile statistical reports on website activity.', 'wporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Additionally, information about how you use our website is collected automatically using “cookies”. Cookies are text files placed on your computer to collect standard internet log information and visitor behaviour information. This information is used to track visitor use of the website and to compile statistical reports on website activity.', 'wporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo wp_kses_post( __( 'Please see <a href="https://wordpress.org/about/privacy/cookies/">our cookie policy</a> for more information about what cookies are collected on WordPress.org.', 'wporg' ) ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php esc_html_e( 'Privacy Policy Changes', 'wporg' ); ?></h3>
</span></span></pre>
</div>
</div>
</body>
</html>