summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/menu.inc5
-rw-r--r--modules/menu/menu.module8
2 files changed, 11 insertions, 2 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index a3121c739..f4241221d 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -13,7 +13,10 @@
* The Drupal menu system drives both the navigation system from a user
* perspective and the callback system that Drupal uses to respond to URLs
* passed from the browser. For this reason, a good understanding of the
- * menu system is fundamental to the creation of complex modules.
+ * menu system is fundamental to the creation of complex modules. As a note,
+ * this is related to, but separate from menu.module, which allows menus
+ * (which in this context are hierarchical lists of links) to be customized from
+ * the Drupal administrative interface.
*
* Drupal's menu system follows a simple hierarchy defined by paths.
* Implementations of hook_menu() define menu items and assign them to
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index ec41c2f3e..3edf158df 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -2,7 +2,13 @@
/**
* @file
- * Allows administrators to customize the site navigation menu.
+ * Allows administrators to customize the site's navigation menus.
+ *
+ * A menu (in this context) is a hierarchical collection of links, generally
+ * used for navigation. This is not to be confused with the
+ * @link menu Menu system @endlink of menu.inc and hook_menu(), which defines
+ * page routing requests for Drupal, and also allows the defined page routing
+ * URLs to be added to the main site navigation menu.
*/
/**