From edac6c37166cdd6da87e5ff33db97200526ab3a8 Mon Sep 17 00:00:00 2001
From: Ori Livneh <ori@wikimedia.org>
Date: Tue, 5 Nov 2013 12:22:35 -0800
Subject: [PATCH] Release notes & comment fix for Ib0ece5d5d

Adds release notes and fixes two inaccurate comments added in Ib0ece5d5d
("Configurable log sampling via $wgDebugLogGroups").

Change-Id: I224a0319b7432300d3cb6f4d14e61ea9d36ee228
---
 RELEASE-NOTES-1.23           | 5 +++++
 includes/DefaultSettings.php | 4 ++--
 includes/GlobalFunctions.php | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 710f26ff97..ac2444c3dd 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -9,6 +9,11 @@ MediaWiki 1.23 is an alpha-quality branch and is not recommended for use in
 production.
 
 === Configuration changes in 1.23 ===
+* $wgDebugLogGroups values may be set to an associative array with a
+  'destination' key specifying the log destination. The array may also contain
+  a 'sample' key with a positive integer value N indicating that the log group
+  should be sampled by dispatching one in every N messages on average. The
+  sampling is random.
 
 === New features in 1.23 ===
 * ResourceLoader can utilize the Web Storage API to cache modules client-side.
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6d0e36cac8..92bb05e92d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4902,7 +4902,7 @@ $wgDebugDumpSql = false;
  * in production.
  *
  * Log destinations may be string values specifying a filename or URI, or they
- * may be filename or an associative array mapping 'target' to the desired
+ * may be filename or an associative array mapping 'destination' to the desired
  * filename. The associative array may also contain a 'sample' key with an
  * integer value, specifying a sampling factor.
  *
@@ -4914,7 +4914,7 @@ $wgDebugDumpSql = false;
  * @par Advanced example:
  * @code
  * $wgDebugLogGroups['memcached'] = (
- *     'target' => '/var/log/mediawiki/memcached.log',
+ *     'destination' => '/var/log/mediawiki/memcached.log',
  *     'sample' => 1000,  // log 1 message out of every 1,000.
  * );
  * @endcode
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index d8fe38e158..2216cccc08 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1009,7 +1009,7 @@ function wfDebugMem( $exact = false ) {
 /**
  * Send a line to a supplementary debug log file, if configured, or main debug log if not.
  * To configure a supplementary log file, set $wgDebugLogGroups[$logGroup] to a string
- * filename or an associative array mapping 'target' to the desired filename. The
+ * filename or an associative array mapping 'destination' to the desired filename. The
  * associative array may also contain a 'sample' key with an integer value, specifying
  * a sampling factor.
  *
-- 
2.20.1