From 9b89047bf28e61c8e73b5a0f7a4af0a9069b8e53 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 18 Dec 2015 23:16:26 +0000
Subject: [PATCH] Docs: Add a missing notation for the `$context` parameter in
 the DocBlock for `_nx_noop()`.

See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/l10n.php    | 1 +
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index 53b3ab79a4..a69a718005 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -445,6 +445,7 @@ function _n_noop( $singular, $plural, $domain = null ) {
  *
  * @param string $singular Singular form to be localized.
  * @param string $plural   Plural form to be localized.
+ * @param string $context  Context information for the translators.
  * @param string $domain   Optional. Text domain. Unique identifier for retrieving translated strings.
  *                         Default null.
  * @return array {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 39bb185744..188662fba4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36011';
+$wp_version = '4.5-alpha-36012';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.