From 4fd64b94d7e5352b75424f1fa8efb287f6a3485e Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 28 Nov 2014 12:15:23 +0000
Subject: [PATCH] 4.1 Docs Audit: Formatting, line-wrap, and other fixes for
 the `wp_get_nav_menus()` DocBlock.

See #30469.

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


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

diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 62875e47cc..602ad41eac 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -456,10 +456,12 @@ function wp_update_nav_menu_item( $menu_id = 0, $menu_item_db_id = 0, $menu_item
  * Returns all navigation menu objects.
  *
  * @since 3.0.0
- * @since 4.1.0 Default 'orderby' argument changed from 'none' to 'name'.
+ * @since 4.1.0 Default value of the 'orderby' argument was changed from 'none'
+ *              to 'name'.
  *
- * @param array $args Array of arguments passed on to get_terms().
- * @return array menu objects
+ * @param array $args Optional. Array of arguments passed on to {@see get_terms()}.
+ *                    Default empty array.
+ * @return array Menu objects.
  */
 function wp_get_nav_menus( $args = array() ) {
 	$defaults = array( 'hide_empty' => false, 'orderby' => 'name' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 33bf78781c..6f6c8dd4ef 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30618';
+$wp_version = '4.1-beta2-30619';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.