For typedef documents in Sphinx do not add short description to the titles

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25850 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/doc/rst_tools/define_document.tmpl b/doc/rst_tools/define_document.tmpl
index 6e9249597dcf415b1d05b71f87d131c8bea353dd..9f9048e82b134f537d2ff81d7859adf0125ed9ca 100644 (file)
--- a/doc/rst_tools/define_document.tmpl
+++ b/doc/rst_tools/define_document.tmpl
@@ -2,31 +2,22 @@
 
 .. $composite.macro_reference($composite.name):
 
-
-
-#if $composite.short_description is not None and len($composite.short_description)
-       #set $title = $composite.name + ' - ' + $composite.short_description
-#else
-       #set $title = $composite.name
-#end if
+#set $title = $composite.name
 $title
 #echo ''.join(['=']*len($title)) #
 
-
-
 ..
 .. data:: $composite.name
 ..
 
-#echo ''.join(['=']*len($composite.name)) + '== ======================' #
-$composite.name       $composite.initializer
-#echo ''.join(['=']*len($composite.name)) + '== ======================' #
-
+#if $composite.short_description is not None and len($composite.short_description)
+$composite.short_description
+#end if
 
 $composite.long_description
- 
 
-#if $composite.Id is not None 
+#echo ''.join(['=']*len($composite.name)) + '== ======================' #
+$composite.name       $composite.initializer
+#echo ''.join(['=']*len($composite.name)) + '== ======================' #
 
 
-#end if

diff --git a/doc/rst_tools/type_document.tmpl b/doc/rst_tools/type_document.tmpl
index 1be6465d2ce7d855150a156e8aec843d3b5889da..3a0036e44f0c53c93bb416fdf80d8337e7f4709d 100644 (file)
--- a/doc/rst_tools/type_document.tmpl
+++ b/doc/rst_tools/type_document.tmpl
@@ -2,33 +2,26 @@
 
 .. $composite.struct_reference($composite.name):
 
-
-
-#if $composite.short_description is not None and len($composite.short_description)
-       #set $title = $composite.name + ' - ' + $composite.short_description
-#else
-       #set $title = $composite.name
-#end if
+#set $title = $composite.name
 $title
 #echo ''.join(['=']*len($title)) #
 
-
-
 ..
 .. c:type:: $composite.name
 ..
 
+#if $composite.short_description is not None and len($composite.short_description)
+$composite.short_description
+#end if
+
+$composite.long_description
+
 Declaration
 ------------
 
 $composite.definition
 
-$composite.long_description
- 
-
 #if $composite.Id is not None 
-
-
 #if len($composite.attributes)
 
 Members