diff --git a/refpolicy/policy/modules/admin/consoletype.if b/refpolicy/policy/modules/admin/consoletype.if
index c4499cd..e29730a 100644
--- a/refpolicy/policy/modules/admin/consoletype.if
+++ b/refpolicy/policy/modules/admin/consoletype.if
@@ -1,7 +1,14 @@
+## <summary>
+##	Determine of the console connected to the controlling terminal.
+## </summary>
 
-#######################################
-#
-# consoletype_domtrans(domain)
+########################################
+## <desc>
+##	Execute consoletype in the consoletype domain.
+## </desc>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`consoletype_domtrans',`
 	gen_require(`
@@ -20,9 +27,13 @@ interface(`consoletype_domtrans',`
 	allow consoletype_t $1:process sigchld;
 ')
 
-#######################################
-#
-# consoletype_exec(domain)
+########################################
+## <desc>
+##	Execute consoletype in the caller domain.
+## </desc>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`consoletype_exec',`
 	gen_require(`
diff --git a/refpolicy/policy/modules/admin/netutils.if b/refpolicy/policy/modules/admin/netutils.if
index a6ba8dd..db3e743 100644
--- a/refpolicy/policy/modules/admin/netutils.if
+++ b/refpolicy/policy/modules/admin/netutils.if
@@ -1,3 +1,4 @@
+## <summary>Network analysis utilities</summary>
 
 #######################################
 #
diff --git a/refpolicy/policy/modules/apps/gpg.if b/refpolicy/policy/modules/apps/gpg.if
index 2f0ea69..08af7b0 100644
--- a/refpolicy/policy/modules/apps/gpg.if
+++ b/refpolicy/policy/modules/apps/gpg.if
@@ -366,4 +366,3 @@ template(`gpg_per_userdomain_template',`
 	') dnl end TODO
 ')
 
-
diff --git a/refpolicy/policy/modules/kernel/corenetwork.if.in b/refpolicy/policy/modules/kernel/corenetwork.if.in
index 7b58812..7a76bfc 100644
--- a/refpolicy/policy/modules/kernel/corenetwork.if.in
+++ b/refpolicy/policy/modules/kernel/corenetwork.if.in
@@ -1,9 +1,9 @@
 ## <summary>Policy controlling access to network objects</summary>
 
 ########################################
-## <desc>
-##	Send and receive TCP network traffic on the general interfaces.
-## </desc>
+## <summary>
+##	Send and receive TCP network traffic on the generic interfaces.
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -18,9 +18,13 @@ interface(`corenet_tcp_sendrecv_generic_if',`
 	allow $1 netif_t:netif { tcp_send tcp_recv };
 ')
 
-#######################################
-#
-# corenet_udp_send_generic_if(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on generic interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_generic_if',`
 	gen_require(`
@@ -31,9 +35,13 @@ interface(`corenet_udp_send_generic_if',`
 	allow $1 netif_t:netif udp_send;
 ')
 
-#######################################
-#
-# corenet_udp_receive_generic_if(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on generic interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_generic_if',`
 	gen_require(`
@@ -44,18 +52,26 @@ interface(`corenet_udp_receive_generic_if',`
 	allow $1 netif_t:netif udp_recv;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_generic_if(domain)
+########################################
+## <summary>
+##	Send and Receive UDP network traffic on generic interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_generic_if',`
 	corenet_udp_send_generic_if($1)
 	corenet_udp_receive_generic_if($1)
 ')
 
-#######################################
-#
-# corenet_raw_send_generic_if(domain)
+########################################
+## <summary>
+##	Send raw IP packets on generic interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_send_generic_if',`
 	gen_require(`
@@ -68,9 +84,13 @@ interface(`corenet_raw_send_generic_if',`
 	allow $1 self:capability net_raw;
 ')
 
-#######################################
-#
-# corenet_raw_receive_generic_if(domain)
+########################################
+## <summary>
+##	Receive raw IP packets on generic interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_receive_generic_if',`
 	gen_require(`
@@ -81,18 +101,26 @@ interface(`corenet_raw_receive_generic_if',`
 	allow $1 netif_t:netif rawip_recv;
 ')
 
-#######################################
-#
-# corenet_raw_sendrecv_generic_if(domain)
+########################################
+## <summary>
+##	Send and receive raw IP packets on generic interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_sendrecv_generic_if',`
 	corenet_raw_send_generic_if($1)
 	corenet_raw_receive_generic_if($1)
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_all_if(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_all_if',`
 	gen_require(`
@@ -103,9 +131,13 @@ interface(`corenet_tcp_sendrecv_all_if',`
 	allow $1 netif_type:netif { tcp_send tcp_recv };
 ')
 
-#######################################
-#
-# corenet_udp_send_all_if(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_all_if',`
 	gen_require(`
@@ -116,9 +148,13 @@ interface(`corenet_udp_send_all_if',`
 	allow $1 netif_type:netif udp_send;
 ')
 
-#######################################
-#
-# corenet_udp_receive_all_if(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_all_if',`
 	gen_require(`
@@ -129,18 +165,26 @@ interface(`corenet_udp_receive_all_if',`
 	allow $1 netif_type:netif udp_recv;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_all_if(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_all_if',`
 	corenet_udp_send_all_if($1)
 	corenet_udp_receive_all_if($1)
 ')
 
-#######################################
-#
-# corenet_raw_send_all_if(domain)
+########################################
+## <summary>
+##	Send raw IP packets on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_send_all_if',`
 	gen_require(`
@@ -153,9 +197,13 @@ interface(`corenet_raw_send_all_if',`
 	allow $1 self:capability net_raw;
 ')
 
-#######################################
-#
-# corenet_raw_receive_all_if(domain)
+########################################
+## <summary>
+##	Receive raw IP packets on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_receive_all_if',`
 	gen_require(`
@@ -166,18 +214,26 @@ interface(`corenet_raw_receive_all_if',`
 	allow $1 netif_type:netif rawip_recv;
 ')
 
-#######################################
-#
-# corenet_raw_sendrecv_all_if(domain)
+########################################
+## <summary>
+##	Send and receive raw IP packets on all interfaces.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_sendrecv_all_if',`
 	corenet_raw_send_all_if($1)
 	corenet_raw_receive_all_if($1)
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_generic_node(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_generic_node',`
 	gen_require(`
@@ -188,9 +244,13 @@ interface(`corenet_tcp_sendrecv_generic_node',`
 	allow $1 node_t:node { tcp_send tcp_recv };
 ')
 
-#######################################
-#
-# corenet_udp_send_generic_node(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_generic_node',`
 	gen_require(`
@@ -201,9 +261,13 @@ interface(`corenet_udp_send_generic_node',`
 	allow $1 node_t:node udp_send;
 ')
 
-#######################################
-#
-# corenet_udp_receive_generic_node(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_generic_node',`
 	gen_require(`
@@ -214,18 +278,26 @@ interface(`corenet_udp_receive_generic_node',`
 	allow $1 node_t:node udp_recv;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_generic_node(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_generic_node',`
 	corenet_udp_send_generic_node($1)
 	corenet_udp_receive_generic_node($1)
 ')
 
-#######################################
-#
-# corenet_raw_send_generic_node(domain)
+########################################
+## <summary>
+##	Send raw IP packets on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_send_generic_node',`
 	gen_require(`
@@ -236,9 +308,13 @@ interface(`corenet_raw_send_generic_node',`
 	allow $1 node_t:node rawip_send;
 ')
 
-#######################################
-#
-# corenet_raw_receive_generic_node(domain)
+########################################
+## <summary>
+##	Receive raw IP packets on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_receive_generic_node',`
 	gen_require(`
@@ -249,18 +325,26 @@ interface(`corenet_raw_receive_generic_node',`
 	allow $1 node_t:node rawip_recv;
 ')
 
-#######################################
-#
-# corenet_raw_sendrecv_generic_node(domain)
+########################################
+## <summary>
+##	Send and receive raw IP packets on generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_sendrecv_generic_node',`
 	corenet_raw_send_generic_node($1)
 	corenet_raw_receive_generic_node($1)
 ')
 
-#######################################
-#
-# corenet_tcp_bind_generic_node(domain)
+########################################
+## <summary>
+##	Bind TCP sockets to generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_bind_generic_node',`
 	gen_require(`
@@ -271,9 +355,13 @@ interface(`corenet_tcp_bind_generic_node',`
 	allow $1 node_t:tcp_socket node_bind;
 ')
 
-#######################################
-#
-# corenet_udp_bind_generic_node(domain)
+########################################
+## <summary>
+##	Bind UDP sockets to generic nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_bind_generic_node',`
 	gen_require(`
@@ -284,9 +372,13 @@ interface(`corenet_udp_bind_generic_node',`
 	allow $1 node_t:udp_socket node_bind;
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_all_nodes(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_all_nodes',`
 	gen_require(`
@@ -297,9 +389,13 @@ interface(`corenet_tcp_sendrecv_all_nodes',`
 	allow $1 node_type:node { tcp_send tcp_recv };
 ')
 
-#######################################
-#
-# corenet_udp_send_all_nodes(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_all_nodes',`
 	gen_require(`
@@ -310,9 +406,13 @@ interface(`corenet_udp_send_all_nodes',`
 	allow $1 node_type:node udp_send;
 ')
 
-#######################################
-#
-# corenet_udp_receive_all_nodes(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_all_nodes',`
 	gen_require(`
@@ -323,18 +423,26 @@ interface(`corenet_udp_receive_all_nodes',`
 	allow $1 node_type:node udp_recv;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_all_nodes(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_all_nodes',`
 	corenet_udp_send_all_nodes($1)
 	corenet_udp_receive_all_nodes($1)
 ')
 
-#######################################
-#
-# corenet_raw_send_all_nodes(domain)
+########################################
+## <summary>
+##	Send raw IP packets on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_send_all_nodes',`
 	gen_require(`
@@ -345,9 +453,13 @@ interface(`corenet_raw_send_all_nodes',`
 	allow $1 node_type:node rawip_send;
 ')
 
-#######################################
-#
-# corenet_raw_receive_all_nodes(domain)
+########################################
+## <summary>
+##	Receive raw IP packets on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_receive_all_nodes',`
 	gen_require(`
@@ -358,18 +470,26 @@ interface(`corenet_raw_receive_all_nodes',`
 	allow $1 node_type:node rawip_recv;
 ')
 
-#######################################
-#
-# corenet_raw_sendrecv_all_nodes(domain)
+########################################
+## <summary>
+##	Send and receive raw IP packets on all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_raw_sendrecv_all_nodes',`
 	corenet_raw_send_all_nodes($1)
 	corenet_raw_receive_all_nodes($1)
 ')
 
-#######################################
-#
-# corenet_tcp_bind_all_nodes(domain)
+########################################
+## <summary>
+##	Bind TCP sockets to all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_bind_all_nodes',`
 	gen_require(`
@@ -380,9 +500,13 @@ interface(`corenet_tcp_bind_all_nodes',`
 	allow $1 node_type:tcp_socket node_bind;
 ')
 
-#######################################
-#
-# corenet_udp_bind_all_nodes(domain)
+########################################
+## <summary>
+##	Bind UDP sockets to all nodes.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_bind_all_nodes',`
 	gen_require(`
@@ -393,9 +517,13 @@ interface(`corenet_udp_bind_all_nodes',`
 	allow $1 node_type:udp_socket node_bind;
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_generic_port(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on generic ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_generic_port',`
 	gen_require(`
@@ -406,9 +534,13 @@ interface(`corenet_tcp_sendrecv_generic_port',`
 	allow $1 port_t:tcp_socket { send_msg recv_msg };
 ')
 
-#######################################
-#
-# corenet_udp_send_generic_port(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on generic ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_generic_port',`
 	gen_require(`
@@ -419,9 +551,13 @@ interface(`corenet_udp_send_generic_port',`
 	allow $1 port_t:udp_socket send_msg;
 ')
 
-#######################################
-#
-# corenet_udp_receive_generic_port(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on generic ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_generic_port',`
 	gen_require(`
@@ -432,18 +568,26 @@ interface(`corenet_udp_receive_generic_port',`
 	allow $1 port_t:udp_socket recv_msg;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_generic_port(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on generic ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_generic_port',`
 	corenet_udp_send_generic_port($1)
 	corenet_udp_receive_generic_port($1)
 ')
 
-#######################################
-#
-# corenet_tcp_bind_generic_port(domain)
+########################################
+## <summary>
+##	Bind TCP sockets to generic ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_bind_generic_port',`
 	gen_require(`
@@ -454,9 +598,13 @@ interface(`corenet_tcp_bind_generic_port',`
 	allow $1 port_t:tcp_socket name_bind;
 ')
 
-#######################################
-#
-# corenet_udp_bind_generic_port(domain)
+########################################
+## <summary>
+##	Bind UDP sockets to generic ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_bind_generic_port',`
 	gen_require(`
@@ -467,9 +615,13 @@ interface(`corenet_udp_bind_generic_port',`
 	allow $1 port_t:udp_socket name_bind;
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_all_ports(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on all ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_all_ports',`
 	gen_require(`
@@ -480,9 +632,13 @@ interface(`corenet_tcp_sendrecv_all_ports',`
 	allow $1 port_type:tcp_socket { send_msg recv_msg };
 ')
 
-#######################################
-#
-# corenet_udp_send_all_ports(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on all ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_all_ports',`
 	gen_require(`
@@ -493,9 +649,13 @@ interface(`corenet_udp_send_all_ports',`
 	allow $1 port_type:udp_socket send_msg;
 ')
 
-#######################################
-#
-# corenet_udp_receive_all_ports(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on all ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_all_ports',`
 	gen_require(`
@@ -506,18 +666,26 @@ interface(`corenet_udp_receive_all_ports',`
 	allow $1 port_type:udp_socket recv_msg;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_all_ports(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on all ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_all_ports',`
 	corenet_udp_send_all_ports($1)
 	corenet_udp_receive_all_ports($1)
 ')
 
-#######################################
-#
-# corenet_tcp_bind_all_ports(domain)
+########################################
+## <summary>
+##	Bind TCP sockets to all ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_bind_all_ports',`
 	gen_require(`
@@ -528,9 +696,13 @@ interface(`corenet_tcp_bind_all_ports',`
 	allow $1 port_type:tcp_socket name_bind;
 ')
 
-#######################################
-#
-# corenet_udp_bind_all_ports(domain)
+########################################
+## <summary>
+##	Bind UDP sockets to all ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_bind_all_ports',`
 	gen_require(`
@@ -541,9 +713,13 @@ interface(`corenet_udp_bind_all_ports',`
 	allow $1 port_type:udp_socket name_bind;
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_reserved_port(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on generic reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_reserved_port',`
 	gen_require(`
@@ -554,9 +730,13 @@ interface(`corenet_tcp_sendrecv_reserved_port',`
 	allow $1 reserved_port_t:tcp_socket { send_msg recv_msg };
 ')
 
-#######################################
-#
-# corenet_udp_send_reserved_port(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on generic reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_reserved_port',`
 	gen_require(`
@@ -567,9 +747,13 @@ interface(`corenet_udp_send_reserved_port',`
 	allow $1 reserved_port_t:udp_socket send_msg;
 ')
 
-#######################################
-#
-# corenet_udp_receive_reserved_port(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on generic reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_reserved_port',`
 	gen_require(`
@@ -580,18 +764,26 @@ interface(`corenet_udp_receive_reserved_port',`
 	allow $1 reserved_port_t:udp_socket recv_msg;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_reserved_port(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on generic reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_reserved_port',`
 	corenet_udp_send_reserved_port($1)
 	corenet_udp_receive_reserved_port($1)
 ')
 
-#######################################
-#
-# corenet_tcp_bind_reserved_port(domain)
+########################################
+## <summary>
+##	Bind TCP sockets to generic reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_bind_reserved_port',`
 	gen_require(`
@@ -604,9 +796,13 @@ interface(`corenet_tcp_bind_reserved_port',`
 	allow $1 self:capability net_bind_service;
 ')
 
-#######################################
-#
-# corenet_udp_bind_reserved_port(domain)
+########################################
+## <summary>
+##	Bind UDP sockets to generic reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_bind_reserved_port',`
 	gen_require(`
@@ -619,9 +815,13 @@ interface(`corenet_udp_bind_reserved_port',`
 	allow $1 self:capability net_bind_service;
 ')
 
-#######################################
-#
-# corenet_tcp_sendrecv_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Send and receive TCP network traffic on all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_sendrecv_all_reserved_ports',`
 	gen_require(`
@@ -632,9 +832,13 @@ interface(`corenet_tcp_sendrecv_all_reserved_ports',`
 	allow $1 reserved_port_type:tcp_socket { send_msg recv_msg };
 ')
 
-#######################################
-#
-# corenet_udp_send_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Send UDP network traffic on all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_send_all_reserved_ports',`
 	gen_require(`
@@ -645,9 +849,13 @@ interface(`corenet_udp_send_all_reserved_ports',`
 	allow $1 reserved_port_type:udp_socket send_msg;
 ')
 
-#######################################
-#
-# corenet_udp_receive_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Receive UDP network traffic on all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_receive_all_reserved_ports',`
 	gen_require(`
@@ -658,18 +866,26 @@ interface(`corenet_udp_receive_all_reserved_ports',`
 	allow $1 reserved_port_type:udp_socket recv_msg;
 ')
 
-#######################################
-#
-# corenet_udp_sendrecv_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Send and receive UDP network traffic on all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_sendrecv_all_reserved_ports',`
 	corenet_udp_send_all_reserved_ports($1)
 	corenet_udp_receive_all_reserved_ports($1)
 ')
 
-#######################################
-#
-# corenet_tcp_bind_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Bind TCP sockets to all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_tcp_bind_all_reserved_ports',`
 	gen_require(`
@@ -682,9 +898,13 @@ interface(`corenet_tcp_bind_all_reserved_ports',`
 	allow $1 self:capability net_bind_service;
 ')
 
-#######################################
-#
-# corenet_dontaudit_tcp_bind_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Do not audit attempts to bind TCP sockets to all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process to not audit.
+## </param>
 #
 interface(`corenet_dontaudit_tcp_bind_all_reserved_ports',`
 	gen_require(`
@@ -695,9 +915,13 @@ interface(`corenet_dontaudit_tcp_bind_all_reserved_ports',`
 	dontaudit $1 reserved_port_type:tcp_socket name_bind;
 ')
 
-#######################################
-#
-# corenet_udp_bind_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Bind UDP sockets to all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
 #
 interface(`corenet_udp_bind_all_reserved_ports',`
 	gen_require(`
@@ -710,9 +934,13 @@ interface(`corenet_udp_bind_all_reserved_ports',`
 	allow $1 self:capability net_bind_service;
 ')
 
-#######################################
-#
-# corenet_dontaudit_udp_bind_all_reserved_ports(domain)
+########################################
+## <summary>
+##	Do not audit attempts to bind UDP sockets to all reserved ports.
+## </summary>
+## <param name="domain">
+##	The type of the process to not audit.
+## </param>
 #
 interface(`corenet_dontaudit_udp_bind_all_reserved_ports',`
 	gen_require(`
diff --git a/refpolicy/policy/modules/services/cron.if b/refpolicy/policy/modules/services/cron.if
index 1b6ef8a..60bd1a7 100644
--- a/refpolicy/policy/modules/services/cron.if
+++ b/refpolicy/policy/modules/services/cron.if
@@ -1,3 +1,4 @@
+## <summary>Periodic execution of scheduled commands.</summary>
 
 ########################################
 #
diff --git a/refpolicy/policy/modules/services/ssh.if b/refpolicy/policy/modules/services/ssh.if
index 338b827..3d92b4d 100644
--- a/refpolicy/policy/modules/services/ssh.if
+++ b/refpolicy/policy/modules/services/ssh.if
@@ -1,3 +1,5 @@
+## <summary>Secure shell client and server policy.</summary>
+
 template(`ssh_per_userdomain_template',`
 	##############################
 	#
@@ -438,6 +440,12 @@ template(`sshd_program_domain', `
 	') dnl end TODO
 ')
 
+########################################
+## <summary>Read ssh server keys</summary>
+## <param name="domain">
+##	The type of the process performing this action.
+## </param>
+#
 interface(`ssh_dontaudit_read_server_keys',`
 	gen_require(`
 		type sshd_key_t;
diff --git a/refpolicy/policy/modules/system/libraries.if b/refpolicy/policy/modules/system/libraries.if
index 06145f6..d3e8a70 100644
--- a/refpolicy/policy/modules/system/libraries.if
+++ b/refpolicy/policy/modules/system/libraries.if
@@ -1,9 +1,9 @@
 ## <summary>Policy for system libraries.</summary>
 
 ########################################
-## <desc>
+## <summary>
 ##	Execute ldconfig in the ldconfig domain.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -26,9 +26,9 @@ interface(`libs_domtrans_ldconfig',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Execute ldconfig in the ldconfig domain.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -51,10 +51,10 @@ interface(`libs_run_ldconfig',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Use the dynamic link/loader for automatic loading
 ##	of shared libraries.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -76,10 +76,10 @@ interface(`libs_use_ld_so',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Use the dynamic link/loader for automatic loading
 ##	of shared libraries with legacy support.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -96,11 +96,9 @@ interface(`libs_legacy_use_ld_so',`
 ')
 
 ########################################
-## <desc>
-##	Execute the dynamic link/loader in the caller's
-##	domain.  This is commonly needed for the
-##	/usr/bin/ldd program.
-## </desc>
+## <summary>
+##	Execute the dynamic link/loader in the caller's domain.
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -119,10 +117,10 @@ interface(`libs_exec_ld_so',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Modify the dynamic link/loader's cached listing
 ##	of shared libraries.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -138,9 +136,9 @@ interface(`libs_rw_ld_so_cache',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Search lib directories.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -155,10 +153,10 @@ interface(`libs_search_lib',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Read files in the library directories, such
 ##	as static libraries.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -177,9 +175,9 @@ interface(`libs_read_lib',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Execute library scripts in the caller domain.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -198,9 +196,9 @@ interface(`libs_exec_lib_files',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Load and execute functions from shared libraries.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>
@@ -221,10 +219,10 @@ interface(`libs_use_shared_libs',`
 ')
 
 ########################################
-## <desc>
+## <summary>
 ##	Load and execute functions from shared libraries,
 ##	with legacy support.
-## </desc>
+## </summary>
 ## <param name="domain">
 ##	The type of the process performing this action.
 ## </param>