Merge branch '2.3' into 2.5

fabpot · fabpot · commit 12fd0ca37da4 · 2014-10-01T07:50:18.000+02:00
* 2.3:
  [Doc] Use Markdown syntax highlighting
  [Finder] tweaked docs
  [Finder] Add info about possibilities offered by SplFileInfo
  fix components tests
  [Intl] FIxed failing test
  [Intl] Generated the data for ICU version 54-rc
  [EventDispatcher] fix doc bloc on EventDispatcherInterface
  [Validator] Update validators.zh_CN.xlf, fix translation error
  bumped Symfony version to 2.3.21
  updated VERSION for 2.3.20
  update CONTRIBUTORS for 2.3.20
  updated CHANGELOG for 2.3.20
  [Intl] Integrated ICU data into Intl component

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Intl/ResourceBundle/LocaleBundle.php
diff --git a/README.md b/README.md
@@ -6,9 +6,11 @@ CssSelector converts CSS selectors to XPath expressions.
 The component only goal is to convert CSS selectors to their XPath
 equivalents:
 
-    use Symfony\Component\CssSelector\CssSelector;
+```php
+use Symfony\Component\CssSelector\CssSelector;
 
-    print CssSelector::toXPath('div.item > h4 > a');
+print CssSelector::toXPath('div.item > h4 > a');
+```
 
 HTML and XML are different
 --------------------------
@@ -18,11 +20,13 @@ default. If you need to use this component with `XML` documents, you have to
 disable this `HTML` extension. That's because, `HTML` tag & attribute names
 are always lower-cased, but case-sensitive in `XML`:
 
-    // disable `HTML` extension:
-    CssSelector::disableHtmlExtension();
+```php
+// disable `HTML` extension:
+CssSelector::disableHtmlExtension();
 
-    // re-enable `HTML` extension:
-    CssSelector::enableHtmlExtension();
+// re-enable `HTML` extension:
+CssSelector::enableHtmlExtension();
+```
 
 When the `HTML` extension is enabled, tag names are lower-cased, attribute
 names are lower-cased, the following extra pseudo-classes are supported:
