From 57878dd1b94e2b855a4796e7d9c30e256e352b42 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Sat, 19 Dec 2015 08:54:26 +0000
Subject: [PATCH] Docs: Add missing parameter notations and descriptions in the
 DocBlock for `get_link()`.

See #32246.

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


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

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 54d9e0ec30..e95c7873e5 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -1972,17 +1972,20 @@ function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false)
 }
 
 /**
- * Retrieve bookmark data based on ID.
+ * Retrieves bookmark data based on ID.
  *
  * @since 2.0.0
  * @deprecated 2.1.0 Use get_bookmark()
  * @see get_bookmark()
  *
- * @param int $bookmark_id ID of link
- * @param string $output OBJECT, ARRAY_N, or ARRAY_A
- * @return object|array
+ * @param int    $bookmark_id ID of link
+ * @param string $output      Optional. Type of output. Accepts OBJECT, ARRAY_N, or ARRAY_A.
+ *                            Default OBJECT.
+ * @param string $filter      Optional. How to filter the link for output. Accepts 'raw', 'edit',
+ *                            'attribute', 'js', 'db', or 'display'. Default 'raw'.
+ * @return object|array Bookmark object or array, depending on the type specified by `$output`.
  */
-function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
+function get_link( $bookmark_id, $output = OBJECT, $filter = 'raw' ) {
 	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmark()' );
 	return get_bookmark($bookmark_id, $output, $filter);
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4675d5d4ff..16b23713ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36024';
+$wp_version = '4.5-alpha-36025';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.