Fix last metions of userid/.attribute

docs/simplesamlphp-metadata-pdostoragehandler.md

@@ -62,7 +62,7 @@ As an example, here is the saml20_idp_hosted table:
 
 entity_id       | entity_data
 ----------------|-------------------------------------------------------------------------------------------------------------------------
-`__DEFAULT:1__` | {"host":"\_\_DEFAULT\_\_","privatekey":"idp.key","certificate":"idp.crt","auth":"example-ldap","userid.attribute":"uid"}
+`__DEFAULT:1__` | {"host":"\_\_DEFAULT\_\_","privatekey":"idp.key","certificate":"idp.crt","auth":"example-ldap","identifyingAttribute":"uid"}
 
 Another example is the saml20_idp_remote table:
 

docs/simplesamlphp-reference-idp-hosted.md

@@ -138,14 +138,6 @@ Common options
     A scope can either be a domain name or a regular expression
     matching a number of domains.
 
-`userid.attribute`
-:   The attribute name of an attribute which uniquely identifies
-    the user. This attribute is used if SimpleSAMLphp needs to generate
-    a persistent unique identifier for the user. This option can be set
-    in both the IdP-hosted and the SP-remote metadata. The value in the
-    SP-remote metadata has the highest priority. The default value is
-    `eduPersonPrincipalName`.
-
 
 SAML 2.0 options
 ----------------

docs/simplesamlphp-reference-sp-remote.md

@@ -98,14 +98,6 @@ The following options can be set:
 
 :   *Note*: **deprecated** Will be removed in a future release; use the MDUI-extension instead
 
-`userid.attribute`
-:   The attribute name of an attribute which uniquely identifies
-    the user. This attribute is used if SimpleSAMLphp needs to generate
-    a persistent unique identifier for the user. This option can be set
-    in both the IdP-hosted and the SP-remote metadata. The value in the
-    SP-remote metadata has the highest priority. The default value is
-    `eduPersonPrincipalName`.
-
 `AssertionConsumerService`
 :   The URL of the AssertionConsumerService endpoint for this SP.
     This option is required - without it you will not be able to send

modules/core/docs/authproc_targetedid.md

@@ -3,15 +3,13 @@
 
 This filter generates the `eduPersonTargetedID` attribute for the user.
 
-By default, this filter will use the contents of the attribute set by the `userid.attribute` metadata option as the unique user ID.
-You can also use a different attribute by setting the `attributename` option,
+This filter will use the contents of the attribute set by the `attributename` option as the unique user ID.
 
 Parameters
 ----------
 
 `attributename`
 :   The name of the attribute we should use for the unique user identifier.
-    Optional, will use the attribute set by the `userid.attribute` metadata option by default.
 
     Note: only the first value of the specified attribute is being used for the generation of the identifier.
 
@@ -24,14 +22,6 @@ Parameters
 Examples
 --------
 
-Using the attribute from `userid.attribute`:
-
-    'authproc' => array(
-        50 => array(
-            'class' => 'core:TargetedID',
-        ),
-    ),
-
 A custom attribute:
 
     'authproc' => array(