From 68e3b3f076b17f8b5dd39a1f214cf4c3f2c3b40c Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 9 Mar 2019 11:27:49 +0100
Subject: [PATCH] base URL

---
 lam/HISTORY                                   |  1 +
 .../manual-sources/chapter-installation.xml   |  8 ++++++
 .../manual-sources/chapter-selfService.xml    | 28 +++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/lam/HISTORY b/lam/HISTORY
index e6a3cf2f..08b204d2 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -4,6 +4,7 @@ March 2019
   - PHP 7.3 support
   - LAM Pro:
    -> New self service fields: Mail routing (Local address) and Windows (Proxy-Addresses)
+   -> Base URL for emails in self service can be configured in self service profile
    -> Bind DLZ: support DNAME+XFR records and descriptions in records (requires latest LDAP schema)
    -> Cron jobs: added Shadow account expiration notification jobs
    -> New self service fields: Shadow account expiration date, mail routing address, Windows mail alias, Unix + group of names memberships
diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml
index 24904fad..738fb662 100644
--- a/lam/docs/manual-sources/chapter-installation.xml
+++ b/lam/docs/manual-sources/chapter-installation.xml
@@ -574,6 +574,14 @@
       version. Unless explicitly noticed there is no need to install an
       intermediate release.</para>
 
+      <section>
+        <title>6.6 -&gt; 6.7</title>
+
+        <para>Self service: please verify the self service base URL in your
+        self service profiles in case you have password self reset / user self
+        registration enabled.</para>
+      </section>
+
       <section>
         <title>6.5 -&gt; 6.6</title>
 
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index 674a8b06..5eda826f 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -204,6 +204,34 @@
               url="http://httpd.apache.org/docs/2.2/howto/auth.html">link</ulink>.</entry>
             </row>
 
+            <row>
+              <entry>Default language</entry>
+
+              <entry>This language is preselected on login.</entry>
+            </row>
+
+            <row>
+              <entry>Enforce language</entry>
+
+              <entry>Disables language selection and uses default
+              language.</entry>
+            </row>
+
+            <row>
+              <entry>Time zone</entry>
+
+              <entry>Please provide your time zone.</entry>
+            </row>
+
+            <row>
+              <entry>Base URL</entry>
+
+              <entry>Please enter the base URL of your webserver (e.g.
+              https://www.example.com). This is used to generate links in
+              emails for password self reset and user self
+              registration.</entry>
+            </row>
+
             <row>
               <entry>Login attribute label</entry>