Index: openacs-4/packages/acs-admin/www/users/merge-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-confirm.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/merge-confirm.adp	4 Jun 2006 00:45:20 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/merge-confirm.adp	13 Aug 2007 06:11:12 -0000	1.3
@@ -15,7 +15,7 @@
 
     <p/>
     <img border=2 width="80" height="80" src="@to_img_src@" alt="Portrait of @to_user_id@" />		  
-		    <br/>
+		    <br>
     <span style="font-size:14pt;">@to_first_names@ @to_last_name@ (@to_email@)</span>	      
     <p/>
 
Index: openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl,v
diff -u -N -r1.22 -r1.23
--- openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	10 Jan 2007 21:22:01 -0000	1.22
+++ openacs-4/packages/acs-api-browser/tcl/acs-api-documentation-procs.tcl	13 Aug 2007 06:04:52 -0000	1.23
@@ -603,7 +603,7 @@
 		append out "<b>Options:</b><dl>"
 		foreach param $doc_elements(option) {
 			if { [regexp {^([^ \t]+)[ \t](.+)$} $param "" name value] } {
-                            append out "<dt><b>-$name</b></dt><dd>$value<br/></dd>"
+                            append out "<dt><b>-$name</b></dt><dd>$value<br></dd>"
 			}
 		}
 		append out "</dl>"
Index: openacs-4/packages/acs-templating/resources/forms/accessible-forms.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/accessible-forms.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-templating/resources/forms/accessible-forms.adp	14 May 2007 20:30:27 -0000	1.5
+++ openacs-4/packages/acs-templating/resources/forms/accessible-forms.adp	13 Aug 2007 06:11:46 -0000	1.6
@@ -12,14 +12,14 @@
     </if>
     
     <else>
-      <br/>
+      <br>
         <if @elements.widget@ eq "submit">
 	  <span class="form-element">
 	    <group column="widget">
 	      <noparse><formwidget id="@elements.id@"></noparse>
 	    </group>
-	    <br/>
-	    <br/>
+	    <br>
+	    <br>
 	  </span>
         </if>
 	
Index: openacs-4/packages/acs-templating/resources/forms/standard.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/forms/standard.adp,v
diff -u -N -r1.18 -r1.19
--- openacs-4/packages/acs-templating/resources/forms/standard.adp	14 May 2007 20:30:27 -0000	1.18
+++ openacs-4/packages/acs-templating/resources/forms/standard.adp	13 Aug 2007 06:11:46 -0000	1.19
@@ -90,7 +90,7 @@
 									\@formgroup.widget;noquote@
 								<label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
 										\@formgroup.label;noquote@
-								</label><br/>
+								</label><br>
 							</formgroup>
 						</noparse>
 					</if>
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -N -r1.29 -r1.30
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	14 May 2007 20:30:27 -0000	1.29
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	13 Aug 2007 06:05:49 -0000	1.30
@@ -276,7 +276,7 @@
       if { $htmlarea_p } {
           append output "<input name=\"$element(id).format\" value=\"text/html\" type=\"hidden\">"
       } else {
-          append output "<br/>[_ acs-templating.Format]: [menu $element(id).format [template::util::richtext::format_options] $format attributes]"
+          append output "<br>[_ acs-templating.Format]: [menu $element(id).format [template::util::richtext::format_options] $format attributes]"
       }
           
       # Spell-checker
@@ -378,8 +378,8 @@
   Note that the rich-rext editor interacts with <tt>blank-master.tcl</tt> and 
   <tt>blank-master.adp</tt>.
   <p>
-  Derived from the htmlarea richtext widget for htmlarea by lars@pinds.com<br/>
-  modified for RTE http://www.kevinroth.com/ by davis@xarg.net<br/>
+  Derived from the htmlarea richtext widget for htmlarea by lars@pinds.com<br>
+  modified for RTE http://www.kevinroth.com/ by davis@xarg.net<br>
   xinha support by gustaf.neumann@wu-wien.ac.at
 } {
 
@@ -444,12 +444,12 @@
 	# which the richtext widget won't work but which do have js enabled 
 	# should output since we need the format widget (this for Safari among 
 	# some others)
-          set noscript_output "$output <br/>[_ acs-templating.Format]: $format_menu\n"
+          set noscript_output "$output <br>[_ acs-templating.Format]: $format_menu\n"
 
 	set output "<script type='text/javascript'><!--\nwriteRichText('$element(id)','$contents',500,200,true,false,'<input name=\"$element(id).format\" value=\"text/html\" type=\"hidden\">','[string map {\n \\n \r {} "'" "&\#39"} $output]'); //--></script><noscript id=\"rte-noscr-$element(id)\">$noscript_output</noscript>"
       } elseif {$richtextEditor eq "xinha"} {
 	append output "<script>document.write(\"<input name='$element(id).format' value='text/html' type='hidden'>\");</script>\n"
-          append output "<noscript><br/>[_ acs-templating.Format]: $format_menu</noscript>\n"
+          append output "<noscript><br>[_ acs-templating.Format]: $format_menu</noscript>\n"
 	
 	# we have a xinha richtext widget, specified by "options {editor xinha}"
 	# The following options are supported: 
@@ -500,7 +500,7 @@
         } else {
 	    append output ""
 	}
-        append output "<br/>[_ acs-templating.Format]: $format_menu"
+        append output "<br>[_ acs-templating.Format]: $format_menu"
     }
 
     # Spell-checker
Index: openacs-4/packages/acs-templating/www/resources/htmlarea/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/htmlarea/index.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/resources/htmlarea/index.html	30 Jan 2005 16:13:26 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/htmlarea/index.html	13 Aug 2007 06:12:48 -0000	1.3
@@ -26,7 +26,7 @@
           <td class="label">SourceForge page:</td><td><a href="http://sf.net/projects/itools-htmlarea/">http://sf.net/projects/itools-htmlarea/</a></td>
       </table>
     </div>
-    <h1>HTMLArea -- the free<br/>customizable online editor</h1>
+    <h1>HTMLArea -- the free<br>customizable online editor</h1>
 
     <p>
       HTMLArea is a free, customizable online editor.  It works inside your
Index: openacs-4/packages/acs-templating/www/resources/htmlarea/popups/about.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/htmlarea/popups/about.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/resources/htmlarea/popups/about.html	30 Jan 2005 16:13:32 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/htmlarea/popups/about.html	13 Aug 2007 06:12:48 -0000	1.3
@@ -76,7 +76,7 @@
 	  plugins.innerHTML = "<p>No plugins have been loaded</p>";
   }
 
-  plugins.innerHTML += "<p>User agent reports:<br/>" + navigator.userAgent + "</p>";
+  plugins.innerHTML += "<p>User agent reports:<br>" + navigator.userAgent + "</p>";
 
   var content = document.getElementById("content");
   if (window.innerHeight) {
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/functionsMozilla.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/functionsMozilla.js,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/functionsMozilla.js	2 Feb 2007 21:04:44 -0000	1.1
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/functionsMozilla.js	13 Aug 2007 06:12:48 -0000	1.2
@@ -336,7 +336,7 @@
  * 5. Reinsert it just after the block element
  *       <p>The quick </p><p>brown fox jumped over the lazy dog.</p>
  *
- * Along the way, allow inserting blank paragraphs, which will look like <p><br/></p>
+ * Along the way, allow inserting blank paragraphs, which will look like <p><br></p>
  */
 
 Gecko.prototype.dom_checkInsertP = function()
@@ -516,7 +516,7 @@
 
   // Select the range (to set the insertion)
   // collapse to the start of the new block
-  //  (remember the block might be <p><br/></p>, so if we collapsed to the end the <br/> would be noticable)
+  //  (remember the block might be <p><br></p>, so if we collapsed to the end the <br> would be noticable)
 
   //range.selectNode(newblock.firstChild);
   //range.collapse(true);
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/ext_example-dest.php
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/ext_example-dest.php,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/ext_example-dest.php	2 Nov 2005 09:20:04 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/examples/ext_example-dest.php	13 Aug 2007 06:12:48 -0000	1.3
@@ -14,7 +14,7 @@
 //magic_quotes_gpc = Off
   foreach($_REQUEST as $key=>$value){
     if(substr($key,0,10) == 'myTextarea') {
-      echo '<h3 style="border-bottom:1px solid black;">'.$key.'(source):</h3><xmp style="border:1px solid black; width: 100%; height: 200px; overflow: auto;">'.$value.'</xmp><br/>';
+      echo '<h3 style="border-bottom:1px solid black;">'.$key.'(source):</h3><xmp style="border:1px solid black; width: 100%; height: 200px; overflow: auto;">'.$value.'</xmp><br>';
       echo '<h3 style="border-bottom:1px solid black;">'.$key.'(preview):</h3>'.$value;
     }
   }
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html	11 Nov 2005 20:32:48 -0000	1.2
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/plugins/Template/popups/template.html	13 Aug 2007 06:12:48 -0000	1.3
@@ -39,7 +39,7 @@
       <img src="../img/layout_02.gif" alt="" width="106" height="68" border="0" /></a>
     </td>  
 	  <td align="center" valign="top"><a href="javascript:;" onClick="onOK('3');">
-	    <img src="../img/layout_03.gif" alt="" width="106" height="68" border="0" /></a><br/>
+	    <img src="../img/layout_03.gif" alt="" width="106" height="68" border="0" /></a><br>
     </td>
  	</tr>
   </table>
Index: openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/about.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/about.html,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/about.html	25 Feb 2007 19:06:34 -0000	1.5
+++ openacs-4/packages/acs-templating/www/resources/xinha-nightly/popups/about.html	13 Aug 2007 06:12:48 -0000	1.6
@@ -76,7 +76,7 @@
     plugins.innerHTML = "<p>No plugins have been loaded</p>";
   }
 
-  plugins.innerHTML += "<p>User agent reports:<br/>" + navigator.userAgent + "</p>";
+  plugins.innerHTML += "<p>User agent reports:<br>" + navigator.userAgent + "</p>";
 
   var content = document.getElementById("content");
   if (window.innerHeight) {
Index: openacs-4/packages/calendar/www/mini-calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/mini-calendar.tcl,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/calendar/www/mini-calendar.tcl	15 May 2007 20:14:21 -0000	1.17
+++ openacs-4/packages/calendar/www/mini-calendar.tcl	13 Aug 2007 06:06:33 -0000	1.18
@@ -10,7 +10,7 @@
     {date:text,nospell,optional
 	{label ""}
 	{html {size 10}}
-	{after-html "<br/>[_ acs-datetime.Date_as_YYYYMMDD]"}
+	{after-html "<br>[_ acs-datetime.Date_as_YYYYMMDD]"}
     }
     {btn_ok:text(submit)
         {label "[_ calendar.Go_to_date]"}
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.181 -r1.182
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	7 Jun 2007 20:32:27 -0000	1.181
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	13 Aug 2007 06:10:27 -0000	1.182
@@ -603,18 +603,18 @@
                     append layout_chunk ">$one_layout_chunk"
                 }
 
-                append layout_chunk "</label><br/>"
+                append layout_chunk "</label><br>"
             }
 
 
             append template "
             <tr>
              <td>
-              <br/>
+              <br>
               <form method=post action=@action_string@>
                <small>
                 <b>[_ new-portal.Change_page_layout]</b>
-                <br/>
+                <br>
                 <input type=hidden name=portal_id value=$portal_id>
                 <input type=hidden name=page_id value=$page_id>
                 <input type=hidden name=return_url value=\"@return_url@\">
@@ -640,7 +640,7 @@
 
     set new_page_num [expr [page_count -portal_id $portal_id] + 1]
 
-    append template "<br/>
+    append template "<br>
     <table class=\"portal-page-config\" border=0 cellspacing=0 cellpadding=0>
      <tr>
       <td>
@@ -668,7 +668,7 @@
     #
 
     if {![empty_string_p [get_portal_template_id $portal_id]]} {
-        append template "<br/>
+        append template "<br>
         <table class=\"portal-page-config\" width=\"100%\" cellpadding=0 border=0 cellspacing=0>
          <tr>
           <td>
@@ -687,7 +687,7 @@
 
     if { [db_string sub_portals {}] } {
         # Portal has other portals using it as a template
-        append template "<br/>
+        append template "<br>
         <table class=\"portal-page-config\" width=100% cellpadding=0 border=0 cellspacing=0>
          <tr>
           <td>