From 1f2bd7e66a0fb2ebb11e74382633c6bfe992d967 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 18 Oct 2013 15:07:04 +0000
Subject: [PATCH] password self reset schema

---
 lam/docs/manual-sources/howto.xml | 64 +++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 526bbc40..3b201d26 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -2220,19 +2220,45 @@ Have fun!
 
         <para><emphasis role="bold">Schema installation</emphasis></para>
 
-        <para>Please install the schema that comes with LAM Pro.</para>
+        <para>Please install the schema that comes with LAM Pro. The schema
+        files are located in:</para>
 
-        <para><emphasis role="underline">OpenLDAP:</emphasis></para>
+        <itemizedlist>
+          <listitem>
+            <para>tar.bz2: docs/schema</para>
+          </listitem>
 
-        <para>Install docs/schema/passwordSelfReset.schema for slapd.conf
-        configuration or docs/schema/passwordSelfReset.ldif for slapd.d
-        configuration.</para>
+          <listitem>
+            <para>DEB: /usr/share/doc/ldap-account-manager/docs/schema</para>
+          </listitem>
+
+          <listitem>
+            <para>RPM:
+            /usr/share/doc/ldap-account-manager-{VERSION}/schema</para>
+          </listitem>
+        </itemizedlist>
+
+        <para><literallayout>
+</literallayout><emphasis role="underline">OpenLDAP:</emphasis></para>
+
+        <para>For a configuration with slapd.conf-file copy
+        passwordSelfReset.schema to /etc/ldap/schema/ and add this line to
+        slapd.conf:</para>
+
+        <literallayout>  include         /etc/ldap/schema/passwordSelfReset.schema
+
+</literallayout>
+
+        <para>For slapd.d configurations copy passwordSelfReset.ldif to
+        /etc/ldap/slapd.d/cn=config/cn=schema/.</para>
+
+        <literallayout>
+</literallayout>
 
         <para><emphasis role="underline">Samba 4:</emphasis></para>
 
-        <para>The schema files are
-        docs/schema/passwordSelfReset-Samba4-attributes.ldif and
-        docs/schema/passwordSelfReset-Samba4-objectClass.ldif.</para>
+        <para>The schema files are passwordSelfReset-Samba4-attributes.ldif
+        and passwordSelfReset-Samba4-objectClass.ldif.</para>
 
         <para>First, you need to edit them and replace "DOMAIN_TOP_DN" with
         your LDAP suffix (e.g. dc=samba4,dc=test).</para>
@@ -2240,8 +2266,22 @@ Have fun!
         <para>Then install the attribute and afterwards the object class
         schema file:</para>
 
-        <literallayout>ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-attributes.ldif --option="dsdb:schema update allowed"=true
-ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-objectClass.ldif --option="dsdb:schema update allowed"=true
+        <literallayout>  ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-attributes.ldif --option="dsdb:schema update allowed"=true
+  ldbmodify -H /var/lib/samba/private/sam.ldb passwordSelfReset-Samba4-objectClass.ldif --option="dsdb:schema update allowed"=true
+
+</literallayout>
+
+        <para><emphasis role="underline">Windows:</emphasis></para>
+
+        <para>The schema file is passwordSelfReset-Windows.ldif.</para>
+
+        <para>First, you need to edit it and replace "DOMAIN_TOP_DN" with your
+        LDAP suffix (e.g. dc=windows,dc=test).</para>
+
+        <para>Then install the schema file as administrator on a command
+        line:</para>
+
+        <literallayout>  ldifde -v -i -f passwordSelfReset-Windows.ldif
 
 </literallayout>
 
@@ -6319,8 +6359,8 @@ Run slapindex to rebuild the index.
           will be created in the self service user suffix. The DN will look
           like this: <emphasis>uid=&lt;user name&gt;,...</emphasis></para>
 
-          <para>Please see <link linkend="mailEOL">email format
-          option</link> in case of broken mails.</para>
+          <para>Please see <link linkend="mailEOL">email format option</link>
+          in case of broken mails.</para>
         </section>
 
         <section>