From ac0fff0636de505ec428dd37a25ab440f11bb416 Mon Sep 17 00:00:00 2001
From: Mark <mark.craig@forgerock.com>
Date: Tue, 01 Sep 2015 14:27:29 +0000
Subject: [PATCH] Merge pull request #6 in OPENDJ/opendj from ~MARK/opendj:bugfix/OPENDJ-2255 to master

---
 docs/src/main/docbkx/admin-guide/chap-monitoring.xml |   43 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/docs/src/main/docbkx/admin-guide/chap-monitoring.xml b/docs/src/main/docbkx/admin-guide/chap-monitoring.xml
index 075e71f..7e9e095 100644
--- a/docs/src/main/docbkx/admin-guide/chap-monitoring.xml
+++ b/docs/src/main/docbkx/admin-guide/chap-monitoring.xml
@@ -28,13 +28,44 @@
          xsi:schemaLocation='http://docbook.org/ns/docbook
                              http://docbook.org/xml/5.0/xsd/docbook.xsd'
          xmlns:xlink='http://www.w3.org/1999/xlink'>
- <title>Monitoring, Logging, &amp; Alerts</title>
-
- <para>This chapter describes the monitoring capabilities that OpenDJ
- implements, and shows how to configure them.</para>
+ <title>Monitoring, Logging, and Alerts</title>
 
  <indexterm><primary>Monitoring</primary></indexterm>
 
+ <itemizedlist>
+  <para>
+   This chapter covers OpenDJ monitoring capabilities.
+   In this chapter you will learn to:
+  </para>
+
+  <listitem>
+   <para>
+    Access monitoring information
+    over Lightweight Directory Access Protocol (LDAP),
+    over Simple Network Monitoring Protocol (SNMP),
+    and though use of Java Management Extensions (JMX)
+   </para>
+  </listitem>
+
+  <listitem>
+   <para>
+    Monitor directory server status, including status of directory server tasks
+   </para>
+  </listitem>
+
+  <listitem>
+   <para>
+    Configure directory server logs and interpret the messages they contain
+   </para>
+  </listitem>
+
+  <listitem>
+   <para>
+    Configure email settings for administrative alert notifications
+   </para>
+  </listitem>
+ </itemizedlist>
+
  <para>OpenDJ Control Panel provides basic monitoring capabilities under
  Monitoring &gt; General Information, Monitoring &gt; Connection Handler, and
  Monitoring &gt; Manage Tasks. This chapter covers the other options for
@@ -249,7 +280,7 @@
  </section>
 
  <section xml:id="monitoring-status-and-tasks">
-  <title>Server Operation &amp; Tasks</title>
+  <title>Server Operation and Tasks</title>
 
   <para>
    OpenDJ comes with two commands for monitoring server processes and tasks.
@@ -589,7 +620,7 @@
   to control what gets logged.</para>
 
   <section xml:id="log-rotation">
-   <title>Log Rotation &amp; Retention</title>
+   <title>Log Rotation and Retention</title>
 
    <para>Each file-based log can be associated with a <firstterm>log rotation
    policy</firstterm>, and a <firstterm>log retention policy</firstterm>. The

--
Gitblit v1.10.0