Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	8 May 2009 09:12:15 -0000	1.32
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl	5 Jun 2009 12:20:10 -0000	1.33
@@ -136,7 +136,7 @@
 
   ADP_Generator create oacs-view -master 1 -footer 1 \
     -extra_header_stuff {
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     } \
     -proc content_part {} {
@@ -161,8 +161,8 @@
   #
   ADP_Generator create oacs-view2 -master 1 -footer 1 \
     -extra_header_stuff {
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
-      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     } \
     -proc before_render {page} {
@@ -206,7 +206,7 @@
 	 &__including_page=page 
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
-<a href="contributors" text="Show People contributing to this XoWiki Instance">Contributors</a>
+<a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
 </div>
 </div>
 </div> <!-- sidebar -->
@@ -225,8 +225,8 @@
          div.tags h3 {font-size: 80%;}
          div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
       </style>
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
-      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     } \
     -proc before_render {page} {
@@ -255,7 +255,7 @@
 	 &__including_page=page 
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
-<a href="contributors" text="Show People contributing to this XoWiki Instance">Contributors</a>
+<a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
 </div>
 </div> <!-- background -->
 
@@ -292,13 +292,13 @@
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+  <div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
 @toc;noquote@
 </div></div>
 <div style="float:right; width: 70%;">@top_includelets;noquote@
 
 <if @book_prev_link@ not nil or @book_relpos@ not nil or @book_next_link@ not nil>
-<div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9;  width: 500px;">
+  <div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9; width: 500px;">
 <table width='100%' 
   summary='This table provides a progress bar and buttons for next and previous pages'>
   <colgroup><col width='20'><col width='450'><col width='20'>
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.115 -r1.116
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	3 Jun 2009 06:42:58 -0000	1.115
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	5 Jun 2009 12:20:10 -0000	1.116
@@ -102,7 +102,9 @@
   }
 
   ::xowiki::Includelet proc html_encode {string} {
-    return [string map [list & "&amp;" < "&lt;" > "&gt;" \" "&quot;" ' "&apos;"] $string]
+    # &apos; is not a known entity to some validators, so we use the
+    # numerical entity here for encoding "'"
+    return [string map [list & "&amp;" < "&lt;" > "&gt;" \" "&quot;" ' "&#39;"] $string]
   }
 
 
@@ -1414,7 +1416,7 @@
     foreach cat_id [category::get_mapped_categories [$__including_page set item_id]] {
       foreach {category_id category_name tree_id tree_name} [category::get_data $cat_id] break
       #my log "--cat $cat_id $category_id $category_name $tree_id $tree_name"
-      set entry "<a href='$href&category_id=$category_id'>$category_name ($tree_name)</a>"
+      set entry "<a href='$href&amp;category_id=$category_id'>$category_name ($tree_name)</a>"
       if {$notification_type ne ""} {
         set notification_text "Subscribe category $category_name in tree $tree_name"
         set notifications_return_url [expr {[info exists return_url] ? $return_url : [ad_return_url]}]
@@ -1462,7 +1464,7 @@
     }
     set gc_comments [general_comments_get_comments $item_id $gc_return_url]
     if {$gc_comments ne ""} {
-      return "<p>#general-comments.Comments#<ul>$gc_comments</ul></p>$gc_link"
+      return "<p>#general-comments.Comments#</p><ul>$gc_comments</ul>$gc_link"
     } else {
       return "$gc_link"
     }
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.58 -r1.59
--- openacs-4/packages/xowiki/www/oacs-view.adp	8 May 2009 09:12:15 -0000	1.58
+++ openacs-4/packages/xowiki/www/oacs-view.adp	5 Jun 2009 12:20:10 -0000	1.59
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -8,7 +8,7 @@
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     @header_stuff;noquote@
   <script type="text/javascript">
@@ -33,7 +33,7 @@
   <property name="head">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     @header_stuff;noquote@
   <script type="text/javascript">
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.37 -r1.38
--- openacs-4/packages/xowiki/www/oacs-view2.adp	8 May 2009 09:12:15 -0000	1.37
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	5 Jun 2009 12:20:10 -0000	1.38
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -8,8 +8,8 @@
   <property name="header_stuff">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
-      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     @header_stuff;noquote@
   <script type="text/javascript">
@@ -34,8 +34,8 @@
   <property name="head">
   <link rel="stylesheet" type="text/css" href="/resources/xowiki/xowiki.css" media="all" >
   
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
-      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     @header_stuff;noquote@
   <script type="text/javascript">
@@ -114,7 +114,7 @@
 	 &__including_page=page 
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
-<a href="contributors" text="Show People contributing to this XoWiki Instance">Contributors</a>
+<a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
 </div>
 </div>
 </div> <!-- sidebar -->
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.32 -r1.33
--- openacs-4/packages/xowiki/www/oacs-view3.adp	8 May 2009 09:12:16 -0000	1.32
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	5 Jun 2009 12:20:10 -0000	1.33
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -13,8 +13,8 @@
          div.tags h3 {font-size: 80%;}
          div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
       </style>
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
-      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     @header_stuff;noquote@
   <script type="text/javascript">
@@ -44,8 +44,8 @@
          div.tags h3 {font-size: 80%;}
          div.tags blockquote {font-size: 80%; margin-left: 20px; margin-right: 20px;}
       </style>
-      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' />
-      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' />
+      <link rel='stylesheet' href='/resources/xowiki/cattree.css' media='all' >
+      <link rel='stylesheet' href='/resources/calendar/calendar.css' media='all' >
       <script language='javascript' src='/resources/acs-templating/mktree.js' type='text/javascript'></script>
     @header_stuff;noquote@
   <script type="text/javascript">
@@ -106,7 +106,7 @@
 	 &__including_page=page 
 	 portlet="presence -interval {30 minutes} -decoration plain">
 <hr>
-<a href="contributors" text="Show People contributing to this XoWiki Instance">Contributors</a>
+<a href="contributors" title="Show People contributing to this XoWiki Instance">Contributors</a>
 </div>
 </div> <!-- background -->
 
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book-no-ajax.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	8 May 2009 09:12:16 -0000	1.14
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	5 Jun 2009 12:20:10 -0000	1.15
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -59,13 +59,13 @@
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+  <div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
 @toc;noquote@
 </div></div>
 <div style="float:right; width: 70%;">@top_includelets;noquote@
 
 <if @book_prev_link@ not nil or @book_relpos@ not nil or @book_next_link@ not nil>
-<div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9;  width: 500px;">
+  <div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9; width: 500px;">
 <table width='100%' 
   summary='This table provides a progress bar and buttons for next and previous pages'>
   <colgroup><col width='20'><col width='450'><col width='20'>
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.adp,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/xowiki/www/view-book.adp	8 May 2009 09:12:16 -0000	1.25
+++ openacs-4/packages/xowiki/www/view-book.adp	5 Jun 2009 12:20:10 -0000	1.26
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
@@ -59,13 +59,13 @@
      background: url(/resources/xowiki/bw-shadow.png) no-repeat bottom right;
      margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px;			    
 ">
-<div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
+  <div style="margin-top: -2px; margin-left: -2px; border: 1px solid #a9a9a9; padding: 5px 5px; background: #f8f8f8">
 @toc;noquote@
 </div></div>
 <div style="float:right; width: 70%;">@top_includelets;noquote@
 
 <if @book_prev_link@ not nil or @book_relpos@ not nil or @book_next_link@ not nil>
-<div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9;  width: 500px;">
+  <div class="book-navigation" style="background: #f8f8f8; border: 1px solid #a9a9a9; width: 500px;">
 <table width='100%' 
   summary='This table provides a progress bar and buttons for next and previous pages'>
   <colgroup><col width='20'><col width='450'><col width='20'>
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.54 -r1.55
--- openacs-4/packages/xowiki/www/view-default.adp	8 May 2009 09:12:16 -0000	1.54
+++ openacs-4/packages/xowiki/www/view-default.adp	5 Jun 2009 12:20:10 -0000	1.55
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <master>
   <property name="title">@title;noquote@</property>
   <property name="context">@context;noquote@</property>
Index: openacs-4/packages/xowiki/www/view-links.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v
diff -u -r1.44 -r1.45
--- openacs-4/packages/xowiki/www/view-links.adp	8 May 2009 09:12:16 -0000	1.44
+++ openacs-4/packages/xowiki/www/view-links.adp	5 Jun 2009 12:20:10 -0000	1.45
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>
Index: openacs-4/packages/xowiki/www/view-plain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/xowiki/www/view-plain.adp	8 May 2009 09:12:16 -0000	1.40
+++ openacs-4/packages/xowiki/www/view-plain.adp	5 Jun 2009 12:20:10 -0000	1.41
@@ -1,4 +1,4 @@
-<!-- Generated by ::xowiki::ADP_Generator on Do Mai 07 20:05:14 CEST 2009 -->
+<!-- Generated by ::xowiki::ADP_Generator on Fri Jun 05 14:18:55 +0200 2009 -->
 <!-- The following DIV is needed for overlib to function! -->
   <div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>	
 <div class='xowiki-content'>