| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1690,7 +1690,7 @@ |
| 1691 | 1691 | $wgUseTidy = false; |
| 1692 | 1692 | $wgAlwaysUseTidy = false; |
| 1693 | 1693 | $wgTidyBin = 'tidy'; |
| 1694 | | -$wgTidyConf = $IP.'/extensions/tidy/tidy.conf'; |
| | 1694 | +$wgTidyConf = $IP.'/includes/tidy.conf'; |
| 1695 | 1695 | $wgTidyOpts = ''; |
| 1696 | 1696 | $wgTidyInternal = function_exists( 'tidy_load_config' ); |
| 1697 | 1697 | |
| Index: trunk/phase3/includes/tidy.conf |
| — | — | @@ -0,0 +1,18 @@ |
| | 2 | +# html tidy (http://tidy.sf.net) configuration |
| | 3 | +# tidy - validate, correct, and pretty-print HTML files |
| | 4 | +# see: man 1 tidy, http://tidy.sourceforge.net/docs/quickref.html |
| | 5 | + |
| | 6 | +show-body-only: yes |
| | 7 | +force-output: yes |
| | 8 | +tidy-mark: no |
| | 9 | +wrap: 0 |
| | 10 | +wrap-attributes: no |
| | 11 | +literal-attributes: yes |
| | 12 | +output-xhtml: yes |
| | 13 | +numeric-entities: yes |
| | 14 | +enclose-text: yes |
| | 15 | +enclose-block-text: yes |
| | 16 | +quiet: yes |
| | 17 | +quote-nbsp: yes |
| | 18 | +fix-backslash: no |
| | 19 | +fix-uri: no |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -265,7 +265,9 @@ |
| 266 | 266 | * (bug 9256) Add a quick note to index.php header comments |
| 267 | 267 | * (bug 1196) Add IPv6 support to blocks |
| 268 | 268 | * Make Special:Listusers caseinsensitive for first letter |
| | 269 | +* Default tidy.conf has been moved from extensions module into includes. |
| 269 | 270 | |
| | 271 | + |
| 270 | 272 | == Languages updated == |
| 271 | 273 | |
| 272 | 274 | * Arabic (ar) |
| Index: trunk/extensions/tidy/README |
| — | — | @@ -0,0 +1,7 @@ |
| | 2 | +This tidy.conf file is used to configure the HTML Tidy executable or |
| | 3 | +library when $wgUseTidy is enabled in MediaWiki. |
| | 4 | + |
| | 5 | +As of MediaWiki 1.10, the default is to use includes/tidy.conf, which |
| | 6 | +is bundled with the main MediaWiki distribution. |
| | 7 | + |
| | 8 | +A copy remains here in extensions/tidy for backwards compatibility. |