From e4f52df62c17ddca8aea42b17c5ccc737fbc5d89 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Wed, 26 Nov 2014 20:38:23 +0000
Subject: [PATCH] Fix DocBlock formatting for `wp_generate_password()`.

Props stevegrunwell for the initial patch.
Fixes #30509.

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


git-svn-id: http://core.svn.wordpress.org/trunk@30570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 13 +++++++------
 wp-includes/version.php   |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index f55631faff..d05bddc839 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1975,12 +1975,13 @@ if ( !function_exists('wp_generate_password') ) :
  *
  * @since 2.5.0
  *
- * @param int $length The length of password to generate
- * @param bool $special_chars Whether to include standard special characters. Default true.
- * @param bool $extra_special_chars Whether to include other special characters. Used when
- *   generating secret keys and salts. Default false.
- * @return string The random password
- **/
+ * @param int  $length              Optional. The length of password to generate. Default 12.
+ * @param bool $special_chars       Optional. Whether to include standard special characters.
+ *                                  Default true.
+ * @param bool $extra_special_chars Optional. Whether to include other special characters.
+ *                                  Used when generating secret keys and salts. Default false.
+ * @return string The random password.
+ */
 function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
 	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
 	if ( $special_chars )
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3b8cea84ad..4545bc9d9f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30579';
+$wp_version = '4.1-beta2-30580';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.