diff --git a/docs/simplesamlphp-authproc.md b/docs/simplesamlphp-authproc.md
index be91c42071ab10070e6f8fcb3e45c19c253ef64f..d082a8255c805ad2bce82db7880956b31b4f4f3e 100644
--- a/docs/simplesamlphp-authproc.md
+++ b/docs/simplesamlphp-authproc.md
@@ -132,6 +132,8 @@ The following filters are included in the SimpleSAMLphp distribution:
 - [`core:AttributeLimit`](./core:authproc_attributelimit): Limit the attributes in the response.
 - [`core:AttributeMap`](./core:authproc_attributemap): Change the name of the attributes.
 - [`core:AttributeRealm`](./core:authproc_attributerealm): (deprecated) Create an attribute with the realm of the user.
+- [`core:Cardinality`](./core:authproc_cardinality): Ensure the number of attribute values is within the specified multiplicity.
+- [`core:CardinalitySingle`](./core:authproc_cardinalitysingle): Ensure the correct cardinality of single-valued attributes.
 - [`core:GenerateGroups`](./core:authproc_generategroups): Generate a `group` attribute for the user.
 - [`core:LanguageAdaptor`](./core:authproc_languageadaptor): Transfering language setting from IdP to SP.
 - [`core:PHP`](./core:authproc_php): Modify attributes with custom PHP code.
diff --git a/modules/core/docs/authproc_cardinality.md b/modules/core/docs/authproc_cardinality.md
index 0902bf27863dad94991aacb54d15a7a407750f63..97b73f86619cb70db8e4c104b2f8cf52e9e9fe46 100644
--- a/modules/core/docs/authproc_cardinality.md
+++ b/modules/core/docs/authproc_cardinality.md
@@ -7,6 +7,8 @@ This filter should contain a set of attribute name => rule pairs describing the
 
 The special parameter `%ignoreEntities` can be used to give an array of entity IDs that should be ignored for testing, etc purposes.
 
+A separate [`core:CardinalitySingle`](./core:authproc_cardinalitysingle) authproc filter provides additional functionality for the special case where attributes are single valued.
+
 Specifying Rules
 ----------------
 
diff --git a/modules/core/docs/authproc_cardinalitysingle.md b/modules/core/docs/authproc_cardinalitysingle.md
index 4a61bdbc5aaca4579729fc0bafec6b6976a2efea..62d2fa7998b666f9d1a0ae1ed63f0d1452e986bd 100644
--- a/modules/core/docs/authproc_cardinalitysingle.md
+++ b/modules/core/docs/authproc_cardinalitysingle.md
@@ -2,7 +2,7 @@
 ========================
 
 Ensure the correct cardinality of single-valued attributes. This filter is a special case
-of the more generic [core:Cardinality] filter that allows for optional corrective measures
+of the more generic [`core:Cardinality`](./core:authproc_cardinality) filter that allows for optional corrective measures
 when multi-valued attributes are received where single-valued ones are expected.
 
 Parameters