reverted: --- b/INSTALL.txt +++ a/INSTALL.txt @@ -1,3 +1,3 @@ Please read core/INSTALL.txt for detailed installation instructions for your +Drupal web site. -Drupal website. only in patch2: unchanged: --- 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 %}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 %}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 %}OPML (Outline Processor Markup Language) is a specification for making hierarchical lists, which is commonly used for lists of feeds.{% 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 %}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 %}