diff --git a/refpolicy/Changelog b/refpolicy/Changelog index d084d2e5..d0929edd 100644 --- a/refpolicy/Changelog +++ b/refpolicy/Changelog @@ -1,3 +1,4 @@ + * Fix handling of ordered and unordered HTML lists. * Corenetwork now supports multiple network interfaces having the same type. * Doc tool now creates pages for global Booleans and global tunables. diff --git a/refpolicy/doc/policy.dtd b/refpolicy/doc/policy.dtd index 4cffe9f3..46fab3e5 100644 --- a/refpolicy/doc/policy.dtd +++ b/refpolicy/doc/policy.dtd @@ -1,4 +1,4 @@ - + @@ -37,4 +37,5 @@ - + + diff --git a/refpolicy/support/sedoctool.py b/refpolicy/support/sedoctool.py index b2a83b53..1c0414b7 100755 --- a/refpolicy/support/sedoctool.py +++ b/refpolicy/support/sedoctool.py @@ -227,16 +227,14 @@ def format_html_desc(node): for desc in node.childNodes: if desc.nodeName == "#text": if desc.data is not '': - desc_buf += "
" + desc.data + "
" - elif desc.nodeName == "p": - if desc.firstChild.data is not '': - desc_buf += "" + desc.firstChild.data + "
" - for chld in desc.childNodes: - if chld.nodeName == "ul": - desc_buf += "" + desc.data + "
" + else: + desc_buf += desc.data + else: + desc_buf += "<" + desc.nodeName + ">" \ + + format_html_desc(desc) \ + + "" + desc.nodeName +">" return desc_buf