commit 0f02902ac10b290c401d46762aa8749626581525
Author: Joel Pittet <joel@pittet.ca>
Date:   Mon Jun 9 13:44:39 2014 -0500

    89

diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index e3c5ebc..efbe956 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -959,6 +959,13 @@ function hook_system_info_alter(array &$info, \Drupal\Core\Extension\Extension $
  *     warning message defined in user_admin_permissions() will be displayed
  *     with the permission on the permission administration page. Defaults
  *     to FALSE.
+ *   - warning: (optional) A translated warning message to display for this
+ *     permission on the permission administration page. This warning overrides
+ *     the automatic warning generated by 'restrict access' being set to TRUE.
+ *     This should rarely be used, since it is important for all permissions to
+ *     have a clear, consistent security warning that is the same across the
+ *     site. Use the 'description' key instead to provide any information that
+ *     is specific to the permission you are defining.
  */
 function hook_permission() {
   return array(
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 1d5bb2d..a4cfa29 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -619,7 +619,6 @@ function user_template_preprocess_default_variables_alter(&$variables) {
  *   An associative array containing:
  *   - account: The user account to check access for
  *     (Drupal\user\Plugin\Core\Entity\User).
- *   - uid: The user uid number.
  *
  * Modules that make any changes to variables like 'name' or 'extra' must ensure
  * that the final string is safe to include directly in the output by using
@@ -668,7 +667,7 @@ function template_preprocess_username(&$variables) {
   }
   // Set a default class.
   $variables['attributes']['class'] = array('username');
-  // We have a link path, so we should generate a link using l().
+  // We have a link path, so we should generate a link using url().
   // Additional classes may be added as array elements like
   // $variables['attributes']['class'][] = 'myclass';
   if (isset($variables['link_path'])) {