diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 3599c59..cc9b7f8 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -23,11 +23,18 @@ function toolbar_help($route_name, Request $request) {
   switch ($route_name) {
     case 'help.page.toolbar':
       $output = '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Toolbar module displays links to top-level administration menu items and links from other modules at the top of the screen. For more information, see the online handbook entry for <a href="@toolbar">Toolbar module</a>.', array('@toolbar' => 'http://drupal.org/documentation/modules/toolbar')) . '</p>';
+      $output .= '<p>' . t('The Toolbar module displays a bar containing top-level administrative components across the top of the screen. For more information, see the <a href="!toolbar_docs">online documentation for the Toolbar module</a>.', array('!toolbar_docs' => 'https://drupal.org/documentation/modules/toolbar')) . '</p>';
+      $output .= '<h4>' . t('Terminology') . '</h4>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Tabs') . '</dt>';
+      $output .= '<dd>' . t('Tabs are usually buttons, and are displayed in a bar across the top of the screen. Some tabs are simple buttons that execute an action (such as starting Edit mode); other tabs toggle which tray is open.') . '</dd>';
+      $output .= '<dt>' . t('Trays') . '</dt>';
+      $output .= '<dd>' . t('Trays are usually lists of links, which can be hierarchical like a menu. If a tray has been toggled open, it is displayed either vertically or horizontally below the tab bar, depending on the browser width. In wide browser widths, the user has the ability to toggle from vertical to horizontal, using a link at the bottom or right of the tray; hierarchical menus only have open/close behavior in vertical mode.') . '</dd>';
+      $output .= '</dl>';      
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Displaying administrative links') . '</dt>';
-      $output .= '<dd>' . t('The Toolbar module displays a bar containing top-level administrative components across the top of the screen. Below that, the Toolbar module has a <em>drawer</em> section where it displays links provided by other modules, such as the core <a href="@shortcuts-help">Shortcut module</a>. The drawer can be hidden/shown by clicking on its corresponding tab.', array('@shortcuts-help' => url('admin/help/shortcut'))) . '</dd>';
+      $output .= '<dd>' . t('The Toolbar module displays "tab" and "tray" content from other modules. Core modules such as <a href="!shortcut-help">Shortcut</a>, <a href="!edit-help">Edit</a>, and <a href="!menu-help">Menu Link</a> provide tabs and trays. ', array('!shortcut-help' => \Drupal::url('help.page', array('name' => 'shortcut')), '!edit-help' => \Drupal::url('help.page', array('name' => 'quickedit')), '!menu-help' => \Drupal::url('help.page', array('name' => 'menu_link')))) . '</dd>';
       $output .= '</dl>';
       return $output;
   }