(Bug 41352) Provide tests for edit conflicts.

[lhc/web/wiklou.git] / includes / conf / Conf.php

diff --git a/includes/conf/Conf.php b/includes/conf/Conf.php
index b4845cb..22c621f 100644 (file)
--- a/includes/conf/Conf.php
+++ b/includes/conf/Conf.php
@@ -25,7 +25,6 @@
  *
  * @file
  * @defgroup Config Config
- * @ingroup Config
  */
 abstract class Conf {
        /**
@@ -98,6 +97,7 @@ abstract class Conf {
         * Initialize a new child class based on a configuration array
         * @param $conf Array of configuration settings, see $wgConfiguration
         *   for details
+        * @throws MWException
         * @return Conf
         */
        private static function newFromSettings( $conf ) {
@@ -110,7 +110,8 @@ abstract class Conf {
 
        /**
         * Get the singleton if we don't want a specific wiki
-        * @param $wiki String An id for a remote wiki
+        * @param bool|string $wiki An id for a remote wiki
+        * @throws MWException
         * @return Conf child
         */
        public static function load( $wiki = false ) {