summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Morken <olav.morken@uninett.no>2012-12-03 12:41:13 +0000
committerOlav Morken <olav.morken@uninett.no>2012-12-03 12:41:13 +0000
commitc046db1a038951b8023d3d8ecbacd6ca887b4beb (patch)
tree971dba92293f2ac37fd8bb7449250eefe02cd954
parent99a9c061df342b17e9848c050bf13a173b8b80b6 (diff)
downloadsimplesamlphp-c046db1a038951b8023d3d8ecbacd6ca887b4beb.zip
simplesamlphp-c046db1a038951b8023d3d8ecbacd6ca887b4beb.tar.gz
simplesamlphp-c046db1a038951b8023d3d8ecbacd6ca887b4beb.tar.bz2
docs: Fix documentation for NameIDFormat in SAML 2.0 SP remote reference.
Merged into 1.10-branch from r3209. git-svn-id: https://simplesamlphp.googlecode.com/svn/branches/simplesamlphp-1.10@3211 44740490-163a-0410-bde0-09ae8108e29a
-rw-r--r--docs/simplesamlphp-reference-sp-remote.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/simplesamlphp-reference-sp-remote.txt b/docs/simplesamlphp-reference-sp-remote.txt
index 052cf3c..9fbdcef 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