From 3fd1ba0304f07f97d7e116d4057a529216e73143 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Mon, 3 Dec 2012 12:28:01 +0000
Subject: [PATCH] docs: Fix documentation for NameIDFormat in SAML 2.0 SP
 remote reference.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3209 44740490-163a-0410-bde0-09ae8108e29a
---
 docs/simplesamlphp-reference-sp-remote.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/simplesamlphp-reference-sp-remote.txt b/docs/simplesamlphp-reference-sp-remote.txt
index 052cf3c1f..9fbdcef60 100644
--- a/docs/simplesamlphp-reference-sp-remote.txt
+++ b/docs/simplesamlphp-reference-sp-remote.txt
@@ -168,8 +168,8 @@ The following SAML 2.0 options are available:
     `FALSE`.
 
 `NameIDFormat`
-:   The `NameIDFormat` this SP should receive. There are three values
-    for NameIDFormat which is supported by simpleSAMLphp:
+:   The `NameIDFormat` this SP should receive. The three most commonly
+    used values are:
 
 :   1.  `urn:oasis:names:tc:SAML:2.0:nameid-format:transient`
     2.  `urn:oasis:names:tc:SAML:2.0:nameid-format:persistent`
@@ -178,9 +178,9 @@ The following SAML 2.0 options are available:
 :   The `transient` format will generate a new unique ID every time
     the SP logs in.
 
-:   The `persistent` and `email` formats will use the attribute
-    specified in the `simplesaml.nameidattribute`-option as the value
-    of the ID.
+:   To properly support the `persistent` and `emailAddress` formats,
+    you should configure [NameID generation filters](./saml:nameid)
+    on your IdP.
 
 `nameid.encryption`
 :   Whether NameIDs sent to this SP should be encrypted. The default
-- 
GitLab