From 27b63222c0baad93470dc890c067964f63b74c6e Mon Sep 17 00:00:00 2001
From: KATO Tomoyuki <kato.tomoyuki@jp.fujitsu.com>
Date: Mon, 7 Mar 2016 10:49:52 +0900
Subject: [PATCH] [glossary] update core and optional service definition

To reflect the current DefCore definition.

Change-Id: I0b1004313bd45bf63778d82b8c84438dba1bb2fa
---
 doc/glossary/glossary-terms.xml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index ef9e989952..588398ad3d 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -2178,20 +2178,17 @@
     </glossentry>
 
     <glossentry>
-      <glossterm>core project</glossterm>
+      <glossterm>core service</glossterm>
       <indexterm class="singular">
-          <primary>core project</primary>
+          <primary>core service</primary>
         </indexterm>
 
       <glossdef>
-        <para>An official OpenStack project. Currently consists of Compute
-        (nova), Object Storage (swift), Image service (glance), Identity
-        (keystone), Dashboard (horizon), Networking (neutron), and Block
-        Storage (cinder), Telemetry (ceilometer), Orchestration (heat),
-        Database service (trove), Bare Metal service (ironic),
-        Data processing service (sahara). However, this
-        definition is changing based on
-        community discussions about the "Big Tent".
+        <para>An official OpenStack service defined as core by
+        DefCore Committee. Currently, consists of
+        Block Storage service (cinder), Compute service (nova),
+        Identity service (keystone), Image service (glance),
+        Networking service (neutron), and Object Storage service (swift).
         </para>
       </glossdef>
     </glossentry>
@@ -6453,6 +6450,22 @@
       </glossdef>
     </glossentry>
 
+    <glossentry>
+      <glossterm>optional service</glossterm>
+      <indexterm class="singular">
+          <primary>optional service</primary>
+        </indexterm>
+
+      <glossdef>
+        <para>An official OpenStack service defined as optional by
+        DefCore Committee. Currently, consists of
+        Dashboard (horizon), Telemetry service (Telemetry),
+        Orchestration service (heat), Database service (trove),
+        Bare Metal service (ironic), and so on.
+        </para>
+      </glossdef>
+    </glossentry>
+
     <glossentry>
       <glossterm>Orchestration</glossterm>
       <indexterm class="singular">