Merge "Clean up array() in docs, Part I"

diff --cc includes/GlobalFunctions.php
Simple merge

diff --cc includes/SiteConfiguration.php
index 9fd5983,ffeb44d..885f926
--- 1/includes/SiteConfiguration.php
--- 2/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@@ -108,14 -108,9 +108,14 @@@
   * extract( $globals );
   * @endcode
   *
 + * @note For WikiMap to function, the configuration must define string values for
 + *  $wgServer (or $wgCanonicalServer) and $wgArticlePath, even if these are the
 + *  same for all wikis or can be correctly determined by the logic in
 + *  Setup.php.
 + *
   * @todo Give examples for,
   * suffixes:
-  * $conf->suffixes = array( 'wiki' );
+  * $conf->suffixes = [ 'wiki' ];
   * localVHosts
   * callbacks!
   */