| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -3380,9 +3380,10 @@ |
| 3381 | 3381 | wfDebug( __METHOD__.": [[MediaWiki:hidden-category-category]] is not a valid title!\n" ); |
| 3382 | 3382 | } |
| 3383 | 3383 | } |
| 3384 | | - # (bug 8068) Allow control over whether robots index a page. FIXME: |
| 3385 | | - # __INDEX__ always overrides __NOINDEX__ here! This is not desirable, |
| 3386 | | - # the last one on the page should win. |
| | 3384 | + # (bug 8068) Allow control over whether robots index a page. |
| | 3385 | + # |
| | 3386 | + # FIXME (bug 14899): __INDEX__ always overrides __NOINDEX__ here! This |
| | 3387 | + # is not desirable, the last one on the page should win. |
| 3387 | 3388 | if( isset( $this->mDoubleUnderscores['noindex'] ) ) { |
| 3388 | 3389 | $this->mOutput->setIndexPolicy( 'noindex' ); |
| 3389 | 3390 | } elseif( isset( $this->mDoubleUnderscores['index'] ) ) { |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2793,9 +2793,9 @@ |
| 2794 | 2794 | $wgNoFollowNsExceptions = array(); |
| 2795 | 2795 | |
| 2796 | 2796 | /** |
| 2797 | | - * Default robot policy. |
| 2798 | | - * The default policy is to encourage indexing and following of links. |
| 2799 | | - * It may be overridden on a per-namespace and/or per-page basis. |
| | 2797 | + * Default robot policy. The default policy is to encourage indexing and fol- |
| | 2798 | + * lowing of links. It may be overridden on a per-namespace and/or per-page |
| | 2799 | + * basis. |
| 2800 | 2800 | */ |
| 2801 | 2801 | $wgDefaultRobotPolicy = 'index,follow'; |
| 2802 | 2802 | |
| — | — | @@ -2814,12 +2814,21 @@ |
| 2815 | 2815 | $wgNamespaceRobotPolicies = array(); |
| 2816 | 2816 | |
| 2817 | 2817 | /** |
| 2818 | | - * Robot policies per article. |
| 2819 | | - * These override the per-namespace robot policies. |
| 2820 | | - * Must be in the form of an array where the key part is a properly |
| 2821 | | - * canonicalised text form title and the value is a robot policy. |
| | 2818 | + * Robot policies per article. These override the per-namespace robot policies. |
| | 2819 | + * Must be in the form of an array where the key part is a properly canonical- |
| | 2820 | + * ised text form title and the value is a robot policy. |
| 2822 | 2821 | * Example: |
| 2823 | | - * $wgArticleRobotPolicies = array( 'Main Page' => 'noindex' ); |
| | 2822 | + * $wgArticleRobotPolicies = array( 'Main Page' => 'noindex,follow', |
| | 2823 | + * 'User:Bob' => 'index,follow' ); |
| | 2824 | + * Example that DOES NOT WORK because the names are not canonical text forms: |
| | 2825 | + * $wgArticleRobotPolicies = array( |
| | 2826 | + * # Underscore, not space! |
| | 2827 | + * 'Main_Page' => 'noindex,follow', |
| | 2828 | + * # "Project", not the actual project name! |
| | 2829 | + * 'Project:X' => 'index,follow', |
| | 2830 | + * # Needs to be "Abc", not "abc" (unless $wgCapitalLinks is false)! |
| | 2831 | + * 'abc' => 'noindex,nofollow' |
| | 2832 | + * ); |
| 2824 | 2833 | */ |
| 2825 | 2834 | $wgArticleRobotPolicies = array(); |
| 2826 | 2835 | |
| — | — | @@ -2833,8 +2842,8 @@ |
| 2834 | 2843 | $wgExemptFromUserRobotsControl = null; |
| 2835 | 2844 | |
| 2836 | 2845 | /** |
| 2837 | | - * Specifies the minimal length of a user password. If set to |
| 2838 | | - * 0, empty passwords are allowed. |
| | 2846 | + * Specifies the minimal length of a user password. If set to 0, empty pass- |
| | 2847 | + * words are allowed. |
| 2839 | 2848 | */ |
| 2840 | 2849 | $wgMinimalPasswordLength = 0; |
| 2841 | 2850 | |
| — | — | @@ -2849,9 +2858,8 @@ |
| 2850 | 2859 | $wgSortSpecialPages = true; |
| 2851 | 2860 | |
| 2852 | 2861 | /** |
| 2853 | | - * Specify the name of a skin that should not be presented in the |
| 2854 | | - * list of available skins. |
| 2855 | | - * Use for blacklisting a skin which you do not want to remove |
| | 2862 | + * Specify the name of a skin that should not be presented in the list of a- |
| | 2863 | + * vailable skins. Use for blacklisting a skin which you do not want to remove |
| 2856 | 2864 | * from the .../skins/ directory |
| 2857 | 2865 | */ |
| 2858 | 2866 | $wgSkipSkin = ''; |
| — | — | @@ -2863,7 +2871,8 @@ |
| 2864 | 2872 | $wgDisabledActions = array(); |
| 2865 | 2873 | |
| 2866 | 2874 | /** |
| 2867 | | - * Disable redirects to special pages and interwiki redirects, which use a 302 and have no "redirected from" link |
| | 2875 | + * Disable redirects to special pages and interwiki redirects, which use a 302 |
| | 2876 | + * and have no "redirected from" link. |
| 2868 | 2877 | */ |
| 2869 | 2878 | $wgDisableHardRedirects = false; |
| 2870 | 2879 | |
| — | — | @@ -2874,21 +2883,19 @@ |
| 2875 | 2884 | $wgSorbsUrl = 'http.dnsbl.sorbs.net.'; |
| 2876 | 2885 | |
| 2877 | 2886 | /** |
| 2878 | | - * Proxy whitelist, list of addresses that are assumed to be non-proxy despite what the other |
| 2879 | | - * methods might say |
| | 2887 | + * Proxy whitelist, list of addresses that are assumed to be non-proxy despite |
| | 2888 | + * what the other methods might say. |
| 2880 | 2889 | */ |
| 2881 | 2890 | $wgProxyWhitelist = array(); |
| 2882 | 2891 | |
| 2883 | 2892 | /** |
| 2884 | | - * Simple rate limiter options to brake edit floods. |
| 2885 | | - * Maximum number actions allowed in the given number of seconds; |
| 2886 | | - * after that the violating client receives HTTP 500 error pages |
| 2887 | | - * until the period elapses. |
| | 2893 | + * Simple rate limiter options to brake edit floods. Maximum number actions |
| | 2894 | + * allowed in the given number of seconds; after that the violating client re- |
| | 2895 | + * ceives HTTP 500 error pages until the period elapses. |
| 2888 | 2896 | * |
| 2889 | 2897 | * array( 4, 60 ) for a maximum of 4 hits in 60 seconds. |
| 2890 | 2898 | * |
| 2891 | | - * This option set is experimental and likely to change. |
| 2892 | | - * Requires memcached. |
| | 2899 | + * This option set is experimental and likely to change. Requires memcached. |
| 2893 | 2900 | */ |
| 2894 | 2901 | $wgRateLimits = array( |
| 2895 | 2902 | 'edit' => array( |