From 25073d2b21bccd0b4ad8668e71fa9bca97adad0e Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 20 Aug 2008 05:42:14 +0000
Subject: [PATCH] Document that name & description of remote SP/IdP can contain
 multiple translations.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@819 44740490-163a-0410-bde0-09ae8108e29a
---
 docs/source/simplesamlphp-idp.xml |  9 ++++++---
 docs/source/simplesamlphp-sp.xml  | 10 ++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/source/simplesamlphp-idp.xml b/docs/source/simplesamlphp-idp.xml
index d04bff698..c3d4c9a35 100644
--- a/docs/source/simplesamlphp-idp.xml
+++ b/docs/source/simplesamlphp-idp.xml
@@ -773,8 +773,9 @@ openssl x509 -req -days 60 -in server2.csr -signkey server2.key -out server2.crt
             <glossterm>name</glossterm>
 
             <glossdef>
-              <para>A descriptive name of the SP. (Used in the consent
-              module)</para>
+              <para>A descriptive name of the SP. This can be a string, or an
+              associative array with language code =&gt; translation
+              pairs.</para>
             </glossdef>
           </glossentry>
 
@@ -782,7 +783,9 @@ openssl x509 -req -days 60 -in server2.csr -signkey server2.key -out server2.crt
             <glossterm>description</glossterm>
 
             <glossdef>
-              <para>A longer description of the SP. (Not used)</para>
+              <para>A longer description of the SP. This can be a string, or an
+              associative array with language code =&gt; translation
+              pairs.</para>
             </glossdef>
           </glossentry>
 
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index 80767bc35..bd26fff71 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -397,8 +397,9 @@
             <glossterm>name</glossterm>
 
             <glossdef>
-              <para>A textual name of the IdP. This name is used in the SAML
-              2.0 discovery service.</para>
+              <para>A textual name of the IdP.  This can contain a string or an
+              associative array of language code =&gt; translation pairs. This
+              name is used in the SAML 2.0 discovery service.</para>
             </glossdef>
           </glossentry>
 
@@ -406,8 +407,9 @@
             <glossterm>description</glossterm>
 
             <glossdef>
-              <para>A longer description of the IdP. The description is used
-              in the SAML 2.0 discovery service.</para>
+              <para>A longer description of the IdP. This can contain a string
+              or an associative array of language code =&gt; translation pairs.
+              The description is used in the SAML 2.0 discovery service.</para>
             </glossdef>
           </glossentry>
 
-- 
GitLab