--- loncom/homework/structuretags.pm	2013/09/05 12:07:29	1.515
+++ loncom/homework/structuretags.pm	2014/05/15 20:17:17	1.518
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.515 2013/09/05 12:07:29 goltermann Exp $
+# $Id: structuretags.pm,v 1.518 2014/05/15 20:17:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -414,6 +414,8 @@ sub page_start {
         $body_args{'add_entries'}    = \%add_entries;
         if ( $env{'request.state'} eq   'construct') {
             $body_args{'only_body'}  = 1;
+        } elsif ($target eq 'web') {
+            $body_args{'print_suppress'} = 1;
         }
     }
     $body_args{'no_auto_mt_title'} = 1;
@@ -728,7 +730,7 @@ $show_all
 <select name='problemstatus'>
   <option value=''></option>
   ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
-  ".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
+  ".&option('no', 'problemstatus').&mt("Don't Show Incorrect/Correct Feedback")."</option>
   ".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
 </select>
 </span>
@@ -2057,9 +2059,15 @@ sub end_while {
 	    }
 	    $return = &Apache::run::run($code,$safeeval);
 	}
-	if ($error) {
-	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
-	}
+        if ($error) {
+            &Apache::lonxml::error(
+                '<pre>'
+               .&mt('Code ran too long. It ran for more than [_1] seconds.',
+                        $Apache::lonnet::perlvar{'lonScriptTimeout'})
+               .&mt('This occurred while running &lt;while&gt; on line [_1].',
+                        $line)
+               .'</pre>');
+        }
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');
     }