From f4af7643d841e9f463b9798a2baf1d524d3a319f Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 18 Dec 2015 23:08:26 +0000
Subject: [PATCH] Docs: Add a missing summary, description, and `@since`
 version to the DocBlock for `wp_redirect_admin_locations()`.

Introduced in [19880].

See #32246.

Built from https://develop.svn.wordpress.org/trunk@36010


git-svn-id: http://core.svn.wordpress.org/trunk@35975 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/canonical.php | 6 ++++++
 wp-includes/version.php   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 34bb774d45..2afc1fec1b 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -602,6 +602,12 @@ function redirect_guess_404_permalink() {
 }
 
 /**
+ * Redirects a variety of shorthand URLs to the admin.
+ *
+ * If a user visits example.com/admin, they'll be redirected to /wp-admin.
+ * Visiting /login redirects to /wp-login.php, and so on.
+ *
+ * @since 3.4.0
  *
  * @global WP_Rewrite $wp_rewrite
  */
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4891fb600d..d02944af4f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36009';
+$wp_version = '4.5-alpha-36010';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.