diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index 513fb347..77cfb618 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -1,3 +1,4 @@
+ * Doc tool now creates pages for global Booleans and global tunables.
* Doc tool now links directly to the interface/template in the
module page when it is selected in the interface/template index.
* Added support for layer summaries.
diff --git a/refpolicy/doc/templates/global_bool_list.html b/refpolicy/doc/templates/global_bool_list.html
index 4272ddd1..9a31b2b3 100644
--- a/refpolicy/doc/templates/global_bool_list.html
+++ b/refpolicy/doc/templates/global_bool_list.html
@@ -2,7 +2,10 @@
[[for bool in booleans]]
-Name: [[bool['bool_name']]]
-Default Value: [[bool['def_val']]]
+
[[bool['bool_name']]]
+
Default Value: [[bool['def_val']]]
+[[if bool['desc']]]
+
[[bool['desc']]]
+[[end]]
[[end]]
diff --git a/refpolicy/doc/templates/global_tun_list.html b/refpolicy/doc/templates/global_tun_list.html
index 9a8c62e1..895acfa1 100644
--- a/refpolicy/doc/templates/global_tun_list.html
+++ b/refpolicy/doc/templates/global_tun_list.html
@@ -2,7 +2,10 @@
[[for tun in tunables]]
-Name: [[tun['tun_name']]]
-Default Value: [[tun['def_val']]]
+
[[tun['tun_name']]]
+
Default Value: [[tun['def_val']]]
+[[if tun['desc']]]
+
[[tun['desc']]]
+[[end]]
[[end]]
diff --git a/refpolicy/support/sedoctool.py b/refpolicy/support/sedoctool.py
index d0d981b3..b2a83b53 100755
--- a/refpolicy/support/sedoctool.py
+++ b/refpolicy/support/sedoctool.py
@@ -565,8 +565,10 @@ def gen_docs(doc, working_dir, templatedir):
if tunable.parentNode.nodeName == "policy":
tunable_name = tunable.getAttribute("name")
default_value = tunable.getAttribute("dftval")
+ description = format_html_desc(tunable)
global_tun_buf.append( { "tun_name" : tunable_name,
- "def_val" : default_value } )
+ "def_val" : default_value,
+ "desc" : description } )
global_tun_buf.sort(tun_cmp)
global_tun_tpl = pyplate.Template(tunlistdata)
global_tun_buf = global_tun_tpl.execute_string({"tunables" : global_tun_buf})
@@ -587,8 +589,10 @@ def gen_docs(doc, working_dir, templatedir):
if boolean.parentNode.nodeName == "policy":
bool_name = boolean.getAttribute("name")
default_value = boolean.getAttribute("dftval")
+ description = format_html_desc(boolean)
global_bool_buf.append( { "bool_name" : bool_name,
- "def_val" : default_value } )
+ "def_val" : default_value,
+ "desc" : description } )
global_bool_buf.sort(bool_cmp)
global_bool_tpl = pyplate.Template(boollistdata)
global_bool_buf = global_bool_tpl.execute_string({"booleans" : global_bool_buf})