Merge "Move XML entity file to glossary"

doc/glossary/glossary-terms.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glossary [
-<!ENTITY % openstack SYSTEM "../common/entities/openstack.ent">
+<!ENTITY % openstack SYSTEM "./openstack.ent">
 %openstack;
 ]>
 

doc/glossary/openstack.ent

@@ -1,5 +1,5 @@
 <!-- The master of this file is in openstack-manuals repository, file
-     doc/common/entities/openstack.ent.
+     doc/glossary/openstack.ent.
      Any changes to the master file will override changes in other
      repositories. -->
 <!-- Some useful entities borrowed from HTML -->

tools/sync-projects.sh

@@ -58,12 +58,12 @@ function copy_glossary_xml {
     # currently while the ha-guide is additionally translated to zh_CN.
     # Training-guides is not translated at all.
     cp doc/glossary/locale/{ja,zh_CN}.po $GLOSSARY_DIR/locale/
-    sed -i -e "s|\"../common/entities/openstack.ent\"|\"../$ENT_DIR/openstack.ent\"|" \
+    sed -i -e "s|\"./openstack.ent\"|\"../$ENT_DIR/openstack.ent\"|" \
         $GLOSSARY_DIR/glossary-terms.xml
     (cd $PROJECT_DIR; git add $GLOSSARY_SUB_DIR)
 
     # Sync entitites file
-    cp doc/common/entities/openstack.ent $GLOSSARY_DIR/../$ENT_DIR/
+    cp doc/glossary/openstack.ent $GLOSSARY_DIR/../$ENT_DIR/
 
     # Add files
     (cd $PROJECT_DIR; git add $GLOSSARY_SUB_DIR \