From 4534f13149740e4d3d309990a2655eb110243771 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 12 Oct 2015 16:15:24 +0000
Subject: [PATCH] Docs: Fix the syntax for marking parameters optional and add
 defaults in the DocBlock for `wp_get_attachment_link()`.

See #32246.

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


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

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index e4a52ebcb9..66517b1c91 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -1405,10 +1405,11 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $
  * @param string|array $size      Optional. Image size. Accepts any valid image size, or an array
  *                                of width and height values in pixels (in that order).
  *                                Default 'thumbnail'.
- * @param bool         $permalink Optional, default is false. Whether to add permalink to image.
- * @param bool         $icon      Optional, default is false. Whether to include icon.
- * @param string|bool  $text      Optional, default is false. If string, then will be link text.
- * @param array|string $attr      Optional. Array or string of attributes.
+ * @param bool         $permalink Optional, Whether to add permalink to image. Default false.
+ * @param bool         $icon      Optional. Whether the attachment is an icon. Default false.
+ * @param string|false $text      Optional. Link text to use. Activated by passing a string, false otherwise.
+ *                                Default false.
+ * @param array|string $attr      Optional. Array or string of attributes. Default empty.
  * @return string HTML content.
  */
 function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6194fd2b01..28433afcb3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35056';
+$wp_version = '4.4-alpha-35057';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.