diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index 9f16099..1e2c272 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -12,7 +12,7 @@ function forum_install() {
// Set the weight of the forum.module to 1 so it is loaded after the taxonomy.module.
module_set_weight('forum', 1);
// Forum topics are published by default, but do not have any other default
- // options set (for example, they are not promoted to the front page).
+ // options set (for example, they are not promoted by default).
// @todo Convert to default module configuration, once Node module's content
// types are converted.
variable_set('node_options_forum', array('status'));
diff --git a/core/modules/node/config/action.action.node_promote_action.yml b/core/modules/node/config/action.action.node_promote_action.yml
index 3d56d92..56d7285 100644
--- a/core/modules/node/config/action.action.node_promote_action.yml
+++ b/core/modules/node/config/action.action.node_promote_action.yml
@@ -1,5 +1,5 @@
id: node_promote_action
-label: 'Promote content to front page'
+label: 'Promote content'
status: '1'
langcode: en
type: node
diff --git a/core/modules/node/config/action.action.node_unpromote_action.yml b/core/modules/node/config/action.action.node_unpromote_action.yml
index 86d11a7..13247ac 100644
--- a/core/modules/node/config/action.action.node_unpromote_action.yml
+++ b/core/modules/node/config/action.action.node_unpromote_action.yml
@@ -1,5 +1,5 @@
id: node_unpromote_action
-label: 'Remove content from front page'
+label: 'Demote content'
status: '1'
langcode: en
type: node
diff --git a/core/modules/node/content_types.inc b/core/modules/node/content_types.inc
index 156576b..9a1ffd7 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -198,7 +198,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
'#default_value' => variable_get('node_options_' . $type->type, array('status', 'promote')),
'#options' => array(
'status' => t('Published'),
- 'promote' => t('Promoted to front page'),
+ 'promote' => t('Promoted'),
'sticky' => t('Sticky at top of lists'),
'revision' => t('Create new revision'),
),
diff --git a/core/modules/node/lib/Drupal/node/NodeFormController.php b/core/modules/node/lib/Drupal/node/NodeFormController.php
index e64db93..21a85c6 100644
--- a/core/modules/node/lib/Drupal/node/NodeFormController.php
+++ b/core/modules/node/lib/Drupal/node/NodeFormController.php
@@ -214,7 +214,7 @@ public function form(array $form, array &$form_state) {
$form['options']['promote'] = array(
'#type' => 'checkbox',
- '#title' => t('Promoted to front page'),
+ '#title' => t('Promoted'),
'#default_value' => $node->promote,
);
diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/Drupal/node/NodeStorageController.php
index 524036b..2a45985 100644
--- a/core/modules/node/lib/Drupal/node/NodeStorageController.php
+++ b/core/modules/node/lib/Drupal/node/NodeStorageController.php
@@ -184,7 +184,7 @@ public function baseFieldDefinitions() {
);
$properties['promote'] = array(
'label' => t('Promote'),
- 'description' => t('A boolean indicating whether the node should be displayed on the front page.'),
+ 'description' => t('A boolean indicating whether the node should be flagged for display in listings of promoted content.'),
'type' => 'boolean_field',
);
$properties['sticky'] = array(
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
index 7676a76..27aac1d 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/DemoteNode.php
@@ -16,7 +16,7 @@
*
* @Action(
* id = "node_unpromote_action",
- * label = @Translation("Demote selected content from front page"),
+ * label = @Translation("Demote selected content"),
* type = "node"
* )
*/
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php b/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
index 56f8658..e17dd22 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Action/PromoteNode.php
@@ -16,7 +16,7 @@
*
* @Action(
* id = "node_promote_action",
- * label = @Translation("Promote selected content to front page"),
+ * label = @Translation("Promote selected content"),
* type = "node"
* )
*/
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php b/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php
index 0791287..e2f5f71 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Core/Entity/Node.php
@@ -146,8 +146,9 @@ class Node extends EntityNG implements NodeInterface {
/**
* The node promotion status.
*
- * Promoted nodes should be displayed on the front page of the site. The value
- * is either NODE_PROMOTED or NODE_NOT_PROMOTED.
+ * Promoted nodes are displayed in certain listings of promoted content, e.g.
+ * on the default front page. The status is either NODE_PROMOTED or
+ * NODE_NOT_PROMOTED.
*
* @var \Drupal\Core\Entity\Field\FieldInterface
*/
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index a0a71ff..7a947e8 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -158,7 +158,7 @@ function node_schema() {
'default' => 0,
),
'promote' => array(
- 'description' => 'Boolean indicating whether the node translation should be displayed on the front page.',
+ 'description' => 'Boolean indicating whether the node translation should be displayed in promoted listings.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -282,7 +282,7 @@ function node_schema() {
'default' => 0,
),
'promote' => array(
- 'description' => 'Boolean indicating whether the node (at the time of this revision) should be displayed on the front page.',
+ 'description' => 'Boolean indicating whether the node (at the time of this revision) should be marked as promoted.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -921,7 +921,7 @@ function _node_update_8016_schema() {
'default' => 0,
),
'promote' => array(
- 'description' => 'Boolean indicating whether the node translation should be displayed on the front page.',
+ 'description' => 'Boolean indicating whether the node translation should be marked as promoted.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -1043,7 +1043,7 @@ function _node_update_8016_schema() {
'default' => 0,
),
'promote' => array(
- 'description' => 'Boolean indicating whether the node (at the time of this revision) should be displayed on the front page.',
+ 'description' => 'Boolean indicating whether the node (at the time of this revision) should be marked as promoted.',
'type' => 'int',
'not null' => TRUE,
'default' => 0,
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index fbdf07d..229ead1 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -33,12 +33,12 @@
const NODE_PUBLISHED = 1;
/**
- * Denotes that the node is not promoted to the front page.
+ * Denotes that the node is not promoted.
*/
const NODE_NOT_PROMOTED = 0;
/**
- * Denotes that the node is promoted to the front page.
+ * Denotes that the node is promoted.
*/
const NODE_PROMOTED = 1;
@@ -109,7 +109,7 @@ function node_help($path, $arg) {
$output .= '' . t('Uses') . '
';
$output .= '';
$output .= '- ' . t('Creating content') . '
';
- $output .= '- ' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the Content type. It also manages the publishing options, which define whether or not the content is published, promoted to the front page of the site, and/or sticky at the top of content lists. Default settings can be configured for each type of content on your site.', array('@content-type' => url('admin/structure/types'))) . '
';
+ $output .= '- ' . t('When new content is created, the Node module records basic information about the content, including the author, date of creation, and the Content type. It also manages the publishing options, which define whether or not the content is published, promoted, and/or sticky at the top of content lists. Default settings can be configured for each type of content on your site.', array('@content-type' => url('admin/structure/types'))) . '
';
$output .= '- ' . t('Creating custom content types') . '
';
$output .= '- ' . t('The Node module gives users with the Administer content types permission the ability to create new content types in addition to the default ones already configured. Creating custom content types allows you the flexibility to add fields and configure default settings that suit the differing needs of various site content.', array('@content-new' => url('admin/structure/types/add'), '@field' => url('admin/help/field'))) . '
';
$output .= '- ' . t('Administering content') . '
';
@@ -1337,7 +1337,7 @@ function node_ranking() {
'score' => 'n.sticky',
),
'promote' => array(
- 'title' => t('Content is promoted to the front page'),
+ 'title' => t('Content is promoted'),
// The promote flag is either 0 or 1, which is automatically normalized.
'score' => 'n.promote',
),
@@ -1580,7 +1580,7 @@ function node_menu() {
$items['admin/structure/types'] = array(
'title' => 'Content types',
- 'description' => 'Manage content types, including default status, front page promotion, comment settings, etc.',
+ 'description' => 'Manage content types, including default status, promotion, comment settings, etc.',
'page callback' => 'node_overview_types',
'access arguments' => array('administer content types'),
'file' => 'content_types.inc',
@@ -2347,11 +2347,11 @@ function node_search_validate($form, &$form_state) {
function node_form_system_site_information_settings_form_alter(&$form, &$form_state, $form_id) {
$form['front_page']['default_nodes_main'] = array(
'#type' => 'select',
- '#title' => t('Number of posts on front page'),
+ '#title' => t('Number of promoted posts'),
'#default_value' => config('node.settings')->get('items_per_page'),
'#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)),
'#access' => (config('system.site')->get('page.front') == 'node'),
- '#description' => t('The maximum number of posts displayed on overview pages such as the front page.'),
+ '#description' => t('The maximum number of posts displayed on overview pages.'),
);
$form['#submit'][] = 'node_form_system_site_information_settings_form_submit';
}
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index a731f40..5c7329c 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -168,7 +168,7 @@ function theme_node_preview($variables) {
// Do we need to preview trimmed version of post as well as full version?
if ($trimmed != $full) {
- drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted to the main page or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.'));
+ drupal_set_message(t('The trimmed version of your post shows what your post looks like when promoted or when exported for syndication. You can insert the delimiter "<!--break-->" (without the quotes) to fine-tune where your post gets split.'));
$output .= '' . t('Preview trimmed version') . '
';
$output .= $trimmed;
$output .= '' . t('Preview full version') . '
';
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index b4b34eb..5989859 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -160,8 +160,8 @@ function node_views_data() {
);
$data['node_field_data']['promote'] = array(
- 'title' => t('Promoted to front page status'),
- 'help' => t('Whether or not the content is promoted to the front page.'),
+ 'title' => t('Promoted status'),
+ 'help' => t('Whether or not the content is promoted.'),
'field' => array(
'id' => 'boolean',
'output formats' => array(
@@ -170,7 +170,7 @@ function node_views_data() {
),
'filter' => array(
'id' => 'boolean',
- 'label' => t('Promoted to front page status'),
+ 'label' => t('Promoted status'),
'type' => 'yes-no',
),
'sort' => array(
diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index ad12811..130646a 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -10,7 +10,8 @@
* - created: Formatted creation date. Preprocess functions can reformat it by
* calling format_date() with the desired parameters on
* $variables['node']->created.
- * - promote: Whether the node is promoted to the front page.
+ * - promote: Whether the node will be displayed in views featuring promoted
+ * content, such as the default homepage.
* - sticky: Whether the node is 'sticky'. Sticky nodes are ordered above
* other non-sticky nodes in teaser listings
* - status: Whether the node is published.
@@ -46,7 +47,8 @@
* would result in: "view-mode-teaser", and full: "view-mode-full".
* - preview: Whether a node is in preview mode.
* The following are controlled through the node publishing options.
- * - promoted: Appears on nodes promoted to the front page.
+ * - promoted: Appears on nodes flagged to be included in promoted content
+ * views.
* - sticky: Appears on nodes ordered above other non-sticky nodes in teaser
* listings.
* - unpublished: Appears on unpublished nodes visible only to site admins.
diff --git a/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
index d8af3d5..ae3e425 100644
--- a/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -10,7 +10,8 @@
* - created: Formatted creation date. Preprocess functions can reformat it by
* calling format_date() with the desired parameters on
* $variables['node']->created.
- * - promote: Whether the node is promoted to the front page.
+ * - promote: Whether the node is flagged to be included in promoted content
+ * views.
* - sticky: Whether the node is 'sticky'. Sticky nodes are ordered above
* other non-sticky nodes in teaser listings
* - status: Whether the node is published.
@@ -46,7 +47,8 @@
* would result in: "view-mode-teaser", and full: "view-mode-full".
* - preview: Whether a node is in preview mode.
* The following are controlled through the node publishing options.
- * - promoted: Appears on nodes promoted to the front page.
+ * - promoted: Appears on nodes flagged to be included in promoted content
+ * views.
* - sticky: Appears on nodes ordered above other non-sticky nodes in teaser
* listings.
* - unpublished: Appears on unpublished nodes visible only to site admins.