diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 5c2f296..297ac84 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -1759,7 +1759,7 @@ function menu_list_system_menus() {
}
/**
- * Returns an array of links to be rendered as the Main navigation menu.
+ * Returns an array of links to be rendered as the Main menu.
*/
function menu_main_menu() {
$config = config('menu.settings');
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index ce20258..921a619 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -21,7 +21,7 @@ function contact_help($path, $arg) {
$output .= '
' . t('Site-wide contact forms') . '';
$output .= '' . t('The Contact page provides a simple form for users with the Use the site-wide contact form permission to send comments, feedback, or other requests. You can create categories for directing the contact form messages to a set of defined recipients. Common categories for a business site, for example, might include "Website feedback" (messages are forwarded to website administrators) and "Product information" (messages are forwarded to members of the sales department). E-mail addresses defined within a category are not displayed publicly.', array('@contact' => url('contact'))) . '';
$output .= '' . t('Navigation') . '';
- $output .= '' . t('When the site-wide contact form is enabled, a link in the Main navigation menu is created, but the link is disabled by default. This menu link can be enabled on the Menus administration page.', array('@contact' => url('contact'), '@menu' => url('admin/structure/menu'))) . '';
+ $output .= '' . t('When the site-wide contact form is enabled, a link in the Main navigation menu is created, but the link is disabled by default. This menu link can be enabled on the Menus administration page.', array('@menu' => url('admin/structure/menu'))) . '';
$output .= '' . t('Customization') . '';
$output .= '' . t('If you would like additional text to appear on the site-wide or personal contact page, use a block. You can create and edit blocks on the Blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '';
$output .= '';
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
index 9b589f6..9d4b8d4 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
@@ -140,6 +140,6 @@ function testMenuNodeFormWidget() {
$this->assertNoOption('edit-menu-parent', 'tools:'. $item['mlid']);
$this->assertNoOption('edit-menu-parent', 'tools:'. $child_item['mlid']);
// Assert that unallowed Administration menu is not available in options.
- $this->assertNoOption('edit-menu-parent', 'administration:0');
+ $this->assertNoOption('edit-menu-parent', 'admin:0');
}
}
diff --git a/core/modules/menu/menu.install b/core/modules/menu/menu.install
index 60e6245..0b26669 100644
--- a/core/modules/menu/menu.install
+++ b/core/modules/menu/menu.install
@@ -48,7 +48,7 @@ function menu_install() {
$t = get_t();
$descriptions = array(
'tools' => $t('Contains links for site visitors. Some modules add their links here.'),
- 'account' => $t("Links related to the user account."),
+ 'account' => $t('Links related to the user account.'),
'admin' => $t('Contains links to administrative tasks.'),
'main' => $t('Use this for linking to the main site sections.'),
);
diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
index 1704c2f..e1b46ad 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Menu/TreeOutputTest.php
@@ -53,7 +53,7 @@ function setUp() {
function testMenuTreeData() {
$output = menu_tree_output($this->tree_data);
- // Validate that the "-" in "main-menu" is changed into an underscore.
+ // Validate that the - in main-menu is changed into an underscore
$this->assertEqual( $output['1']['#theme'], 'menu_link__main_menu', 'Hyphen is changed to a dash on menu_link');
$this->assertEqual( $output['#theme_wrappers'][0], 'menu_tree__main_menu', 'Hyphen is changed to a dash on menu_tree wrapper');
// Looking for child items in the data
diff --git a/core/modules/system/templates/page.tpl.php b/core/modules/system/templates/page.tpl.php
index adc8cf3..6ddeeed 100644
--- a/core/modules/system/templates/page.tpl.php
+++ b/core/modules/system/templates/page.tpl.php
@@ -29,8 +29,8 @@
* in theme settings.
*
* Navigation:
- * - $main_menu (array): An array containing the Main navigation menu links
- * for the site, if they have been configured.
+ * - $main_menu (array): An array containing the Main menu links for the
+ * site, if they have been configured.
* - $secondary_menu (array): An array containing the Secondary menu links for
* the site, if they have been configured.
* - $breadcrumb: The breadcrumb trail for the current page.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index ed10d40..1aaa7e9 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1220,7 +1220,7 @@ function user_menu() {
'access callback' => 'user_is_logged_in',
'page callback' => 'user_logout',
'weight' => 10,
- 'menu_name' => 'account-links',
+ 'menu_name' => 'account',
'file' => 'user.pages.inc',
);
@@ -1410,7 +1410,7 @@ function user_menu_link_alter(&$link) {
$link['options']['alter'] = TRUE;
}
- // Force the Logout link to appear on the top-level of 'account-links' menu by
+ // Force the Logout link to appear on the top-level of 'account' menu by
// default (i.e., unless it has been customized).
if ($link['link_path'] == 'user/logout' && $link['module'] == 'system' && empty($link['customized'])) {
$link['plid'] = 0;