From c4eab90e458a9444b3b7358cee01b8124f61e471 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 26 Nov 2014 07:41:56 +0000
Subject: [PATCH] Backport CR-5453 OPENDJ-1643 Add definitions for suffix and branch in the glossary
---
opends/src/main/docbkx/shared/glossary.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/opends/src/main/docbkx/shared/glossary.xml b/opends/src/main/docbkx/shared/glossary.xml
index ac0a695..6d4ec49 100644
--- a/opends/src/main/docbkx/shared/glossary.xml
+++ b/opends/src/main/docbkx/shared/glossary.xml
@@ -20,16 +20,16 @@
!
! CCPL HEADER END
!
- ! Copyright 2012 ForgeRock AS
+ ! Copyright 2012-2014 ForgeRock AS
!
-->
<glossary xml:id='glossary'
- xmlns='http://docbook.org/ns/docbook'
- version='5.0' xml:lang='en'
- xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
- xmlns:xlink='http://www.w3.org/1999/xlink'
- xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ xmlns='http://docbook.org/ns/docbook'
+ version='5.0' xml:lang='en'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ 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>OpenDJ Glossary</title>
<glossentry>
@@ -189,6 +189,26 @@
</glossentry>
<glossentry>
+ <glossterm>Branch</glossterm>
+ <glossdef>
+ <para>
+ The distinguished name (DN) of a non-leaf entry
+ in the Directory Information Tree (DIT),
+ and also that entry and all its subordinates taken together.
+ </para>
+
+ <para>
+ Some administrative operations allow you to include or exclude branches
+ by specifying the DN of the branch.
+ </para>
+
+ <para>
+ See also <xref linkend="suffix" />.
+ </para>
+ </glossdef>
+ </glossentry>
+
+ <glossentry>
<glossterm>Collective attribute</glossterm>
<glossdef>
<para>A standard mechanism for defining attributes that appear on all the
@@ -259,6 +279,17 @@
</glossdef>
</glossentry>
+ <glossentry>
+ <glossterm>Directory Information Tree (DIT)</glossterm>
+ <glossdef>
+ <para>
+ A set of directory entries organized hierarchically in a tree structure,
+ where the vertices are the entries
+ and the arcs between vertices define relationships between entries
+ </para>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="directory-manager">
<glossterm>Directory manager</glossterm>
<glossdef>
@@ -779,6 +810,19 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="suffix">
+ <glossterm>Suffix</glossterm>
+ <glossdef>
+ <para>
+ The distinguished name (DN) of a root entry
+ in the Directory Information Tree (DIT),
+ and also that entry and all its subordinates taken together
+ as a single object of administrative tasks
+ such as export, import, indexing, and replication.
+ </para>
+ </glossdef>
+ </glossentry>
+
<glossentry>
<glossterm>Task</glossterm>
<glossdef>
--
Gitblit v1.10.0