diff --git a/INSTALL.txt b/INSTALL.txt
index 2ee9ad89b856ab74acdee6331ba3979d18282f4d..3714df040a7084f178f36d1068cd81d64c87c8ec 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,3 +1,3 @@
Please read core/INSTALL.txt for detailed installation instructions for your
-Drupal web site.
+Drupal website.
diff --git a/core/INSTALL.txt b/core/INSTALL.txt
index f6dd1b28f1456ce1c149d92025ef8b4fa4e0b643..487e71d8ccd014c463ee56761c8b6273220d6585 100644
--- a/core/INSTALL.txt
+++ b/core/INSTALL.txt
@@ -148,7 +148,7 @@ INSTALLATION
You will be guided through several screens to set up the database, add the
site maintenance account (the first user, also known as user/1), and provide
- basic web site settings.
+ basic website settings.
During installation, several files and directories need to be created, which
the install script will try to do automatically. However, on some hosting
diff --git a/core/assets/scaffold/files/drupal.INSTALL.txt b/core/assets/scaffold/files/drupal.INSTALL.txt
index 2ee9ad89b856ab74acdee6331ba3979d18282f4d..3714df040a7084f178f36d1068cd81d64c87c8ec 100644
--- a/core/assets/scaffold/files/drupal.INSTALL.txt
+++ b/core/assets/scaffold/files/drupal.INSTALL.txt
@@ -1,3 +1,3 @@
Please read core/INSTALL.txt for detailed installation instructions for your
-Drupal web site.
+Drupal website.
diff --git a/core/core.api.php b/core/core.api.php
index 4bf6310259398bdeb13570f29f36b038a40b8a7c..5ba0525483b785a864a2cd0782f6ee70eaf82983 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -76,8 +76,8 @@
* Integrating third-party applications using REST and related operations.
*
* @section sec_overview Overview of web services
- * Web services make it possible for applications and web sites to read and
- * update information from other web sites. There are several standard
+ * Web services make it possible for applications and websites to read and
+ * update information from other websites. There are several standard
* techniques for providing web services, including:
* - SOAP: http://wikipedia.org/wiki/SOAP
* - XML-RPC: http://wikipedia.org/wiki/XML-RPC
@@ -152,7 +152,7 @@
* @ref sec_rest above.
*
* @section sec_integrate Integrating data from other sites into Drupal
- * If you want to integrate data from other web sites into Drupal, here are
+ * If you want to integrate data from other websites into Drupal, here are
* some notes:
* - There are contributed modules available for integrating many third-party
* sites into Drupal. Search on https://www.drupal.org/project/project_module
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 9495b2103f3eee3a145a7b2ba4495d959d31ac95..f43e374f5d0a0ede92904d05f3e8f757a6d102c5 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -22,7 +22,7 @@ function filter_help($route_name, RouteMatchInterface $route_match) {
case 'help.page.filter':
$output = '';
$output .= '<h3>' . t('About') . '</h3>';
- $output .= '<p>' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be <em>processed and displayed</em> in the site. They are used to transform text, and also help to defend your web site against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the <a href=":editor_help">Text Editor module</a>. For more information, see the <a href=":filter_do">online documentation for the Filter module</a>.', [':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? Url::fromRoute('help.page', ['name' => 'editor'])->toString() : '#']) . '</p>';
+ $output .= '<p>' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be <em>processed and displayed</em> in the site. They are used to transform text, and also help to defend your website against potentially damaging input from malicious users. Visual text editors can be associated with text formats by using the <a href=":editor_help">Text Editor module</a>. For more information, see the <a href=":filter_do">online documentation for the Filter module</a>.', [':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? Url::fromRoute('help.page', ['name' => 'editor'])->toString() : '#']) . '</p>';
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Managing text formats') . '</dt>';
diff --git a/core/modules/help_topics/help_topics/aggregator.creating.html.twig b/core/modules/help_topics/help_topics/aggregator.creating.html.twig
index ae30c035ecdecefe1c44166e88870b610d086231..b9ba5b01f51a2a643b9f31637417cbf17e2eb152 100644
--- a/core/modules/help_topics/help_topics/aggregator.creating.html.twig
+++ b/core/modules/help_topics/help_topics/aggregator.creating.html.twig
@@ -6,7 +6,7 @@ related:
---
{% set aggregator_overview_url = render_var(url('aggregator.admin_overview')) %}
<h2>{% trans %}Goal{% endtrans %}</h2>
-<p>{% trans %}Create a new feed to display syndicated data from an outside source on your web site, or import an OPML file to create multiple feeds.{% endtrans %}</p>
+<p>{% trans %}Create a new feed to display syndicated data from an outside source on your website, or import an OPML file to create multiple feeds.{% endtrans %}</p>
<h2>{% trans %}Steps{% endtrans %}</h2>
<ol>
<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> > <em>Web services</em> > <a href="{{ aggregator_overview_url }}"><em>Aggregator</em></a>.{% endtrans %}</li>
diff --git a/core/modules/help_topics/help_topics/aggregator.overview.html.twig b/core/modules/help_topics/help_topics/aggregator.overview.html.twig
index 19953d7eb4b839f644110fd9b86b089e96314b0a..62ae608deeaa352861f704f8cd9625dde6a7cf4d 100644
--- a/core/modules/help_topics/help_topics/aggregator.overview.html.twig
+++ b/core/modules/help_topics/help_topics/aggregator.overview.html.twig
@@ -7,7 +7,7 @@ related:
{% set create_topic = render_var(url('help.help_topic', {'id': 'aggregator.creating'})) %}
{% set config_topic = render_var(url('help.help_topic', {'id': 'aggregator.managing'})) %}
<h2>{% trans %}What is a feed?{% endtrans %}</h2>
-<p>{% trans %}A feed is syndicated content data provided by a source outside of your web site, which is imported into your web site.{% endtrans %}</p>
+<p>{% trans %}A feed is syndicated content data provided by a source outside of your website, which is imported into your website.{% endtrans %}</p>
<h2>{% trans %}What is OPML?{% endtrans %}</h2>
<p>{% trans %}OPML (Outline Processor Markup Language) is a specification for making hierarchical lists, which is commonly used for lists of feeds.{% endtrans %}</p>
<h2>{% trans %}What are the options for updating feed items?{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/core.content_structure.html.twig b/core/modules/help_topics/help_topics/core.content_structure.html.twig
index b381650f73ba856c88bf55c32245375f420e7a26..9b9f52aa1366e56f963e38f59b8eab0164c88221 100644
--- a/core/modules/help_topics/help_topics/core.content_structure.html.twig
+++ b/core/modules/help_topics/help_topics/core.content_structure.html.twig
@@ -4,7 +4,7 @@ top_level: true
---
{% set help_url = render_var(url('help.main')) %}
<h2>{% trans %}What types of data does a site have?{% endtrans %}</h2>
-<p>{% trans %}There are four main types of data. <em>Content</em> is the information (text, images, etc.) meant to be displayed to web site visitors. <em>Configuration</em> is data that defines how the content is displayed; some configuration (such as field labels) may also be visible to site visitors. <em>State</em> is temporary data about the state of your site, such as the last time the system <em>cron</em> jobs ran. <em>Session</em> is a subset of State information, related to users' interactions with the site, such as site cookies and whether or not they are logged in.{% endtrans %}</p>
+<p>{% trans %}There are four main types of data. <em>Content</em> is the information (text, images, etc.) meant to be displayed to website visitors. <em>Configuration</em> is data that defines how the content is displayed; some configuration (such as field labels) may also be visible to site visitors. <em>State</em> is temporary data about the state of your site, such as the last time the system <em>cron</em> jobs ran. <em>Session</em> is a subset of State information, related to users' interactions with the site, such as site cookies and whether or not they are logged in.{% endtrans %}</p>
<h2>{% trans %}What is a content entity?{% endtrans %}</h2>
<p>{% trans %}A <em>content entity</em> (or more commonly, <em>entity</em>) is an item of content data, which can consist of text, HTML markup, images, attached files, and other data. Content entities are grouped into <em>entity types</em>, which have different purposes and are displayed in very different ways on the site. Most entity types are also divided into <em>entity sub-types</em>, which are divisions within an entity type to allow for smaller variations in how the entities are used and displayed. For example, the <em>Content item</em> entity type that stores page-level content is divided into <em>content type</em> sub-types; the <em>Custom block</em> entity type has <em>custom block types</em>; but the <em>User</em> entity type (for user profile information) does not have sub-types.{% endtrans %}</p>
<h2>{% trans %}What is a field?{% endtrans %}</h2>
diff --git a/core/modules/help_topics/help_topics/user.security_account_settings.html.twig b/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
index 944a13c4427bac98cdfb935198db739396079fec..1db91c4c3655d5a577980ca187742d53ce50dc72 100644
--- a/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
+++ b/core/modules/help_topics/help_topics/user.security_account_settings.html.twig
@@ -16,8 +16,8 @@ related:
<h2>{% trans %}What are variables in email message text?{% endtrans %}</h2>
<p>{% trans %}<em>Variables</em> are short text strings, enclosed in square brackets [], that you can insert into configured email message text. When an individual message is generated, data from your site is substituted for the variables. Some commonly-used variables are:{% endtrans %}</p>
<ul>
- <li>{% trans %}[site:name]: The name of your web site.{% endtrans %}</li>
- <li>{% trans %}[site:url]: The URL of your web site.{% endtrans %}</li>
+ <li>{% trans %}[site:name]: The name of your website.{% endtrans %}</li>
+ <li>{% trans %}[site:url]: The URL of your website.{% endtrans %}</li>
<li>{% trans %}[site:login-url]: The URL where users can log in to your site.{% endtrans %}</li>
<li>{% trans %}[user:display-name]: The user's displayed name.{% endtrans %}</li>
<li>{% trans %}[user:account-name]: The users's account name.{% endtrans %}</li>
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index 0343c6633ac16f1f063e5ba6088bfaf50a7d4e80..97811ec2c24365a23de12d587dc0e722d668e490 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -38,7 +38,7 @@ function image_help($route_name, RouteMatchInterface $route_match) {
$output .= '<dd>' . t('When you define an image style, you will need to choose a displayed name and a machine name. The displayed name is shown in administrative pages, and the machine name is used to generate the URL for accessing an image processed in that style. There are two common approaches to naming image styles: either based on the effects being applied (for example, <em>Square 85x85</em>), or based on where you plan to use it (for example, <em>Profile picture</em>).') . '</dd>';
$output .= '<dt>' . t('Configuring image fields') . '</dt>';
$output .= '<dd>' . t('A few of the settings for image fields are defined once when you create the field and cannot be changed later; these include the choice of public or private file storage and the number of images that can be stored in the field. The rest of the settings can be edited later; these settings include the field label, help text, allowed file extensions, image resolution restrictions, and the subdirectory in the public or private file storage where the images will be stored. The editable settings can also have different values for different entity sub-types; for instance, if your image field is used on both Page and Article content types, you can store the files in a different subdirectory for the two content types.') . '</dd>';
- $output .= '<dd>' . t('For accessibility and search engine optimization, all images that convey meaning on web sites should have alternate text. Drupal also allows entry of title text for images, but it can lead to confusion for screen reader users and its use is not recommended. Image fields can be configured so that alternate and title text fields are enabled or disabled; if enabled, the fields can be set to be required. The recommended setting is to enable and require alternate text and disable title text.') . '</dd>';
+ $output .= '<dd>' . t('For accessibility and search engine optimization, all images that convey meaning on websites should have alternate text. Drupal also allows entry of title text for images, but it can lead to confusion for screen reader users and its use is not recommended. Image fields can be configured so that alternate and title text fields are enabled or disabled; if enabled, the fields can be set to be required. The recommended setting is to enable and require alternate text and disable title text.') . '</dd>';
$output .= '<dd>' . t('When you create an image field, you will need to choose whether the uploaded images will be stored in the public or private file directory defined in your settings.php file and shown on the <a href=":file-system">File system page</a>. This choice cannot be changed later. You can also configure your field to store files in a subdirectory of the public or private directory; this setting can be changed later and can be different for each entity sub-type using the field. For more information on file storage, see the <a href=":system-help">System module help page</a>.', [':file-system' => Url::fromRoute('system.file_system_settings')->toString(), ':system-help' => Url::fromRoute('help.page', ['name' => 'system'])->toString()]) . '</dd>';
$output .= '<dd>' . t('The maximum file size that can be uploaded is limited by PHP settings of the server, but you can restrict it further by configuring a <em>Maximum upload size</em> in the field settings (this setting can be changed later). The maximum file size, either from PHP server settings or field configuration, is automatically displayed to users in the help text of the image field.') . '</dd>';
$output .= '<dd>' . t('You can also configure a minimum and/or maximum resolution for uploaded images. Images that are too small will be rejected. Images that are to large will be resized. During the resizing the <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image will be lost.') . '</dd>';
diff --git a/core/modules/rest/rest.module b/core/modules/rest/rest.module
index 65ca866d95cba733c6e9651de3b7a8c5d69a4a75..ae40970698ecef9c9f06db3af93ce65a44c3289f 100644
--- a/core/modules/rest/rest.module
+++ b/core/modules/rest/rest.module
@@ -20,7 +20,7 @@ function rest_help($route_name, RouteMatchInterface $route_match) {
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
$output .= '<dt>' . t('Installing supporting modules') . '</dt>';
- $output .= '<dd>' . t('In order to use REST on a web site, you need to install modules that provide serialization and authentication services. You can use the Core module <a href=":hal">HAL</a> for serialization and <a href=":basic_auth">HTTP Basic Authentication</a> for authentication, or install a contributed or custom module.', [':hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? Url::fromRoute('help.page', ['name' => 'hal'])->toString() : 'https://www.drupal.org/docs/8/core/modules/hal/overview', ':basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? Url::fromRoute('help.page', ['name' => 'basic_auth'])->toString() : 'https://www.drupal.org/docs/8/core/modules/basic_auth/overview']) . '</dd>';
+ $output .= '<dd>' . t('In order to use REST on a website, you need to install modules that provide serialization and authentication services. You can use the Core module <a href=":hal">HAL</a> for serialization and <a href=":basic_auth">HTTP Basic Authentication</a> for authentication, or install a contributed or custom module.', [':hal' => (\Drupal::moduleHandler()->moduleExists('hal')) ? Url::fromRoute('help.page', ['name' => 'hal'])->toString() : 'https://www.drupal.org/docs/8/core/modules/hal/overview', ':basic_auth' => (\Drupal::moduleHandler()->moduleExists('basic_auth')) ? Url::fromRoute('help.page', ['name' => 'basic_auth'])->toString() : 'https://www.drupal.org/docs/8/core/modules/basic_auth/overview']) . '</dd>';
$output .= '<dt>' . t('Enabling REST support for an entity type') . '</dt>';
$output .= '<dd>' . t('REST support for content types (provided by the <a href=":node">Node</a> module) is enabled by default. To enable support for other content entity types, you can use a <a href=":config" target="blank">process based on configuration editing</a> or the contributed <a href=":restui">REST UI module</a>.', [':node' => (\Drupal::moduleHandler()->moduleExists('node')) ? Url::fromRoute('help.page', ['name' => 'node'])->toString() : '#', ':config' => 'https://www.drupal.org/documentation/modules/rest', ':restui' => 'https://www.drupal.org/project/restui']) . '</dd>';
$output .= '<dd>' . t('You will also need to grant anonymous users permission to perform each of the REST operations you want to be available, and set up authentication properly to authorize web requests.') . '</dd>';