From: Matthew Flaschen <mflaschen@wikimedia.org>
Date: Mon, 7 Jul 2014 22:10:23 +0000 (-0400)
Subject: Profiling: Fix StartProfiler.sample, link in docs/scripts.txt
X-Git-Tag: 1.31.0-rc.0~15066^2
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=a838e968379245791bd529e1c972d9a3b4616232;p=lhc%2Fweb%2Fwiklou.git

Profiling: Fix StartProfiler.sample, link in docs/scripts.txt

Note two options in StartProfiler.sample, since only one of them
supports the toolbar

Change-Id: Ie8bd7febf749de8a5d32cbe87ba7733ee135bdc9
---

diff --git a/StartProfiler.sample b/StartProfiler.sample
index db5e0ff9e2..d9b5288411 100644
--- a/StartProfiler.sample
+++ b/StartProfiler.sample
@@ -2,13 +2,22 @@
 
 /**
  * To use a profiler, copy this file to StartProfiler.php,
- * and add something like this:
+ * and add either:
  *
- *   $wgProfiler['class'] = 'Profiler';
+ *   // Does not support the debugging toolbar
+ *   // Stores profiling information in the database
+ *   // Requires running maintenance/archives/patch-profiling.sql
+ *   $wgProfiler['class'] = 'ProfilerSimpleDB'
+ *
+ * or:
+ *
+ *   // Supports the debugging toolbar
+ *   // Does not store profiling information in the database
+ *   $wgProfiler['class'] = 'ProfilerStandard';
  *
  * Or for a sampling profiler:
  *   if ( !mt_rand( 0, 100 ) ) {
- *       $wgProfiler['class'] = 'Profiler';
+ *       $wgProfiler['class'] = 'ProfilerSimpleDB';
  *   } else {
  *       $wgProfiler['class'] = 'ProfilerStub';
  *   }
diff --git a/docs/scripts.txt b/docs/scripts.txt
index 4f167093ec..c6fa674cec 100644
--- a/docs/scripts.txt
+++ b/docs/scripts.txt
@@ -40,7 +40,7 @@ Primary scripts:
 
     To enable the profileinfo.php itself, you'll need to set $wgDBadminuser
     and $wgDBadminpassword in your LocalSettings.php, as well as $wgEnableProfileInfo 
-    See also https://www.mediawiki.org/wiki/How_to_debug#Profiling.
+    See also https://www.mediawiki.org/wiki/Manual:Profiling .
 
   thumb.php
     Script used to resize images if it is configured to be done when the web