diff --git a/INSTALL.txt b/INSTALL.txt index 2ee9ad89b85..3714df040a7 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 f6dd1b28f14..487e71d8ccd 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 2ee9ad89b85..3714df040a7 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 4bf63102593..5ba0525483b 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 9495b2103f3..f43e374f5d0 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 .= '

' . t('About') . '

'; - $output .= '

' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be processed and displayed 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 Text Editor module. For more information, see the online documentation for the Filter module.', [':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? Url::fromRoute('help.page', ['name' => 'editor'])->toString() : '#']) . '

'; + $output .= '

' . t('The Filter module allows administrators to configure text formats. Text formats change how HTML tags and other text will be processed and displayed 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 Text Editor module. For more information, see the online documentation for the Filter module.', [':filter_do' => 'https://www.drupal.org/documentation/modules/filter/', ':editor_help' => (\Drupal::moduleHandler()->moduleExists('editor')) ? Url::fromRoute('help.page', ['name' => 'editor'])->toString() : '#']) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; $output .= '
' . t('Managing text formats') . '
'; 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 ae30c035ecd..b9ba5b01f51 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')) %}

{% trans %}Goal{% endtrans %}

-

{% 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 %}

+

{% 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 %}

{% trans %}Steps{% endtrans %}

  1. {% trans %}In the Manage administrative menu, navigate to Configuration > Web services > Aggregator.{% endtrans %}
    2. 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 19953d7eb4b..62ae608deea 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'})) %}

    {% trans %}What is a feed?{% endtrans %}

    -

    {% trans %}A feed is syndicated content data provided by a source outside of your web site, which is imported into your web site.{% endtrans %}

    +

    {% trans %}A feed is syndicated content data provided by a source outside of your website, which is imported into your website.{% endtrans %}

    {% trans %}What is OPML?{% endtrans %}

    {% trans %}OPML (Outline Processor Markup Language) is a specification for making hierarchical lists, which is commonly used for lists of feeds.{% endtrans %}

    {% trans %}What are the options for updating feed items?{% endtrans %}

    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 b381650f73b..9b9f52aa136 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')) %}

    {% trans %}What types of data does a site have?{% endtrans %}

    -

    {% trans %}There are four main types of data. Content is the information (text, images, etc.) meant to be displayed to web site visitors. Configuration is data that defines how the content is displayed; some configuration (such as field labels) may also be visible to site visitors. State is temporary data about the state of your site, such as the last time the system cron jobs ran. Session 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 %}

    +

    {% trans %}There are four main types of data. Content is the information (text, images, etc.) meant to be displayed to website visitors. Configuration is data that defines how the content is displayed; some configuration (such as field labels) may also be visible to site visitors. State is temporary data about the state of your site, such as the last time the system cron jobs ran. Session 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 %}

    {% trans %}What is a content entity?{% endtrans %}

    {% trans %}A content entity (or more commonly, entity) is an item of content data, which can consist of text, HTML markup, images, attached files, and other data. Content entities are grouped into entity types, which have different purposes and are displayed in very different ways on the site. Most entity types are also divided into entity sub-types, which are divisions within an entity type to allow for smaller variations in how the entities are used and displayed. For example, the Content item entity type that stores page-level content is divided into content type sub-types; the Custom block entity type has custom block types; but the User entity type (for user profile information) does not have sub-types.{% endtrans %}

    {% trans %}What is a field?{% endtrans %}

    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 944a13c4427..1db91c4c365 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:

    {% trans %}What are variables in email message text?{% endtrans %}

    {% trans %}Variables 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 %}