Merge "Make all limits function as user rights."

2 files changed, 28 insertions, 0 deletions

diff --git a/docs/config-schema.yaml b/docs/config-schema.yaml
index d455b57680bd..d1b6e7198bba 100755
--- a/docs/config-schema.yaml
+++ b/docs/config-schema.yaml
@@ -5254,9 +5254,30 @@ config-schema:
     AvailableRights:
         default: []
         type: array
+        items:
+            type: string
         description: |-
             A list of available rights, in addition to the ones defined by the core.
+            Rights in this list are denied unless explicitly granted, typically
+            using GroupPermissions.
             For extensions only.
+            @see self::GroupPermissions
+            @see self::ImplicitRights
+    ImplicitRights:
+        default: []
+        type: array
+        items:
+            type: string
+        description: |-
+            A list of implicit rights, in addition to the ones defined by the core.
+            Rights in this list are granted implicitly to all users, but rate limits
+            may apply to them.
+            Extensions that define rate limits should add the corresponding right to
+            either ImplicitRights or AvailableRights, depending on whether the right
+            should be granted to everyone.
+            @since 1.41
+            @see self::RateLimits
+            @see self::AvailableRights
     DeleteRevisionsLimit:
         default: 0
         description: |-
@@ -5430,6 +5451,7 @@ config-schema:
                     'user' => [ x, y ],
             ];
             ```
+            @see self::ImplicitRights
             @warning Requires that $wgMainCacheType is set to something persistent
     RateLimitsExcludedIPs:
         default: []
diff --git a/docs/config-vars.php b/docs/config-vars.php
index c333a54cac45..ce0962d2f680 100755
--- a/docs/config-vars.php
+++ b/docs/config-vars.php
@@ -2858,6 +2858,12 @@ $wgRemoveGroups = null;
 $wgAvailableRights = null;
 
 /**
+ * Config variable stub for the ImplicitRights setting, for use by phpdoc and IDEs.
+ * @see MediaWiki\MainConfigSchema::ImplicitRights
+ */
+$wgImplicitRights = null;
+
+/**
  * Config variable stub for the DeleteRevisionsLimit setting, for use by phpdoc and IDEs.
  * @see MediaWiki\MainConfigSchema::DeleteRevisionsLimit
  */