Bundle tidy config.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 73ab302..795c1a4 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -265,6 +265,8 @@ lighter making things easier to read.
 * (bug 9256) Add a quick note to index.php header comments
 * (bug 1196) Add IPv6 support to blocks
 * Make Special:Listusers caseinsensitive for first letter
+* Default tidy.conf has been moved from extensions module into includes.
+
 
 == Languages updated ==
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 98b94d4..821612a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1690,7 +1690,7 @@ $wgRawHtml = false;
 $wgUseTidy = false;
 $wgAlwaysUseTidy = false;
 $wgTidyBin = 'tidy';
-$wgTidyConf = $IP.'/extensions/tidy/tidy.conf';
+$wgTidyConf = $IP.'/includes/tidy.conf';
 $wgTidyOpts = '';
 $wgTidyInternal = function_exists( 'tidy_load_config' );
 

diff --git a/includes/tidy.conf b/includes/tidy.conf
new file mode 100644 (file)
index 0000000..3cefcf8
--- /dev/null
+++ b/includes/tidy.conf
@@ -0,0 +1,18 @@
+# html tidy (http://tidy.sf.net) configuration
+# tidy - validate, correct, and pretty-print HTML files
+# see: man 1 tidy, http://tidy.sourceforge.net/docs/quickref.html
+
+show-body-only: yes
+force-output: yes
+tidy-mark: no 
+wrap: 0
+wrap-attributes: no
+literal-attributes: yes
+output-xhtml: yes 
+numeric-entities: yes
+enclose-text: yes
+enclose-block-text: yes
+quiet: yes 
+quote-nbsp: yes
+fix-backslash: no
+fix-uri: no