Bug 9587 : Mozilla Persona login

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / preferences / admin.pref

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 3ef972b..afffb3a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -5,7 +5,7 @@ Administration:
             - Use
             - pref: KohaAdminEmailAddress
               class: email
-            - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular branch, and is referred to when an internal error occurs.)"
+            - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)"
         -
             - Show
             - pref: DebugLevel
@@ -52,7 +52,7 @@ Administration:
             - Automatically log out users after
             - pref: timeout
               class: integer
-            - seconds of inactivity.
+            - seconds of inactivity. Adding d will specify it in days, e.g. 1d is timeout of one day.
         -
             - pref: AutoLocation
               default: 0
@@ -69,6 +69,7 @@ Administration:
                   mysql: in the MySQL database.
                   Pg: in the PostgreSQL database (not supported).
                   tmp: as temporary files.
+                  memcached: in a memcached server.
         -
             - pref: IndependantBranches
               default: 0
@@ -93,4 +94,29 @@ Administration:
             - of CAS when logging out of Koha.
         -
             - The CAS Authentication Server can be found at
-            - pref: casServerUrl           
+            - pref: casServerUrl
+        -
+            - Use
+            - pref: AllowPkiAuth
+              default: None
+              choices:
+                  None: "no"
+                  Common Name: the Common Name
+                  emailAddress: the emailAddress
+            - field for SSL client certificate authentication
+    Mozilla Persona:
+        -
+            - pref: Persona
+              default: 0
+              choices:
+                  yes: Allow
+                  no: "Don't Allow"
+            - Mozilla persona for login
+    Search Engine:
+        -
+            - pref: SearchEngine
+              default: Zebra
+              choices:
+                Solr: Solr
+                Zebra: Zebra
+            - is the search engine used.