From: jenkins-bot Date: Fri, 29 Jul 2016 00:19:45 +0000 (+0000) Subject: Merge "Clean up array() in docs, Part I" X-Git-Tag: 1.31.0-rc.0~6229 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=532364d46f292e1ab6f9a722ab0853921524af60;p=lhc%2Fweb%2Fwiklou.git Merge "Clean up array() in docs, Part I" --- 532364d46f292e1ab6f9a722ab0853921524af60 diff --cc includes/SiteConfiguration.php index 9fd5983b8e,ffeb44d3af..885f926fa2 --- a/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! */