From: Adam Chlipala <adamc@hcoop.net>
Date: Tue, 20 Nov 2007 00:25:56 +0000 (+0000)
Subject: Fix description of mail
X-Git-Tag: release_2010-11-19~111
X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/commitdiff_plain/d936cf4d0b120b88f99c10dee5556d0ca7320324

Fix description of mail
---

diff --git a/src/domain.sml b/src/domain.sml
index 3998b83..0b3a0f5 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -894,7 +894,7 @@ fun considerAll ds {node, domain} =
 				     case d of
 					 Filename {filename, heading, showEmpty} =>
 					 if fname = filename then
-					     entries := readFile showEmpty ("\n" :: line :: ":\n" :: heading :: line :: !entries)
+					     entries := readFile showEmpty ("\n" :: line :: "\n" :: heading :: line :: !entries)
 					 else
 					     ()
 				       | Extension {extension, heading} =>
@@ -905,7 +905,7 @@ fun considerAll ds {node, domain} =
 						 NONE => ()
 					       | SOME extension' =>
 						 if extension' = extension then
-						     entries := readFile true ("\n" :: line :: ":\n" :: heading base :: line :: !entries)
+						     entries := readFile true ("\n" :: line :: "\n" :: heading base :: line :: !entries)
 						 else
 						     ()
 					 end
@@ -921,7 +921,7 @@ fun considerAll ds {node, domain} =
     end
 
 val () = registerDescriber (considerAll [Filename {filename = "soa",
-						   heading = "DNS SOA",
+						   heading = "DNS SOA:",
 						   showEmpty = false}])
 
 val () = Env.registerAction ("domainHost",
diff --git a/src/plugins/apache.sml b/src/plugins/apache.sml
index 4da19f9..966240c 100644
--- a/src/plugins/apache.sml
+++ b/src/plugins/apache.sml
@@ -931,8 +931,8 @@ val () = Domain.registerResetLocal (fn () =>
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Extension {extension = "vhost",
-						      heading = fn host => "Web vhost " ^ host},
+						      heading = fn host => "Web vhost " ^ host ^ ":"},
 				    Domain.Extension {extension = "vhost_ssl",
-						      heading = fn host => "SSL web vhost " ^ host}])
+						      heading = fn host => "SSL web vhost " ^ host ^ ":"}])
 
 end
diff --git a/src/plugins/bind.sml b/src/plugins/bind.sml
index f08367e..48a2b03 100644
--- a/src/plugins/bind.sml
+++ b/src/plugins/bind.sml
@@ -284,10 +284,10 @@ val () = Domain.registerResetLocal (fn () =>
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Filename {filename = "named.conf",
-						     heading = "named.conf addition",
+						     heading = "named.conf addition:",
 						     showEmpty = false},
 				    Domain.Filename {filename = "dns",
-						     heading = "DNS zonefile contents",
+						     heading = "DNS zonefile contents:",
 						     showEmpty = false}])
 
 end
diff --git a/src/plugins/exim.sml b/src/plugins/exim.sml
index f4943ac..ee036ce 100644
--- a/src/plugins/exim.sml
+++ b/src/plugins/exim.sml
@@ -102,16 +102,16 @@ val () = Env.actionV_none "relayMail"
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Filename {filename = "aliases",
-						     heading = "E-mail aliases",
+						     heading = "E-mail aliases:",
 						     showEmpty = false},
 				    Domain.Filename {filename = "aliases.default",
-						     heading = "Default e-mail alias",
+						     heading = "Default e-mail alias:",
 						     showEmpty = false},
 				    Domain.Filename {filename = "mail",
-						     heading = "E-mail handling",
-						     showEmpty = false},
+						     heading = "E-mail handling is on.",
+						     showEmpty = true},
 				    Domain.Filename {filename = "mail.relay",
-						     heading = "E-mail relaying",
-						     showEmpty = false}])
+						     heading = "E-mail relaying is on.",
+						     showEmpty = true}])
 
 end
diff --git a/src/plugins/mailman.sml b/src/plugins/mailman.sml
index b716cbd..fcfbc7c 100644
--- a/src/plugins/mailman.sml
+++ b/src/plugins/mailman.sml
@@ -187,7 +187,7 @@ val () = Slave.registerPostHandler (fn () =>
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Filename {filename = "mailman",
-						     heading = "Mailman web host mapping",
+						     heading = "Mailman web host mapping:",
 						     showEmpty = false}])
 
 end
diff --git a/src/plugins/webalizer.sml b/src/plugins/webalizer.sml
index 416460d..c73ed98 100644
--- a/src/plugins/webalizer.sml
+++ b/src/plugins/webalizer.sml
@@ -124,6 +124,6 @@ val () = Domain.registerResetLocal (fn () =>
 
 val () = Domain.registerDescriber (Domain.considerAll
 				   [Domain.Extension {extension = "wbl",
-						      heading = fn host => "Webalizer config for " ^ host}])
+						      heading = fn host => "Webalizer config for " ^ host ^ ":"}])
 
 end