diff --git a/data/creole.dtd b/data/creole.dtd
index 8ca948f0a..f3b06fca9 100644
--- a/data/creole.dtd
+++ b/data/creole.dtd
@@ -215,6 +215,7 @@
+
diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index 6980364ab..ad5619e4b 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -566,6 +566,10 @@ class SpaceAnnotator(object):
leader_space.variable = []
leader_space.name = leader_name
leader_space.hidden = variable.hidden
+ if hasattr(group, 'description'):
+ leader_space.doc = group.description
+ else:
+ leader_space.doc = variable.description
variable.hidden = None
self.paths.append('family', leader_path + '.' + leader_name, namespace, creoleobj=leader_space)
# manage leader's variable
diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index ae39d8de2..5969ac991 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -513,8 +513,6 @@ class CreoleObjSpace(object):
for subspace in space:
if isinstance(subspace, self.Leadership):
_name = 'leader'
- subspace.doc = subspace.variable[0].description
- #subspace.doc = 'Leadership {}'.format(subspace.name)
else:
_name = name
if name in ['containers', 'variables', 'actions']:
diff --git a/tests/flattener_dicos/10load_masterslaves_description/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
new file mode 100644
index 000000000..d9d7866b6
--- /dev/null
+++ b/tests/flattener_dicos/10load_masterslaves_description/00-base.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ non
+
+
+
+
+
+
+
+
+
+
+ valfill
+
+
+ slave1
+
+
+ slave1
+ slave2
+
+
+
diff --git a/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
new file mode 100644
index 000000000..7c3624f51
--- /dev/null
+++ b/tests/flattener_dicos/10load_masterslaves_description/makedict/base.json
@@ -0,0 +1 @@
+{"creole.general.mode_conteneur_actif": "non", "creole.general1.master.master": [], "creole.general1.master.slave1": [], "creole.general1.master.slave2": []}
\ No newline at end of file
diff --git a/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
new file mode 100644
index 000000000..2197054a3
--- /dev/null
+++ b/tests/flattener_dicos/10load_masterslaves_description/result/00-base.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ normal
+
+ oui
+ non
+ mandatory
+ normal
+ non
+
+
+
+ normal
+
+ normal
+
+
+ normal
+
+ valfill
+
+
+
+ normal
+
+ creole.general1.master.slave1
+
+
+
+
+
+