Merge "Exception: Clean up html document for error pages"

diff --combined languages/messages/MessagesEn.php
index 7c5b1b9,fb8457f..0b51def
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -494,12 -494,6 +494,12 @@@ $specialPageAliases = array
   */
  $linkTrail = '/^([a-z]+)(.*)$/sD';
  
 +/**
 + * Regular expression charset matching the "link prefix", e.g. "foo" in
 + * foo[[bar]]. UTF-8 characters may be used.
 + */
 +$linkPrefixCharset = 'a-zA-Z\\x{80}-\\x{10ffff}';
 +
  /**
   * List of filenames for some ui images that can be overridden per language
   * basis if needed.
@@@ -796,6 -790,8 +796,6 @@@ future releases. Also note that since e
  'broken-file-category'           => 'Pages with broken file links',
  'categoryviewer-pagedlinks'      => '($1) ($2)', # only translate this message to other languages if you have to change it
  
 -'linkprefix' => '/^((?>.*(?<![a-zA-Z\\x80-\\xff])))(.+)$/sD', # only translate this message to other languages if you have to change it
 -
  'about'         => 'About',
  'article'       => 'Content page',
  'newwindow'     => '(opens in new window)',
@@@ -4960,8 -4956,7 +4960,7 @@@ You should have received [{{SERVER}}{{S
  
  # Database error messages
  'dberr-header'      => 'This wiki has a problem',
- 'dberr-problems'    => 'Sorry!
- This site is experiencing technical difficulties.',
+ 'dberr-problems'    => 'Sorry! This site is experiencing technical difficulties.',
  'dberr-again'       => 'Try waiting a few minutes and reloading.',
  'dberr-info'        => '(Cannot contact the database server: $1)',
  'dberr-info-hidden' => '(Cannot contact the database server)',