<!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>[57131] trunk: Text Changes: Update mentions of {U+201C}web site{U+201D} to {U+201C}website{U+201D} for consistency.</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="https://core.trac.wordpress.org/changeset/57131">57131</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57131","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-11-22 17:42:11 +0000 (Wed, 22 Nov 2023)</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'>Text Changes: Update mentions of {U+201C}web site{U+201D} to {U+201C}website{U+201D} for consistency.
While {U+201C}web site{U+201D} was the original spelling, this variant has become rarely used, and {U+201C}website{U+201D} is now the standard spelling, already used throughout most of the WordPress core.
Reference: [https://en.wikipedia.org/wiki/Website Wikipedia: Website].
Props LiamMcArthur, cafenoirdesign, sabbirshouvo, sabernhardt, ironprogrammer, mukesh27.
Fixes <a href="https://core.trac.wordpress.org/ticket/59853">#59853</a>, <a href="https://core.trac.wordpress.org/ticket/54276">#54276</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminprivacypolicyguidephp">trunk/src/wp-admin/privacy-policy-guide.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpconfigsamplephp">trunk/wp-config-sample.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2023-11-21 00:23:01 UTC (rev 57130)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2023-11-22 17:42:11 UTC (rev 57131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -529,7 +529,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your website uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy text. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the website. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy text. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +641,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<h2>' . __( 'What third parties we receive data from' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your website receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><span class="cx" style="display: block; padding: 0 10px"> $strings[] = '<h2>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h2>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<p class="privacy-policy-tutorial">' . __( 'If your website provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2023-11-21 00:23:01 UTC (rev 57130)
+++ trunk/src/wp-admin/includes/update-core.php 2023-11-22 17:42:11 UTC (rev 57131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,7 +1008,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Upgrades the core of WordPress.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This will create a .maintenance file at the base of the WordPress directory
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * to ensure that people can not access the web site, when the files are being
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * to ensure that people can not access the website, when the files are being
</ins><span class="cx" style="display: block; padding: 0 10px"> * copied to their locations.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The files in the `$_old_files` list will be removed and the new files
</span></span></pre></div>
<a id="trunksrcwpadminprivacypolicyguidephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/privacy-policy-guide.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/privacy-policy-guide.php 2023-11-21 00:23:01 UTC (rev 57130)
+++ trunk/src/wp-admin/privacy-policy-guide.php 2023-11-22 17:42:11 UTC (rev 57131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,8 +73,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="privacy-settings-body hide-if-no-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Privacy Policy Guide' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <h3 class="section-title"><?php _e( 'Introduction' ); ?></h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php _e( 'This text template will help you to create your web site’s privacy policy.' ); ?></p>
- <p><?php _e( 'The template contains a suggestion of sections you most likely will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( 'This text template will help you to create your website’s privacy policy.' ); ?></p>
+ <p><?php _e( 'The template contains a suggestion of sections you most likely will need. Under each section heading, you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="privacy-settings-accordion">
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2023-11-21 00:23:01 UTC (rev 57130)
+++ trunk/src/wp-includes/functions.php 2023-11-22 17:42:11 UTC (rev 57131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6109,7 +6109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * easily update the xml configuration file, hence we just bail out and tell user that
</span><span class="cx" style="display: block; padding: 0 10px"> * pretty permalinks cannot be used.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the website. When
</ins><span class="cx" style="display: block; padding: 0 10px"> * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
</span><span class="cx" style="display: block; padding: 0 10px"> * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
</span><span class="cx" style="display: block; padding: 0 10px"> * via ISAPI then pretty permalinks will not work.
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2023-11-21 00:23:01 UTC (rev 57130)
+++ trunk/src/wp-includes/general-template.php 2023-11-22 17:42:11 UTC (rev 57131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3443,7 +3443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Prints resource hints to browsers for pre-fetching, pre-rendering
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * and pre-connecting to web sites.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * and pre-connecting to websites.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Gives hints to browsers to prefetch specific pages or render them
</span><span class="cx" style="display: block; padding: 0 10px"> * in the background, to perform DNS lookups or to begin the connection
</span></span></pre></div>
<a id="trunkwpconfigsamplephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/wp-config-sample.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/wp-config-sample.php 2023-11-21 00:23:01 UTC (rev 57130)
+++ trunk/wp-config-sample.php 2023-11-22 17:42:11 UTC (rev 57131)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The base configuration for WordPress
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The wp-config.php creation script uses this file during the installation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * You don't have to use the web site, you can copy this file to "wp-config.php"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * You don't have to use the website, you can copy this file to "wp-config.php"
</ins><span class="cx" style="display: block; padding: 0 10px"> * and fill in the values.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This file contains the following configurations:
</span></span></pre>
</div>
</div>
</body>
</html>