From 360f22a5692c5a669bff75a98fdfaa02e7baa956 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 06 Sep 2011 09:40:02 +0000
Subject: [PATCH] Fix for OPENDJ-273: Account status notification makes more sense in the Account Lockout chapter rather than the Password Policy chapter

---
 opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml |   41 ++++++++++++++++++++
 opendj3/src/main/docbkx/admin-guide/chap-pwd-policy.xml      |   32 ----------------
 2 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml b/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml
index a4e5384..bc7c14b 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml
@@ -142,6 +142,45 @@
    </step>
   </procedure>
  </section>
-
+ 
+ <section>
+  <title>Managing Account Status Notification</title>
+  
+  <para>OpenDJ can send mail about account status changes. OpenDJ needs an
+  SMTP server to send messages. By default, message templates are in
+  English.</para>
+  
+  <procedure>
+   <title>To Mail Users About Account Status</title>
+   
+   <step>
+    <para>Identify the SMTP server to which OpenDJ sends messages.</para>
+    <screen>$ dsconfig -p 4444 -h `hostname` -D "cn=Directory Manager" -w password
+ set-global-configuration-prop --set smtp-server:smtp.example.com -X -n</screen>
+   </step>
+   
+   <step>
+    <para>Set up OpenDJ to be able to mail users about account status.</para>
+    <screen>dsconfig -p 4444 -h `hostname` -D "cn=Directory Manager" -w password
+ set-account-status-notification-handler-prop
+ --handler-name "SMTP Handler" --set enabled:true
+ --set email-address-attribute-type:mail -X -n</screen>
+    <para>You can also configure the <literal>message-subject</literal> and
+    <literal>message-template-file</literal> properties. Try interactive
+    mode if you plan to do so.</para>
+    <para>You find templates for messages by default under the
+    <filename>config/messages</filename> directory. You can edit the templates
+    to suit your purposes.</para>
+   </step>
+   
+   <step>
+    <para>Adjust applicable password policies to use the account status
+    notification handler you configured.</para>
+    <screen>$ dsconfig -p 4444 -h `hostname` -D "cn=Directory Manager" -w password
+ set-password-policy-prop --policy-name "Default Password Policy"
+ --set account-status-notification-handler:"SMTP Handler" -X -n</screen>
+   </step>
+  </procedure>
+ </section>
 </chapter>
 
diff --git a/opendj3/src/main/docbkx/admin-guide/chap-pwd-policy.xml b/opendj3/src/main/docbkx/admin-guide/chap-pwd-policy.xml
index e8b4d2b..871f8d7 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-pwd-policy.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-pwd-policy.xml
@@ -330,38 +330,6 @@
 pwdPolicySubentry: cn=Root Password Policy,cn=Password Policies,cn=config</screen>
    </step>
   </procedure>
-  
-  <procedure>
-   <title>To Mail Users About Account Status</title>
-   
-   <step>
-    <para>Identify the SMTP server to which OpenDJ sends messages.</para>
-    <screen>$ dsconfig -p 4444 -h `hostname` -D "cn=Directory Manager" -w password
- set-global-configuration-prop --set smtp-server:smtp.example.com -X -n</screen>
-   </step>
-   
-   <step>
-    <para>Set up OpenDJ to be able to mail users about account status.</para>
-    <screen>dsconfig -p 4444 -h `hostname` -D "cn=Directory Manager" -w password
- set-account-status-notification-handler-prop
- --handler-name "SMTP Handler" --set enabled:true
- --set email-address-attribute-type:mail -X -n</screen>
-    <para>You can also configure the <literal>message-subject</literal> and
-    <literal>message-template-file</literal> properties. Try interactive
-    mode if you plan to do so.</para>
-    <para>You find templates for messages by default under the
-    <filename>config/messages</filename> directory. You can edit the templates
-    to suit your purposes.</para>
-   </step>
-   
-   <step>
-    <para>Adjust applicable password policies to use the account status
-    notification handler you configured.</para>
-    <screen>$ dsconfig -p 4444 -h `hostname` -D "cn=Directory Manager" -w password
- set-password-policy-prop --policy-name "Default Password Policy"
- --set account-status-notification-handler:"SMTP Handler" -X -n</screen>
-   </step>
-  </procedure>
  </section>
 </chapter>
 

--
Gitblit v1.10.0