| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | # Create a site configuration object. Not used for much in a default install. |
| 31 | | -# Note: this (and other things) will break if the autoloader is not enabled. |
| | 31 | +# Note: this (and other things) will break if the autoloader is not enabled. |
| 32 | 32 | # Please include includes/AutoLoader.php before including this file. |
| 33 | 33 | $wgConf = new SiteConfiguration; |
| 34 | 34 | /** @endcond */ |
| — | — | @@ -619,7 +619,7 @@ |
| 620 | 620 | $wgCustomConvertCommand = false; |
| 621 | 621 | |
| 622 | 622 | /** |
| 623 | | - * Some tests and extensions use exiv2 to manipulate the EXIF metadata in some image formats. |
| | 623 | + * Some tests and extensions use exiv2 to manipulate the EXIF metadata in some image formats. |
| 624 | 624 | */ |
| 625 | 625 | $wgExiv2Command = '/usr/bin/exiv2'; |
| 626 | 626 | |
| — | — | @@ -3305,7 +3305,7 @@ |
| 3306 | 3306 | * when new permissions are introduced and default grants established. |
| 3307 | 3307 | * |
| 3308 | 3308 | * If set to an array instead of a boolean, it is assumed that the array is in |
| 3309 | | - * NS => bool form in order to support per-namespace permissions. Note that |
| | 3309 | + * NS => bool form in order to support per-namespace permissions. Note that |
| 3310 | 3310 | * this feature does not fully work for all permission types. |
| 3311 | 3311 | * |
| 3312 | 3312 | * Functionality to make pages inaccessible has not been extensively tested |
| — | — | @@ -3775,7 +3775,7 @@ |
| 3776 | 3776 | |
| 3777 | 3777 | |
| 3778 | 3778 | /** |
| 3779 | | - * Set this variable if you want to restrict cookies to a certain path within |
| | 3779 | + * Set this variable if you want to restrict cookies to a certain path within |
| 3780 | 3780 | * the domain specified by $wgCookieDomain. |
| 3781 | 3781 | */ |
| 3782 | 3782 | $wgCookiePath = '/'; |
| — | — | @@ -3789,8 +3789,8 @@ |
| 3790 | 3790 | $wgCookieSecure = 'detect'; |
| 3791 | 3791 | |
| 3792 | 3792 | /** |
| 3793 | | - * By default, MediaWiki checks if the client supports cookies during the |
| 3794 | | - * login process, so that it can display an informative error message if |
| | 3793 | + * By default, MediaWiki checks if the client supports cookies during the |
| | 3794 | + * login process, so that it can display an informative error message if |
| 3795 | 3795 | * cookies are disabled. Set this to true if you want to disable this cookie |
| 3796 | 3796 | * check. |
| 3797 | 3797 | */ |
| — | — | @@ -4465,12 +4465,31 @@ |
| 4466 | 4466 | * @{ |
| 4467 | 4467 | */ |
| 4468 | 4468 | |
| 4469 | | -/** Override for copyright metadata. |
| 4470 | | - * TODO: these options need documentation |
| | 4469 | +/** |
| | 4470 | + * Override for copyright metadata. |
| | 4471 | + * |
| | 4472 | + * This is the name of the page containing information about the wiki's copyright status, |
| | 4473 | + * which will be added as a link in the footer if it is specified. It overrides |
| | 4474 | + * $wgRightsUrl if both are specified. |
| 4471 | 4475 | */ |
| 4472 | 4476 | $wgRightsPage = null; |
| | 4477 | + |
| | 4478 | +/** |
| | 4479 | + * Set this to specify an external URL containing details about the content license used on your wiki. |
| | 4480 | + * If $wgRightsPage is set then this setting is ignored. |
| | 4481 | + */ |
| 4473 | 4482 | $wgRightsUrl = null; |
| | 4483 | + |
| | 4484 | +/** |
| | 4485 | + * If either $wgRightsUrl or $wgRightsPage is specified then this variable gives the text for the link. |
| | 4486 | + * If using $wgRightsUrl then this value must be specified. If using $wgRightsPage then the name of the |
| | 4487 | + * page will also be used as the link if this variable is not set. |
| | 4488 | + */ |
| 4474 | 4489 | $wgRightsText = null; |
| | 4490 | + |
| | 4491 | +/** |
| | 4492 | + * Override for copyright metadata. |
| | 4493 | + */ |
| 4475 | 4494 | $wgRightsIcon = null; |
| 4476 | 4495 | |
| 4477 | 4496 | /** |
| — | — | @@ -5382,7 +5401,7 @@ |
| 5383 | 5402 | */ |
| 5384 | 5403 | |
| 5385 | 5404 | /** |
| 5386 | | - * The build directory for HipHop compilation. |
| | 5405 | + * The build directory for HipHop compilation. |
| 5387 | 5406 | * Defaults to $IP/maintenance/hiphop/build. |
| 5388 | 5407 | */ |
| 5389 | 5408 | $wgHipHopBuildDirectory = false; |
| — | — | @@ -5401,24 +5420,24 @@ |
| 5402 | 5421 | /** |
| 5403 | 5422 | * Filesystem extensions directory. Defaults to $IP/../extensions. |
| 5404 | 5423 | * |
| 5405 | | - * To compile extensions with HipHop, set $wgExtensionsDirectory correctly, |
| | 5424 | + * To compile extensions with HipHop, set $wgExtensionsDirectory correctly, |
| 5406 | 5425 | * and use code like: |
| 5407 | | - * |
| | 5426 | + * |
| 5408 | 5427 | * require( MWInit::extensionSetupPath( 'Extension/Extension.php' ) ); |
| 5409 | 5428 | * |
| 5410 | | - * to include the extension setup file from LocalSettings.php. It is not |
| | 5429 | + * to include the extension setup file from LocalSettings.php. It is not |
| 5411 | 5430 | * necessary to set this variable unless you use MWInit::extensionSetupPath(). |
| 5412 | 5431 | */ |
| 5413 | 5432 | $wgExtensionsDirectory = false; |
| 5414 | 5433 | |
| 5415 | 5434 | /** |
| 5416 | | - * A list of files that should be compiled into a HipHop build, in addition to |
| 5417 | | - * those listed in $wgAutoloadClasses. Add to this array in an extension setup |
| 5418 | | - * file in order to add files to the build. |
| | 5435 | + * A list of files that should be compiled into a HipHop build, in addition to |
| | 5436 | + * those listed in $wgAutoloadClasses. Add to this array in an extension setup |
| | 5437 | + * file in order to add files to the build. |
| 5419 | 5438 | * |
| 5420 | | - * The files listed here must either be either absolute paths under $IP or |
| | 5439 | + * The files listed here must either be either absolute paths under $IP or |
| 5421 | 5440 | * under $wgExtensionsDirectory, or paths relative to the virtual source root |
| 5422 | | - * "$IP/..", i.e. starting with "phase3" for core files, and "extensions" for |
| | 5441 | + * "$IP/..", i.e. starting with "phase3" for core files, and "extensions" for |
| 5423 | 5442 | * extension files. |
| 5424 | 5443 | */ |
| 5425 | 5444 | $wgCompiledFiles = array(); |