updated RELEASE-NOTES configuration vars and removed duplicate $wgPhpCliPath in Defau...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e54448a..1879cf8 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -18,7 +18,25 @@ will be made on the development trunk and appear in the next quarterly release.
 Those wishing to use the latest code instead of a branch release can obtain
 it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
-=== Configuration changes in 1.16 ===
+=== Configuration changes in 1.16 ===  
+
+* $wgEnableFirefogg enable support for firefogg extension, firefogg supports 
+in-browser transcoding, chunk uploads and client side hash checking. 
+* $wgEnableTemporalOggUrls enable oggz_chop support a server side ogg seeking
+helper 
+* $wgEnableScriptLoader if the script-loader shoudl be enabled
+* $wgJSAutoloadClasses array of javascript classes to file paths used by
+script-loader to load javascript by class name. 
+* $wgEnableJS2system  if we should include js2 stuff like jquery, 
+mv_embed.js (script-loader helper) and use new interfaces for upload
+* $wgEnableScriptLoaderJsFile if we support grabbing js files with the script
+loader. By default we only grab classes in $wgJSAutoloadClasses
+* $wgEnableScriptMinify if you want the script loader to minify js
+* $wgEnableScriptLocalization if you want the script loader to do msg lookups
+* $wgMwEmbedDirectory the path to MwEmbed Directory (maybe we can depreciate
+this. Was used when mwEmbed was going to be an extension.   
+* $wgDebugJavaScript if we want to enable fresh debug javascript 
+* $wgPhpCliPath Path to php-cli for spinning up background php processes
 
 * (bug 18222) $wgMinimalPasswordLength default is now 1
 * $wgSessionHandler can be used to configure session.save_handler

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index d68f8b5..c51b038 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1985,11 +1985,6 @@ $wgDiff3 = '/usr/bin/diff3';
  */
 $wgDiff = '/usr/bin/diff';
 
-/**
- * Path to php-cli for spining up background php proccesses
- */
-$wgPhpCliPath = '/usr/bin/php';
-
 /**
  * We can also compress text stored in the 'text' table. If this is set on, new
  * revisions will be compressed on page save if zlib support is available. Any