more cssification of diff rendering, some " -> ' in diff engine

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 6de7127..193e221 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1,4 +1,5 @@
 <?php
+# $Id$
 # DO NOT EDIT THIS FILE!
 # To customize your installation, edit "LocalSettings.php".
 # Note that since all these string interpolations are expanded
@@ -51,12 +52,13 @@ $wgPasswordSender   = 'Wikipedia Mail <apache@' . getenv( 'SERVER_NAME' ) . '>';
 # "host" => 'SMTP domain', "IDHost" => 'domain for MessageID', "port" => "25", "auth" => true/false, "username" => user, "password" => password
 $wgSMTP                                = false;
 
-# MySQL settings
+# Database settings
 #
 $wgDBserver         = 'localhost';
 $wgDBname           = 'wikidb';
 $wgDBconnection     = '';
 $wgDBuser           = 'wikiuser';
+$wgDBtype           = "mysql"; # "mysql" for working code and "pgsql" for development/broken code
 
 # Sysop SQL queries
 $wgAllowSysopQueries = false; # Dangerous if not configured properly.
@@ -95,8 +97,9 @@ $wgLinkCacheMemcached = false; # Not fully tested
 $wgLanguageCode     = 'en';
 $wgLanguageFile     = false; # Filename of a language file generated by dumpMessages.php
 $wgInterwikiMagic      = true; # Treat language links as magic connectors, not inline links
-$wgInputEncoding       = 'ISO-8859-1';
-$wgOutputEncoding      = 'ISO-8859-1';
+$wgInputEncoding       = 'ISO-8859-1'; # LanguageUtf8.php normally overrides this
+$wgOutputEncoding      = 'ISO-8859-1'; # unless you set the next option to true:
+$wgUseLatin1           = false; # Enable ISO-8859-1 compatibility mode
 $wgEditEncoding                = '';
 $wgMimeType                    = 'text/html';
 $wgDocType                     = '-//W3C//DTD XHTML 1.0 Transitional//EN';
@@ -227,17 +230,6 @@ $wgWLCacheTimeout = 3600;  # The hour or so mentioned above
 $wgUseTeX = false;
 $wgTexvc = './math/texvc'; # Location of the texvc binary
 
-# Support for inline hieroglyphs, see http://aoineko.free.fr/ The
-# WikiHiero php files must be present in the same directory as the
-# rest of the mediawiki code, and WikiHiero must have been configured
-# with the correct image locations.
-$wgUseWikiHiero = false;
-
-# Support for inline timelines, see http://members.chello.nl/epzachte/Wikipedia/EasyTimeline/Introduction.htm
-# The Timeline php files must be present in the extension directory and you must have the
-# ploticus tool available, see http://ploticus.sourceforge.net/
-$wgUseTimeline = false;
-
 # Profiling / debugging
 $wgProfiling = false; # Enable for more detailed by-function times in debug log
 $wgProfileLimit = 0.0; # Only record profiling info for pages that took longer than this
@@ -293,6 +285,9 @@ $wgCheckFileExtensions = true;
 # covered by $wgFileExtensions.
 $wgStrictFileExtensions = true;
 
+# Warn if uploaded files are larger than this
+$wgUploadSizeWarning = 150000;
+
 $wgPasswordSalt = true; # For compatibility with old installations set to false
 
 # Which namespaces should support subpages?
@@ -400,4 +395,5 @@ $wgAllowRealName = true;
 
 # Extensions
 $wgExtensionFunctions = array();
+
 ?>