From: Adam Chlipala <adamc@hcoop.net>
Date: Sat, 29 Dec 2007 21:28:34 +0000 (+0000)
Subject: Allow extra blank lines in vos output
X-Git-Url: http://git.hcoop.net/hcoop/portal.git/commitdiff_plain/ddc53b567f705a72730b21c2e7f02faba478f80a

Allow extra blank lines in vos output
---

diff --git a/quota.mlt b/quota.mlt
index e1eea1d..64b99d8 100644
--- a/quota.mlt
+++ b/quota.mlt
@@ -141,7 +141,7 @@ elseif $"mod" <> "" then
 
 <h3>Request a disk quota change</h3>
 
-<p>Remember that a high quota does not by itself use up any resources.  Quotas are solely a check on unintentional overusage.  We will only ever bill you for actual disk usage, not quota.  Therefore, it only makes sense to ask for a quota to be reduced if you want to prevent a runaway process or similar from upping your bill, not because you're worried about being a good co-op citizen.</p>
+<p>Remember that a high quota does not by itself use up any resources.  Quotas are solely a check on unintentional overusage.  We don't yet have any concrete policies to charge members based on disk usage, and, if we do implement such policies, you'll be charged only on actual disk usage, not quota.</p>
 
 <form method="post">
 
diff --git a/quotas.sml b/quotas.sml
index a667846..84515b5 100644
--- a/quotas.sml
+++ b/quotas.sml
@@ -43,7 +43,7 @@ struct
 			else
 			    (eatUntilBlankLine ();
 			     loop acc)
-		      | _ => acc
+		      | _ => loop acc
 
 	    val _ = TextIO.inputLine inf
 	in
diff --git a/static/gen.sml b/static/gen.sml
index 1e409df..3ca57e8 100644
--- a/static/gen.sml
+++ b/static/gen.sml
@@ -316,10 +316,18 @@ fun main _ = (generate ())
     handle
     C.Sql s => (print "SQL exception: \n";
 		print s;
+		print "\n";
 		OS.Process.failure)
   | Fail s => (print "Fail: ";
 	       print s;
+	       print "\n";
 	       OS.Process.failure)
+  | IO.Io {name, function, ...} => (print "IO exception ";
+				    print function;
+				    print ": ";
+				    print name;
+				    print "\n";
+				    OS.Process.failure)
   | ex => (print "Exception!\n";
 		  List.app (fn s => print (s ^ "\n")) (SMLofNJ.exnHistory ex);
 		  OS.Process.failure)
diff --git a/support.mlt b/support.mlt
index e391e71..bc5dcee 100644
--- a/support.mlt
+++ b/support.mlt
@@ -79,7 +79,9 @@ if showNormal then %>
 
 <h3>Otherwise...</h3>
 
-<p>Visit <a href="https://bugzilla.hcoop.net/enter_bug.cgi">our Bugzilla database</a> to open a custom issue.  You can log in there using the same username and password that you are using to access this portal.</p>
+<p>First, check <a href="http://wiki.hcoop.net/MemberManual/FAQ">our member FAQ</a> and read all the question descriptions to make sure that your problem isn't solved there.</p>
+
+<p>If you don't find it, visit <a href="https://bugzilla.hcoop.net/enter_bug.cgi">our Bugzilla database</a> to open a custom issue.  You can log in there using the same username and password that you are using to access this portal.</p>
 
 <!--h3>Choose a category:</h3>