From: Zhanna Tsitkov <tsitkova@mit.edu>
Date: Sat, 5 May 2012 15:41:00 +0000 (+0000)
Subject: For typedef documents in Sphinx do not add short description to the titles
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b5307c133a1ef3183f772dc2c20e09cc1e529772;p=krb5.git

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 6e9249597..9f9048e82 100644
--- 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 1be6465d2..3a0036e44 100644
--- 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