Bug 11926: Follow-up - remove SearchEngine pref / fix POD

[koha-ffzg.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 c57e4c9..2e566e7 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
@@ -1,12 +1,11 @@
 Administration:
-# Broken, omitted: libraryAddress, MIME, OpacMaintenance
 # Only used internally, omitted: FrameworksLoaded, Version
     Interface options:
         -
             - 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
@@ -43,17 +42,10 @@ Administration:
             - staff and patrons to create and view saved lists of books.
     Login options:
         -
-            - pref: insecure
-              default: 0
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - staff to access the staff client without logging in. Enabling this is dangerous, and should not be done in production environments.
-        -
             - 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
@@ -70,17 +62,80 @@ Administration:
                   mysql: in the MySQL database.
                   Pg: in the PostgreSQL database (not supported).
                   tmp: as temporary files.
+                  memcached: in a memcached server.
         -
-            - Control staff access to pages within Koha based on
-            - pref: GranularPermissions
-              default: 0
-              choices:
-                  yes: the specific page.
-                  no: the general module (such as administration or circulation).
-        -
-            - pref: IndependantBranches
+            - pref: IndependentBranches
               default: 0
               choices:
                   yes: Prevent
                   no: "Don't prevent"
             - staff (but not superlibrarians) from modifying objects (holds, items, patrons, etc.) belonging to other libraries.
+    CAS Authentication:
+        -
+            - pref: casAuthentication
+              default: 0
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - CAS for login authentication.
+        -
+            - pref: casLogout
+              default: 0
+              choices:
+                  yes: Logout
+                  no: "Don't Logout"
+            - of CAS when logging out of Koha.
+        -
+            - The CAS Authentication Server can be found at
+            - 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
+    Usage Stats:
+        -
+            - pref: UsageStatsShare
+              default: 0
+              choices:
+                  yes: Share
+                  no: "Don't share"
+            - data volumetry with Koha community. You can see the data on the <a href="http://hea.koha-community.org">Hea Koha community website</a>.
+        -
+            - The library name
+            - pref: UsageStatsLibraryName
+            - will be shown on <a href="http://hea.koha-community.org">Hea Koha community website</a>.
+            - If this name is empty, you will sent data anonymously
+            - Note that this value has no effect if UsageStatsShare system preference is set to "Don't share"
+        -
+            - The country where your library is
+            - pref: UsageStatsCountry
+            - will be shown on <a href="http://hea.koha-community.org">Hea Koha community website</a>.
+            - Note that this value has no effect if UsageStatsShare system preference is set to "Don't share"
+        -
+            - The library url
+            - pref: UsageStatsLibraryUrl
+            - will be shown on <a href="http://hea.koha-community.org">Hea Koha community website</a>.
+            - Note that this value has no effect if UsageStatsShare system preference is set to "Don't share"
+
+        -
+            - The library type
+            - pref: UsageStatsLibraryType
+              default: public
+              choices:
+                  public: "public"
+                  university: "university"
+            - will be shown on <a href="http://hea.koha-community.org">Hea Koha community website</a>.
+            - Note that this value has no effect if UsageStatsShare system preference is set to "Don't share"