From f34eef4437d207cd5d0891cc27544d9934dd8cb8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 22 Jan 2020 00:57:03 +0000
Subject: [PATCH] Docs: Expand `@return` value description for `wp_loginout()`,
 `wp_register()`, `get_calendar()`.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47104


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

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index d992a0257b..85aacb44ff 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -317,7 +317,7 @@ function get_search_form( $args = array() ) {
  *
  * @param string $redirect Optional path to redirect to on login/logout.
  * @param bool   $echo     Default to echo and not return the link.
- * @return string|void String when retrieving.
+ * @return void|string Void if `$echo` argument is true, log in/out link if `$echo` is false.
  */
 function wp_loginout( $redirect = '', $echo = true ) {
 	if ( ! is_user_logged_in() ) {
@@ -587,7 +587,8 @@ function wp_lostpassword_url( $redirect = '' ) {
  * @param string $before Text to output before the link. Default `<li>`.
  * @param string $after  Text to output after the link. Default `</li>`.
  * @param bool   $echo   Default to echo and not return the link.
- * @return string|void String when retrieving.
+ * @return void|string Void if `$echo` argument is true, registration or admin link
+ *                     if `$echo` is false.
  */
 function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
 	if ( ! is_user_logged_in() ) {
@@ -2057,7 +2058,7 @@ function calendar_week_mod( $num ) {
  *
  * @param bool $initial Optional, default is true. Use initial calendar names.
  * @param bool $echo    Optional, default is true. Set to false for return.
- * @return string|void String when retrieving.
+ * @return void|string Void if `$echo` argument is true, calendar HTML if `$echo` is false.
  */
 function get_calendar( $initial = true, $echo = true ) {
 	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index bb859663f1..577cfcff21 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47103';
+$wp_version = '5.4-alpha-47104';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.