diff --git a/src/post_modules/GTK/build_pgtk.pike b/src/post_modules/GTK/build_pgtk.pike
index 1b329837ed39a6abc3123fe48321989604d38593..890da20a3e61c7ea7923819254e4c2d353c3fc46 100755
--- a/src/post_modules/GTK/build_pgtk.pike
+++ b/src/post_modules/GTK/build_pgtk.pike
@@ -1205,6 +1205,7 @@ void do_default_sprintf( int args, int offset, int len )
   {
     foreach(get_dir(dir+"/pcdocs"), string d)
     {
+      if(d[-1] == '~') continue;
       string last_function, progname, a, b;
       int ln;
       if(Stdio.file_size(dir+"/pcdocs/"+d) < 1)
diff --git a/src/post_modules/GTK/dependencies b/src/post_modules/GTK/dependencies
index b2ab4042590082ba2cc4c82224a16d4813f2f5fb..e99b9bc9cd3637878417354c2735ec060ae2abb1 100644
--- a/src/post_modules/GTK/dependencies
+++ b/src/post_modules/GTK/dependencies
@@ -1,7 +1,6 @@
-dummy.o : $(SRCDIR)/dummy.c \
+dummy.o: $(SRCDIR)/dummy.c \
  $(PIKE_SRC_DIR)/global.h \
  $(BUILD_BASE)/machine.h \
  $(PIKE_SRC_DIR)/port.h \
- $(PIKE_SRC_DIR)/dmalloc.h \
- config.h \
+ $(PIKE_SRC_DIR)/dmalloc.h config.h \
  $(PIKE_SRC_DIR)/module_magic.h
diff --git a/src/post_modules/GTK/docs.pike b/src/post_modules/GTK/docs.pike
index 6f2f3b6dc7f74c9d8a45837235bcd7b19fa38a8f..352fc98e55abcfc627cc6b499462eaa4d87e4491 100644
--- a/src/post_modules/GTK/docs.pike
+++ b/src/post_modules/GTK/docs.pike
@@ -32,7 +32,7 @@ string make_tag(string s, mapping(string:string) in)
 string make_container(string s, mapping(string:string) in, string contents)
 {
   if(in["/"]) m_delete(in, "/");
-  return make_tag(s,in)+contents+"</"+s+">";
+  return make_tag(s,in)+replace(contents, "&nbsp;", "&#160;")+"</"+s+">";
 }
 
 
@@ -140,6 +140,7 @@ void print_function_defs( string f, int|void global )
     global = 1;
 
   object fd = Stdio.File("xmldocs/"+class_file_name( f ), "wct");
+  fd->write("<?xml version=\"1.0\"?>\n");
 
   if( struct[f]->create )
   {
@@ -150,7 +151,8 @@ void print_function_defs( string f, int|void global )
   } else
     fd->write( make_tag( "class", (["name":classname( f ), "nocreate":""]) ) );
 
-  fd->write( make_container( "doc", ([]), docs[f]||"" ) );
+  fd->write( make_container( "doc", ([]), docs[f]||""));
+  
 
   if(!global)
   {
@@ -242,7 +244,7 @@ void print_rec_tree(array plane, mapping t, int ind, object to)
 {
   foreach(sort(plane), string n)
   {
-    print_function_defs( n );
+    //    print_function_defs( n );
 //  werror(" "*ind + n+"\n");
     to->write("<li><a href="+class_file_name(n)+">"+classname(n)+"</a>");
     if(t[n])
@@ -300,10 +302,13 @@ array (string) sort_dependencies( array bunch, mapping extra )
     }
     fd->write("<h1>All classes in alphabetical order</h1>\n");
     fd->write("<ul>");
-    foreach(Array.sort_array(indices(struct), fnamesfun), string s)
-      if(s != "global")
+    foreach(Array.sort_array(indices(struct), fnamesfun), string s) {
+      if(s != "global") {
         fd->write("<li> <a href="+class_file_name(s)+">"+
                   classname(s)+"</a>\n");
+	print_function_defs( s );
+      }
+    }
     fd->write("</ul>\n");
 //     fd->write("<h1>All constants in alphabetical order</h1>\n");
 //     fd->write("<ul>");
@@ -418,16 +423,16 @@ string build_cursor( string a )
   sscanf( a, "GDK.%s", a );
   num = master()->resolv("GDK")[a];
 
-  return "<tr bgcolor="+(odd++%2?"#f6e0d0":"#faebd7")+
-         "><td><font color=black>GDK."+a+"</font></td>"
-         "<td><img src=cursor_"+num+".gif></td>"
-         "<td><img src=cursor_"+num+"_inv.gif></td>"
-         "<td><img src=cursor_"+num+"_red.gif></td>"
-         "<td><img src=cursor_"+num+"_red_inv.gif></td>"
-         "<td><img src=cursor_"+num+"_green.gif></td>"
-         "<td><img src=cursor_"+num+"_green_inv.gif></td>"
-         "<td><img src=cursor_"+num+"_blue.gif></td>"
-         "<td><img src=cursor_"+num+"_blue_inv.gif></td>"
+  return "<tr bgcolor=\""+(odd++%2?"#f6e0d0":"#faebd7")+
+         "\"><td><font color=\"black\">GDK."+a+"</font></td>"
+         "<td><img src=\"cursor_"+num+".gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_inv.gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_red.gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_red_inv.gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_green.gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_green_inv.gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_blue.gif\" /></td>"
+         "<td><img src=\"cursor_"+num+"_blue_inv.gif\" /></td>"
          "</tr>";
 }
 
diff --git a/src/post_modules/GTK/pcdocs/MenuFactory b/src/post_modules/GTK/pcdocs/MenuFactory
index 04c906a9bd3a2c6920d4bcd7728eb23ad48aacb1..20f48877acbc6fac4dcfee429cb925a18de49f42 100644
--- a/src/post_modules/GTK/pcdocs/MenuFactory
+++ b/src/post_modules/GTK/pcdocs/MenuFactory
@@ -6,11 +6,11 @@ NAME_ARGS(callback);
 // the new mapping as the argument.<p>
 //  <b>NOTE</b>: This function is only used when the menubar
 //  is created, once you are done with the menubar creation, the
-//  callbacks for that menubar will be fixed.
+//  callbacks for that menubar will be fixed.</p>
 
 FUNCTION(get_menubar_mapping, "function(void:mapping)");
 //  Returns a (flat) mapping ([ path:GTK.MenuItem ]).<p>
-// <b>NOTE:</b> This function can only be called <i>after</i> the menubar is created.
+// <b>NOTE:</b> This function can only be called <i>after</i> the menubar is created.</p>
 
 FUNCTION(MenyFactory, "function(array(object):void)");
 NAME_ARGS(items);
@@ -19,7 +19,7 @@ ARGS(array(MenuDef));
 // <p>
 // This is the function that actually builds the menubar.
 // A short example:
-// <p><pre>
+// </p><p><pre>
 // import GTK.MenuFactory;
 // [GTK.MenuBar bar, GTK.AcceleratorTable map] = 
 //  MenuFactory( 
@@ -30,8 +30,8 @@ ARGS(array(MenuDef));
 //    MenuDef( "File/Quit", _exit, 0, "A-Q" ), 
 //  );
 // </pre>
+// </p><p>A single menu entry.</p>
 
-// A single menu entry.
 FUNCTION(MenuDef, "function(string,function(mixed:mixed),mixed,string,int:object)");
 NAME_ARGS(path,callback,callbackargument,shortcut,flags);
 RETURNS(MenuDef);
@@ -49,18 +49,18 @@ RETURNS(MenuDef);
 // make an array with the array in.  The callback function will be
 // called like callback( arg, widget ), or if arg is an array,
 // callback( arg[0], arg[1], ..., widget )
-// <p>
+// </p><p>
 // The fourth argument, shortcut, is the shortcut to bind to this menu
 // item. The shortcut can be changed later on by calling
 // assign_shortcut, or by the user by pressing the desired
 // keycombination over the menu item.
-// <p>The shortcut syntax is:
+// </p><p>The shortcut syntax is:
 // m[m[..]]-key, where m is one or more modifier character, and key is
 // the desired key (<b>NOTE</b>: Key must be in the range 0-255
 // currently, this will hopefully be fixed by the GTK people in the
 // future)
-// <p>
-// The modifiers are:<p><pre>
+// </p><p>
+// The modifiers are:</p><p><pre>
 // s: Shift
 // c: Control
 // a: Modifier 1 (called alt by the GTK people, that's not true, though)
@@ -73,9 +73,9 @@ RETURNS(MenuDef);
 // 4: Modifier 4
 // u: Modifier 5 (not mapped by the GTK people, super on _my_ keyboard)
 // 5: Modifier 5
-// </pre>
+// </pre></p>
 // <p>
-// The last argument (flags) is currently ignored.
+// The last argument (flags) is currently ignored.</p>
 
 FUNCTION(assign_shortcut, "function(string:void)");
 NAME_ARGS(new_shortcut);
@@ -87,8 +87,8 @@ NAME_ARGS(new_shortcut);
 // the desired key (<b>NOTE</b>: Key must be in the range 0-255
 // currently, this will hopefully be fixed by the GTK people in the
 // future)
-// <p>
-// The modifiers are:<p><pre>
+// </p><p>
+// The modifiers are:</p><p><pre>
 // s: Shift
 // c: Control
 // a: Modifier 1 (called alt by the GTK people, that's not true, though)
@@ -101,4 +101,4 @@ NAME_ARGS(new_shortcut);
 // 4: Modifier 4
 // u: Modifier 5 (not mapped by the GTK people, super on _my_ keyboard)
 // 5: Modifier 5
-// </pre>
+// </pre></p>
diff --git a/src/post_modules/GTK/pcdocs/pDrawingArea b/src/post_modules/GTK/pcdocs/pDrawingArea
index bb8707f344b5b10d77815cb800211cbf9e07ff4f..f5d8583fbc79ac12ceae0edb44a862ecfec8203f 100644
--- a/src/post_modules/GTK/pcdocs/pDrawingArea
+++ b/src/post_modules/GTK/pcdocs/pDrawingArea
@@ -6,4 +6,5 @@ INHERIT(drawing_area);
 // <p>
 // It also use quite a significant amount of memory if the backing
 // pixmap has many bitplanes, and the drawing area is large.
+// </p>
 
diff --git a/src/post_modules/GTK/source/gdkcolor.pre b/src/post_modules/GTK/source/gdkcolor.pre
index afb32716c2f99f9d26833daec98053b0dbc1f6f1..61d66c9394e8e927ed9dcfaf93224e8d3340fb6c 100644
--- a/src/post_modules/GTK/source/gdkcolor.pre
+++ b/src/post_modules/GTK/source/gdkcolor.pre
@@ -72,13 +72,13 @@ FUNCTION(blue, "function(void:int)")
 }
 
 FUNCTION(pixel, "function(void:int)")
-// Returns the pixel value of the color. See <a href=GdkImage.html#set_pixel>GDK.Image->set_pixel</a>.
+// Returns the pixel value of the color. See <a href="gdk.image.xml#set_pixel">GDK.Image->set_pixel</a>.
 {
   push_int(((GdkColor *)THIS->obj)->pixel);
 }
 
 FUNCTION(image_color_object, "function(void:object)");
-// Return a Image.Color.Color instance.<br>
+// Return a Image.Color.Color instance.<br />
 // This gives better precision than the rgb function.
 {
   unsigned char colorname[4+4+4+2];
diff --git a/src/post_modules/GTK/source/gdkdragcontext.pre b/src/post_modules/GTK/source/gdkdragcontext.pre
index ebf82fc42fb8afc017716f6d081a2424181a8abc..3bdf97f7cfd77722b07c522bd30a157916974189 100644
--- a/src/post_modules/GTK/source/gdkdragcontext.pre
+++ b/src/post_modules/GTK/source/gdkdragcontext.pre
@@ -3,6 +3,7 @@ class GdkDragContext;
 // connected to the signal to which it is an argument.
 // <p>
 // NOIMG
+// </p>
 #define GTK_GDKDRAGCONTEXT(X) ((GdkDragContext *)X)
 
 FUNCTION(get_source_widget, "function(void:object)");
@@ -95,7 +96,7 @@ FUNCTION(drag_set_icon_pixmap, "function(object,object|void,int,int:object)");
 RETURNS(GTK.Widget);
 ARGS(GTK.Pixmap,GTK.Bitmap,int,int);
 NAME_ARGS(image,mask,hot_x,hot_y);
-// Set the drag pixmap, and optionally mask.<br>
+// Set the drag pixmap, and optionally mask.<br />
 // The hot_x and hot_y coordinates will be the location of the mouse pointer,
 // relative to the upper left corner of the pixmap.
 {
diff --git a/src/post_modules/GTK/source/gdkdrawable.pre b/src/post_modules/GTK/source/gdkdrawable.pre
index 5dc598e6328899bc6af89ee26626bcddec27ce63..c91ec1d45f72c6936ce05652eadca0f5ba519aa6 100644
--- a/src/post_modules/GTK/source/gdkdrawable.pre
+++ b/src/post_modules/GTK/source/gdkdrawable.pre
@@ -3,8 +3,8 @@ class GdkDrawable;
 #include <gdk/gdkx.h>
 #endif
 // The GDK.Bitmap, GDK.Window and GDK.Pixmap classes are all GDK drawables.
-// <br>
-// This means that you can use the same set of functions to draw in them.<br>
+// <br />
+// This means that you can use the same set of functions to draw in them.<br />
 // <p>
 // Pixmaps are offscreen drawables. They can be drawn upon with the
 // standard drawing primitives, then copied to another drawable (such
@@ -14,10 +14,10 @@ class GdkDrawable;
 // bits per pixels. Bitmaps are simply pixmaps with a depth of
 // 1. (That is, they are monochrome bitmaps - each pixel can be either
 // on or off).
-// <p>
+// </p><p>
 // Bitmaps are mostly used as masks when drawing pixmaps, or as a
 // shape for a GDK.Window or a W(Widget)
-// <p>
+// </p>
 #define TWIN ((GdkWindow *)THIS->obj)
 #define GC(X) (get_gdkobject(X, GC))
 
@@ -139,7 +139,7 @@ NAME_ARGS(gc,filledp,x1,y1,x2,y2,angle1,angle2);
 FUNCTION(draw_text, "function(object,object,int,int,string,int|void:object)");
 ARGS(GDK.GC,GDK.Font,int,int,string,int|void);
 NAME_ARGS(gc,font,x,y,text,forcewide);
-// y is used as the baseline for the text.<br>
+// y is used as the baseline for the text.<br />
 // If forcewide is true, the string will be expanded to a wide string
 // even if it is not already one. This is useful when writing text
 // using either unicode or some other 16 bit font.
@@ -178,7 +178,7 @@ NAME_ARGS(gc,pixmap,xsrc,ysrc,xdest,ydest,width,height);
 FUNCTION(draw_bitmap, "function(object,object,int,int,int,int,int,int:object)");
 ARGS(GDK.GC,GDK.Bitmap,int,int,int,int,int,int);
 NAME_ARGS(gc,bitmap,xsrc,ysrc,xdest,ydest,width,height);
-// Draw a GDK(Bitmap) in this drawable.<br>
+// Draw a GDK(Bitmap) in this drawable.<br />
 // <b>NOTE:</b> This drawable must be a bitmap as well. This will be
 // fixed in GTK 1.3
 {
@@ -229,7 +229,7 @@ FUNCTION(ysize, "function(void:int)");
 
 FUNCTION(get_geometry, "function(void:mapping(string:int))");
 // Get width, height position and depth of the drawable as a mapping.
-// <br>
+// <br />
 // ([ "x":xpos, "y":ypos, "width":xsize, "height":ysize,
 //    "depth":bits_per_pixel ])
 {
diff --git a/src/post_modules/GTK/source/gdkfont.pre b/src/post_modules/GTK/source/gdkfont.pre
index 329cef0915f995fdf884985216bd099a2aca7605..85078a0ef07574b9d0b8635bb4ac9d8714af3ad3 100644
--- a/src/post_modules/GTK/source/gdkfont.pre
+++ b/src/post_modules/GTK/source/gdkfont.pre
@@ -9,9 +9,9 @@ class GdkFont;
 // information about XLFD's see the X reference documentation. A X
 // Logical Font Description (XLFD) consists of a sequence of fields
 // separated (and surrounded by) '-' characters. For example, Adobe
-// Helvetica Bold 12 pt, has the full description: <br>
+// Helvetica Bold 12 pt, has the full description: <br />
 // <i> "-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1"</i>
-// <p>
+// </p><p>
 
 
 //The fields in the XLFD are:
@@ -45,15 +45,16 @@ class GdkFont;
 // <tr><td>Charset Encoding</td>
 // <td>An identifier for the particular character set encoding.</td></tr>
 // </table>
-// <p>
+// </p><p>
 // When specifying a font via a X logical Font Description, '*' can be
 // used as a wildcard to match any portion of the XLFD. For instance,
 // the above example could also be specified as
 // <i>"-*-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-1"</i>
-// <p>
+// </p><p>
 // It is generally a good idea to use wildcards for any portion of the
 // XLFD that your program does not care about specifically, since that
 // will improve the chances of finding a matching font.
+// </p>
 FUNCTION(create, "function(string|void:void)");
 NAME_ARGS(font_name);
 // Create a new font object. The string is the font XLFD.
diff --git a/src/post_modules/GTK/source/gdkgc.pre b/src/post_modules/GTK/source/gdkgc.pre
index cecce17e126eddec4e8e3753f5ab72c6fb0070dd..baedc03bf9bee17173257430b5b00a194e5041ed 100644
--- a/src/post_modules/GTK/source/gdkgc.pre
+++ b/src/post_modules/GTK/source/gdkgc.pre
@@ -2,7 +2,7 @@ class GdkGC;
 // A GC, or Graphics Context, is used for most low-level drawing operation.
 // <p>
 // As an example, the foreground color, background color and drawing
-// function is stored in the GC.
+// function is stored in the GC.</p>
 //
 // NOIMG
 FUNCTION(create, "function(object:void)");
diff --git a/src/post_modules/GTK/source/gdkimage.pre b/src/post_modules/GTK/source/gdkimage.pre
index 15f15ed128784f14b84bb42c3f1c69fd0a23e0a7..67b80d22a20f8d160266bcc3de7220c2ff5af5ae 100644
--- a/src/post_modules/GTK/source/gdkimage.pre
+++ b/src/post_modules/GTK/source/gdkimage.pre
@@ -16,8 +16,8 @@ NAME_ARGS(fast_mode,image);
 
 // A 'fast' image will automatically revert back to 'slow' mode if no
 // shared memory is available.
-// <p>
-// If the second argument is specified, it is the actual image data.
+// </p><p>
+// If the second argument is specified, it is the actual image data.</p>
 {
   void pgtk_GdkImage_set( int );
   pgtk_verify_setup();
diff --git a/src/post_modules/GTK/source/gdkpixmap.pre b/src/post_modules/GTK/source/gdkpixmap.pre
index 13505a97893608b4b51c62eca8861a10733e86c8..0bd282a45e4eacc758406df5e6d72684570ccfba 100644
--- a/src/post_modules/GTK/source/gdkpixmap.pre
+++ b/src/post_modules/GTK/source/gdkpixmap.pre
@@ -4,7 +4,7 @@ inherit GdkDrawable;
 // Image.image object (or a numeric ID, see your X-manual for XIDs).
 // <p> The GDK.Pixmap object can be used in a lot
 // of different GTK widgets.  The most notable is the W(Pixmap)
-// widget.
+// widget.</p>
 //
 // NOIMG
 %{
diff --git a/src/post_modules/GTK/source/gdkregion.pre b/src/post_modules/GTK/source/gdkregion.pre
index 02cdd32c23dc344972d4f9071ee799d086f5d972..473e77aa23d648f0782ec20b3b01a6a9529cda07 100644
--- a/src/post_modules/GTK/source/gdkregion.pre
+++ b/src/post_modules/GTK/source/gdkregion.pre
@@ -129,7 +129,7 @@ ARGS(GDK.Region);
 RETURNS(GDK.Region);
 NAME_ARGS(with);
 // Computes the intersection of the given region and the region.
-// Also available as region & region
+// Also available as region &amp; region
 {
   struct object *o;
   void *v;
diff --git a/src/post_modules/GTK/source/gdkwindow.pre b/src/post_modules/GTK/source/gdkwindow.pre
index 96f59d80f65f2cc0d4d0094b46eec3d7be2fcbe9..585d2d8c9cf72118a23a5abc5938ae50020e31ac 100644
--- a/src/post_modules/GTK/source/gdkwindow.pre
+++ b/src/post_modules/GTK/source/gdkwindow.pre
@@ -59,7 +59,7 @@ FUNCTION(is_visible, "function(void:int)");
 }
 
 FUNCTION(set_cursor, "function(int:object)");
-// Change the window cursor.<table border=0 cellpadding=3 cellspacing=0>
+// Change the window cursor.<table border="0" cellpadding="3" cellspacing="0">
 // CURS(GDK.Arrow)
 // CURS(GDK.BasedArrowDown)
 // CURS(GDK.BasedArrowUp)
@@ -384,21 +384,21 @@ NAME_ARGS(property, offset, delete_when_done);
 // Returns the value (as a string) of the specified property.
 // The arguments are:
 // <p>
-// property: The property atom, as an example GDK.Atom.__SWM_VROOT<br>
-// offset (optional): The starting offset, in elements<br>
+// property: The property atom, as an example GDK.Atom.__SWM_VROOT<br />
+// offset (optional): The starting offset, in elements<br />
 // delete_when_done (optional): If set, the property will be deleted when it has
-// been fetched.<br>
-// <p>
+// been fetched.<br />
+// </p><p>
 // Example usage: Find the 'virtual' root window (many window managers
 // put large windows over the screen)
-// <p>
+// </p><p>
 // <pre>
 // &nbsp; GDK.Window root = GTK.root_window();
 // &nbsp; array maybe=root->children()->
 // &nbsp;             get_property(GDK.Atom.__SWM_VROOT)-({0});
 // &nbsp; if(sizeof(maybe))
 // &nbsp;   root=GDK.Window( maybe[0]->data[0] );
-// </pre>
+// </pre></p>
 {
   guchar *retdata;
   GdkAtom actual_property_type;
diff --git a/src/post_modules/GTK/source/gladexml.pre b/src/post_modules/GTK/source/gladexml.pre
index 32347431344e43f3d8e86f4d3e0d0a69d9541667..8cf05cc629a91f11ab2c2d9b3ba3eb616d7a6088 100644
--- a/src/post_modules/GTK/source/gladexml.pre
+++ b/src/post_modules/GTK/source/gladexml.pre
@@ -1,10 +1,10 @@
 require libglade;
 class GladeXML;
 
-// <a href=http://glade.pn.org/>Glade</a> is a free GUI builder for
+// <a href="http://glade.pn.org/">Glade</a> is a free GUI builder for
 // GTK+ and Gnome. It's normally used to create C-code, but can also
 // produce code for other languages. <a
-// href=http://www.daa.com.au/~james/gnome/>Libglade</a> is a utility
+// href="http://www.daa.com.au/~james/gnome/">Libglade</a> is a utility
 // library that builds the GUI from the Glade XML save files. This
 // module uses libglade and allows you to easily make GUI designs to
 // be used with your Pike applications. Since PiGTK doesn't
@@ -15,7 +15,7 @@ class GladeXML;
 #include <glade/glade.h>
 
 int glade_is_setup = 0;
-RCSID("$Id: gladexml.pre,v 1.8 2000/10/13 06:35:42 per Exp $");
+RCSID("$Id: gladexml.pre,v 1.9 2000/10/17 17:41:07 per Exp $");
 
 %{
 /* This function is used by signal_autoconnect to handle signal
@@ -326,4 +326,4 @@ RETURNS(void);
   pop_n_elems(args);
 }
 
-// <p align=right><font size=2><i>$Id: gladexml.pre,v 1.8 2000/10/13 06:35:42 per Exp $</i></font>
+// <p align="right"><font size="2"><i>$Id: gladexml.pre,v 1.9 2000/10/17 17:41:07 per Exp $</i></font></p>
diff --git a/src/post_modules/GTK/source/global.pre b/src/post_modules/GTK/source/global.pre
index db2499d2690f4c1acb0e2d225538b3398c30e36d..bbe5f033ccf0d257d580b37ae367ae7fee442857 100644
--- a/src/post_modules/GTK/source/global.pre
+++ b/src/post_modules/GTK/source/global.pre
@@ -187,7 +187,7 @@ NAME_ARGS(argv, do_not_parse_rc);
 // The second argument, if supplied, indicates that pike specific *rc files
 // should <b>not</b> be parsed.
 // <p>
-// The most common usage is GTK.setup_gtk(argv);
+// The most common usage is GTK.setup_gtk(argv);</p>
 {
   char **data;
   int argc;
@@ -336,8 +336,8 @@ NAME_ARGS(argc,no_pgtkrc);
 
 
 FUNCTION(main, "function(void:void)");
-// Start GTK in blocking mode.<br>
-// Doing this disables asynchronous I/O in pike.<br>
+// Start GTK in blocking mode.<br />
+// Doing this disables asynchronous I/O in pike.<br />
 // You can return -1 from main in pike to run GTK (and the rest of
 // pike) in asynchrounous mode.
 {
diff --git a/src/post_modules/GTK/source/gnomeabout.pre b/src/post_modules/GTK/source/gnomeabout.pre
index c72de113db4a56c3fab0f48b906aa18af5ac429a..a31e6b885feac5185abe14f4583912f3b631025b 100644
--- a/src/post_modules/GTK/source/gnomeabout.pre
+++ b/src/post_modules/GTK/source/gnomeabout.pre
@@ -8,7 +8,7 @@ inherit gnome_dialog;
 // displayed.
 // <p>
 // TIMG: Gnome.About( "Example", "1.0", "(c) Roxen IS 2000", ({"Per Hedbor"}), "Some nice documentation\nabout this example" );
-
+// </p>
 void create( string title, string version, string copyright, nullstringarray authors, string comment, ?string logo );
 // Creates a new GNOME About dialog. title, version, copyright, and
 // authors are displayed first, in that order. comments is typically
diff --git a/src/post_modules/GTK/source/gnomeapp.pre b/src/post_modules/GTK/source/gnomeapp.pre
index f455299dbbf4fc363ecbfa81c7e876f0929513a4..524ec59e7eead85a118c270d0bb334868e76491c 100644
--- a/src/post_modules/GTK/source/gnomeapp.pre
+++ b/src/post_modules/GTK/source/gnomeapp.pre
@@ -9,17 +9,17 @@ inherit window;
 // Once you have created one instance of this widget, you would add
 // your main application view information to this window by using
 // set_contents() routine.
-// <p>
+// </p><p>
 // The GnomeApp has support for including a menubar, one or more
 // toolbars and a statusbar for your application. It also takes care
 // of intalling the accelerators for you when used in conjuction with
 // the gnome-app-helper routines. The toolbars are inserted into
 // Gnome.Dock widgets.
-// <p>
+// </p><p>
 // The gnome-app-helper module provides various helper routines to
 // simplify the configuration of your menus and toolbars, but you can
 // create those yourself and use the set_menus(), add_toolbar(),
-// set_toolbar(), add_dock_item() and add_docked().
+// set_toolbar(), add_dock_item() and add_docked().</p>
 
 void create( string appname, ?string title );
 // Create a new (empty) application window. You must specify the
@@ -45,14 +45,14 @@ void add_toolbar( toolbar toolbar, string name, int behavior, int placement, int
 // overridden by the saved configuration, if any.
 // <p>
 //
-// toolbar : Toolbar to be added to app's dock<br>
-// name : Name for the dock item that will contain toolbar<br>
+// toolbar : Toolbar to be added to app's dock<br />
+// name : Name for the dock item that will contain toolbar<br />
 // behavior : Behavior for the new dock item. One or more of CONST(GNOME_DOCK_ITEM_BEH)
-// placement :  Placement for the new dock item, one of Gnome.DockTop,  Gnome.DockRight,  Gnome.DockBottom,  Gnome.DockLeft and  Gnome.DockFloating <br>
-// band_num : Number of the band where the dock item should be placed
-// band_position : Position of the new dock item in band band_num
+// placement :  Placement for the new dock item, one of Gnome.DockTop,  Gnome.DockRight,  Gnome.DockBottom,  Gnome.DockLeft and  Gnome.DockFloating <br />
+// band_num : Number of the band where the dock item should be placed<br />
+// band_position : Position of the new dock item in band band_num<br />
 // offset : Offset from the previous dock item in the band; if there is no previous item, offset from the beginning of the band.
-
+// </p>
 void add_docked( widget widget, string name, int behavior, int placement, int band_num, int band_position, ?int offset );
 // Create a new Gnome.DockItem widget containing widget, and add it
 // to app's dock with the specified layout information. Notice that,
@@ -60,14 +60,14 @@ void add_docked( widget widget, string name, int behavior, int placement, int ba
 // overridden by the saved configuration, if any.
 // <p>
 //
-// widget : Widget to be added to app's dock<br>
-// name : Name for the dock item that will contain toolbar<br>
+// widget : Widget to be added to app's dock<br />
+// name : Name for the dock item that will contain toolbar<br />
 // behavior : Behavior for the new dock item. One of CONST(GNOME_DOCK_ITEM_BEH)
-// placement :  Placement for the new dock item, one of Gnome.DockTop,  Gnome.DockRight,  Gnome.DockBottom,  Gnome.DockLeft and  Gnome.DockFloating <br>
-// band_num : Number of the band where the dock item should be placed
-// band_position : Position of the new dock item in band band_num
+// placement :  Placement for the new dock item, one of Gnome.DockTop,  Gnome.DockRight,  Gnome.DockBottom,  Gnome.DockLeft and  Gnome.DockFloating <br />
+// band_num : Number of the band where the dock item should be placed <br />
+// band_position : Position of the new dock item in band band_num <br />
 // offset : Offset from the previous dock item in the band; if there is no previous item, offset from the beginning of the band.
-
+// </p>
 void add_dock_item( gnome_dock_item item, int placement, int band_num, int band_position, ?int offset );
 // Create a new Gnome.DockItem widget containing widget, and add it
 // to app's dock with the specified layout information. Notice that,
@@ -75,12 +75,12 @@ void add_dock_item( gnome_dock_item item, int placement, int band_num, int band_
 // overridden by the saved configuration, if any.
 // <p>
 //
-// item : Item to be added to app's dock<br>
-// placement :  Placement for the new dock item, one of Gnome.DockTop,  Gnome.DockRight,  Gnome.DockBottom,  Gnome.DockLeft and  Gnome.DockFloating <br>
-// band_num : Number of the band where the dock item should be placed
-// band_position : Position of the new dock item in band band_num
+// item : Item to be added to app's dock<br />
+// placement :  Placement for the new dock item, one of Gnome.DockTop,  Gnome.DockRight,  Gnome.DockBottom,  Gnome.DockLeft and  Gnome.DockFloating <br />
+// band_num : Number of the band where the dock item should be placed <br />
+// band_position : Position of the new dock item in band band_num<br />
 // offset : Offset from the previous dock item in the band; if there is no previous item, offset from the beginning of the band.
-
+// </p>
 void enable_layout_config( int enable );
 // Specify whether the the dock's layout configuration should be
 // automatically saved via gnome-config whenever it changes, or not.
diff --git a/src/post_modules/GTK/source/gnomeappbar.pre b/src/post_modules/GTK/source/gnomeappbar.pre
index b73ca3ae7f40634bc6d91645ee2123f60e369718..7173a8ab7221dba91baa7a695e2855ea34d121dc 100644
--- a/src/post_modules/GTK/source/gnomeappbar.pre
+++ b/src/post_modules/GTK/source/gnomeappbar.pre
@@ -29,6 +29,7 @@ void create( int has_progress, int has_status, int interactivity );
 // Gnome.PREFERENCES_USER. Otherwise, use the setting you
 // support. Please note that "interactive" mode is not functional now;
 // GtkEntry is inadequate and so a custom widget will be written eventually.
+// </p>
 
 void set_status( string status );
 // Sets the status label without changing widget state; next set or
diff --git a/src/post_modules/GTK/source/gnomeapplet.pre b/src/post_modules/GTK/source/gnomeapplet.pre
index 76380a98bc97a8c48e81f286d1b9d0de09f10883..36cebf0e6e18db64d797f1b60a181b5abb9f4e0e 100644
--- a/src/post_modules/GTK/source/gnomeapplet.pre
+++ b/src/post_modules/GTK/source/gnomeapplet.pre
@@ -8,41 +8,41 @@ inherit plug;
 // of the panel), and a context menu.
 // <p>
 // The simplest applet one can write would be along the lines of:
-// <p>
+// </p><p>
 // <pre>
 // int main( int argc, array argv )
 // {
-//   Gnome.init( "hello", "1.0", argv, 0 );
-//   Gnome.AppletWidget("hello")-&gt;add(GTK.Label("Hello World!"))-&gt;show_all();
-//   GTK.applet_widget_gtk_main();
+// &nbsp; Gnome.init( "hello", "1.0", argv, 0 );
+// &nbsp; Gnome.AppletWidget("hello")-&gt;add(GTK.Label("Hello World!"))-&gt;show_all();
+// &nbsp; GTK.applet_widget_gtk_main();
 // }
 // </pre>
 // This creates an applet which just sits on the panel, not really
 // doing anything, in real life the label would be substituted by
 // something which actually does something useful. As you can see the
 // applet doesn't really take care of restarting itself.
-// <p>
+// </p><p>
 // For the applet to be added to the menus, you need to install two
 // files. Your x.gnorba file goes into $sysconfdir/CORBA/servers/ and
 // the x.desktop file goes into $prefix/share/applets/&lt;category&gt;/.
-// <p>
+// </p><p>
 // Example hello.desktop:
 // <pre>
 // [Desktop Entry]
-//  Name=Hello Applet
-//  Comment=An example Hello World type Applet
-//  Type=PanelApplet
-//  Exec=hello.pike
-//  Icon=gnome-hello.png
-//  Terminal=0
+// &nbsp;Name=Hello Applet
+// &nbsp;Comment=An example Hello World type Applet
+// &nbsp;Type=PanelApplet
+// &nbsp;Exec=hello.pike
+// &nbsp;Icon=gnome-hello.png
+// &nbsp;Terminal=0
 // </pre>
 // Example hello.gnorba:
 // <pre>
 // [hello]
-//  type=exe
-//  repo_id=IDL:GNOME/Applet:1.0
-//  description=Hello Applet
-//  location_info=hello.pike
+// &nbsp;type=exe
+// &nbsp;repo_id=IDL:GNOME/Applet:1.0
+// &nbsp;description=Hello Applet
+// &nbsp;location_info=hello.pike
 // </pre>
 // One thing to keep in mind is that the Exec line for the .desktop
 // doesn't actually get executed when the Type is PanelApplet. The
@@ -50,27 +50,27 @@ inherit plug;
 // "hello" enclosed by brackets). For a simple applet all you need to
 // do is replace the hello.pike with the name of your applet
 // executable.
-// <p>
+// </p><p>
 //  When the user right clicks on the applet, a menu appears, this is
 //  all handeled by the panel, so in order to add items to it you use
 //  a special interface to "add callbacks" to the menu. A very simple
 //  example would be (making our hello applet even more feature full):
-// <p>
+// </p>
 
 // <pre>
 // void hello_there()
 // {
-//   write( "Hello there, indeed!\n" );
+// &nbsp; write( "Hello there, indeed!\n" );
 // }
 //
 // int main( int argc, array argv )
 // {
-//   Gnome.AppletWidget w;
-//   Gnome.init( "hello", "1.0", argv, 0 );
-//   w = Gnome.AppletWidget("hello");
-//   w-&gt;add(GTK.Label("Hello World!"))-&gt;show_all();
-//   w-&gt;register_callback( "hello", "Hello there", hello_there, 0 );
-//   GTK.applet_widget_gtk_main();
+// &nbsp; Gnome.AppletWidget w;
+// &nbsp; Gnome.init( "hello", "1.0", argv, 0 );
+// &nbsp; w = Gnome.AppletWidget("hello");
+// &nbsp; w-&gt;add(GTK.Label("Hello World!"))-&gt;show_all();
+// &nbsp; w-&gt;register_callback( "hello", "Hello there", hello_there, 0 );
+// &nbsp; GTK.applet_widget_gtk_main();
 // }
 // </pre>
 // Now the user will see a "Hello There" menu item on the applet menu,
@@ -79,7 +79,7 @@ inherit plug;
 // Note that the first argument to the register_callback is just a
 // string identifier of this callback, and can really be whatever you
 // want. But it should NOT be translated as the label (the 2nd
-// argument) should be.
+// argument) should be.</p>
 
 #include <applet-widget.h>
 signal change_orient;
diff --git a/src/post_modules/GTK/source/gnomecalculator.pre b/src/post_modules/GTK/source/gnomecalculator.pre
index 979ae1158c265c136c9c90980c173becfd71b49f..79f8d22ccef78c62eb228a89f3c48b1e6279a6fa 100644
--- a/src/post_modules/GTK/source/gnomecalculator.pre
+++ b/src/post_modules/GTK/source/gnomecalculator.pre
@@ -8,6 +8,7 @@ inherit vbox;
 // standard arithmetic functions as well as trigonometric
 // capabilities, exponents, factorials, nested equations, and others.
 // IMG: Gnome.Calculator()
+// </p>
 
 signal result_changed;
 // This signal is emited by the widget when the result has been changed.
diff --git a/src/post_modules/GTK/source/gnomecanvas.pre b/src/post_modules/GTK/source/gnomecanvas.pre
index 88d3bbdd08a7d52c7b8e1b93ee8c7cfbd446e905..6e7132836e49246e7c99a0d3317f2aec2cdad8e1 100644
--- a/src/post_modules/GTK/source/gnomecanvas.pre
+++ b/src/post_modules/GTK/source/gnomecanvas.pre
@@ -6,6 +6,7 @@
 /* // applications. */
 /* // <p> */
 /* // It is, however, not yet wrapped in Pike GTK. */
+/* // </p> */
 /* FUNCTION(create, "function(int|void:void)"); */
 /* NAME_ARGS(anti_alias); */
 /* { */
diff --git a/src/post_modules/GTK/source/gnomecolorpicker.pre b/src/post_modules/GTK/source/gnomecolorpicker.pre
index c46ea3fbf046de891ca6a9a7d716c1955baf9792..564a9629cc641cca468a1636b6b462892696eef3 100644
--- a/src/post_modules/GTK/source/gnomecolorpicker.pre
+++ b/src/post_modules/GTK/source/gnomecolorpicker.pre
@@ -13,7 +13,7 @@ inherit button;
 // integers in the range 0 to 65,535, or integers in the range 0 to
 // 255, depending on your needs.
 // IMG: Gnome.ColorPicker();
-
+// </p>
 signal color_set;
 // This signal is emitted when the user changes the color on the color
 // selector. The values passed to this signal are the red, green, blue
diff --git a/src/post_modules/GTK/source/gnomedialog.pre b/src/post_modules/GTK/source/gnomedialog.pre
index ca5575c660354ea924fb999657158c712d44d273..b19808540dac8519e1ca738fa20934e7a0387e5c 100644
--- a/src/post_modules/GTK/source/gnomedialog.pre
+++ b/src/post_modules/GTK/source/gnomedialog.pre
@@ -23,6 +23,7 @@ NAME_ARGS(title, buttons);
 // starting with 0. So the first button in the arglist is button 0,
 // then button 1, etc. These numbers are used throughout the
 // Gnome.Dialog API.
+// </p>
 {
   char *title;
   char **buttons;
@@ -72,10 +73,11 @@ int  run( );
 // which by default destroys the dialog. If your button clicks do not
 // destroy the dialog, you don't know whether the dialog is destroyed
 // when run() returns. This is bad.
-// <p>
+// </p><p>
 // So you should either close the dialog on button clicks as well, or
 // change the close() behavior to hide instead of destroy. You can do
 // this with close_hides().
+// </p>
 
 int run_and_close( );
 // See run(). The only difference is that this function calls close()
@@ -100,7 +102,7 @@ void close();
 // <p>
 // Using close() in place of hide() or destroy() allows you to easily
 // catch all sources of dialog closure, including delete_event and
-// button clicks, and handle them in a central location.
+// button clicks, and handle them in a central location. </p>
 
 void set_close( int click_closes );
 // This is a convenience function so you don't have to connect
diff --git a/src/post_modules/GTK/source/gnomedock.pre b/src/post_modules/GTK/source/gnomedock.pre
index 1e8327e1b1da7e2b313077679e4b7750758514e0..9a927cd6faedc62cf3435e2d0134771935810a32 100644
--- a/src/post_modules/GTK/source/gnomedock.pre
+++ b/src/post_modules/GTK/source/gnomedock.pre
@@ -13,7 +13,7 @@ inherit container;
 // dragging functionality: every GnomeDockItem has a handle that users
 // can use to move them within the dock, or even move them outside it,
 // so that they become "floating items".
-// <p>
+// </p><p>
 // Every "dock area" is implemented by means of zero or more "dock
 // bands": a dock band is a horizontal or vertical stripe containing
 // one or more dock items, and is implemented by the GnomeDockBand
@@ -22,13 +22,14 @@ inherit container;
 // is given an offset value that defines the distance, in pixels, from
 // the previous item in the same band; if the item is first in the
 // band, the offset defines the distance from the start of the band.
-// <p>
+// </p><p>
 // As a consequence, the position of an item in the dock can be
 // specified by means of the following values: a "placement"
 // specifying what area is being used (top, bottom, left, right), a
 // "band number" specifying the number of the band within the
 // specified area, a "position" within the band and a "offset" from
 // the previous item in the same band.
+// </p>
 
 signal layout_changed;
 
diff --git a/src/post_modules/GTK/source/gnomedockband.pre b/src/post_modules/GTK/source/gnomedockband.pre
index 0cd267dc7289ed4551847620b460992398071e2d..4898f767d16ad81249178292e9659088b5c5a7f8 100644
--- a/src/post_modules/GTK/source/gnomedockband.pre
+++ b/src/post_modules/GTK/source/gnomedockband.pre
@@ -9,7 +9,7 @@ inherit container;
 // widget to implement its functionality. For an explanation of the
 // way dock bands are used within a dock, check out the documentation
 // for the W(GnomeDock) widget.
-
+// </p>
 void create();
 // Create a new Gnome.DockBand widget.
 
diff --git a/src/post_modules/GTK/source/gnomedockitem.pre b/src/post_modules/GTK/source/gnomedockitem.pre
index 1a3483cd122c72a2801c31eaf65e82abe91ab8aa..89e9e500bd13ebe9fd4e149c5b9dd8b1e78ed7ff 100644
--- a/src/post_modules/GTK/source/gnomedockitem.pre
+++ b/src/post_modules/GTK/source/gnomedockitem.pre
@@ -16,12 +16,12 @@ signal dock_detatch;
 
 void create( string name, int behavior );
 // Create a new GnomeDockItem named name, with the specified behavior.<p>
-//  Gnome.DockItemBehExclusive specifies that the dock item is always the only one in its band. <p>
-//  Gnome.DockItemBehNeverFloating specifies that users cannot detach the dock item from the dock. <p>
-//  Gnome.DockItemBehNeverVertical specifies that the dock item must be kept horizontal, and users cannot move it to a vertical band.<p>
-//  Gnome.DockItemBehNeverHorizontal specifies that the dock item must be kept horizontal, and users cannot move it to a vertical band.<p>
-//  Gnome.DockItemBehLocked specifies that users cannot drag the item around.<p>
-
+//  Gnome.DockItemBehExclusive specifies that the dock item is always the only one in its band. </p><p>
+//  Gnome.DockItemBehNeverFloating specifies that users cannot detach the dock item from the dock. </p><p>
+//  Gnome.DockItemBehNeverVertical specifies that the dock item must be kept horizontal, and users cannot move it to a vertical band.</p><p>
+//  Gnome.DockItemBehNeverHorizontal specifies that the dock item must be kept horizontal, and users cannot move it to a vertical band.</p><p>
+//  Gnome.DockItemBehLocked specifies that users cannot drag the item around.
+// </p>
 widget get_child( );
 // Retrieve the child of the item.
 
diff --git a/src/post_modules/GTK/source/gnomedocklayout.pre b/src/post_modules/GTK/source/gnomedocklayout.pre
index 67bdd7b618d70d95f9c858df55b2fcf93d12efae..ad01f4df06891c23aceeb002694795b0d20a8910 100644
--- a/src/post_modules/GTK/source/gnomedocklayout.pre
+++ b/src/post_modules/GTK/source/gnomedocklayout.pre
@@ -12,13 +12,13 @@ inherit object;
 //  to it. Moreover, Gnome.DockLayout is able to create a layout
 //  configuration string that can be later used to re-construct the
 //  layout on a brand new Gnome.DockLayout widget.
-// <p>
+// </p><p>
 // As a consequence, Gnome.DockLayout is very useful to save and
 // retrieve W(GnomeDock) configurations into files. For example,
 // W(GnomeApp) uses Gnome.DockLayout to create a default layout
 // configuration, override it with the user-specific configuration
 // file, and finally apply it to it's W(GnomeDock).
-
+// </p>
 void create();
 // Create a new Gnome.DockLayout widget.
 int add_item( gnome_dock_item item, int placement, int band_num, int band_position, int offset );
diff --git a/src/post_modules/GTK/source/gnomedruid.pre b/src/post_modules/GTK/source/gnomedruid.pre
index 5f88a0bf88b9533bd0f0e777a8e0e41195cc27ca..fc44b04733a25c82e1dca0231cca3f5de715b54c 100644
--- a/src/post_modules/GTK/source/gnomedruid.pre
+++ b/src/post_modules/GTK/source/gnomedruid.pre
@@ -13,11 +13,11 @@ inherit container;
 // almost all cases. The W(GnomeDruidPage) is a virtual widget, from
 // which all of the actual content of the page inherits from. There
 // are currently three of these available within gnome-libs.
-// <p>
+// </p><p>
 // GNOME druids are fairly simple to program with. You start by
 // creating a GnomeDruid into which you put all of your pages. This
 // widget will handle the presentation of the W(GnomeDruidPage) widgets.
-// <p>
+// </p><p>
 // You then create all appropriate W(GnomeDruidPage) widgets. There
 // are three implementations of these, although there is no reason why
 // more couldn't be written. They are the W(GnomeDruidPageStart), the
@@ -27,12 +27,12 @@ inherit container;
 // might suggest, are used at the endpoints of the druid. More
 // information on the specific properties of these widgets can be
 // found on their respective pages.
-// <p>
+// </p><p>
 // You will need to add the pages to the druid in order for them to
 // appear. The druid itself keeps an internal list of all pages, and
 // using the prepend_page(), append_page(), and insert_page()
 // functions will place them into it.
-
+// </p>
 void create();
 // Create a new druid
 
diff --git a/src/post_modules/GTK/source/gnomeentry.pre b/src/post_modules/GTK/source/gnomeentry.pre
index bce5558b842974c38ba769f0ee68b0ff47738f12..ba2aa172a9f1ab0664fc833099538b6989538704 100644
--- a/src/post_modules/GTK/source/gnomeentry.pre
+++ b/src/post_modules/GTK/source/gnomeentry.pre
@@ -8,7 +8,7 @@ inherit combo;
 // load and save the history of the text.
 //<p>
 // IMG: Gnome.Entry( "history" )
-
+//</p>
 void create( ?string history_id );
 // Creates a new GnomeEntry widget. If history_id is not 0, then
 // the history list will be saved and restored between uses under the
diff --git a/src/post_modules/GTK/source/gnomehref.pre b/src/post_modules/GTK/source/gnomehref.pre
index c74e9e8b0a6e0a2064f4bcf4307aa04cb8e5ba16..73dfe26b504239e141f5a4d7311b89f610c39515 100644
--- a/src/post_modules/GTK/source/gnomehref.pre
+++ b/src/post_modules/GTK/source/gnomehref.pre
@@ -6,6 +6,7 @@ inherit button;
 // <p>
 // IMG: Gnome.Href( "http://www.gnome.org", "GNOME Web Site" )
 // IMG: Gnome.Href( "http://www.gnome.org" )
+// </p>
 void create( string url, ?string label );
 // Created a GNOME href object, a label widget with a clickable action
 // and an associated URL. If label is set to 0, url is used as the
diff --git a/src/post_modules/GTK/source/gnomeiconlist.pre b/src/post_modules/GTK/source/gnomeiconlist.pre
index cad8cb969eb7cc9023dc8e8e716ca6642d6a1e3e..1ca3cc3bd57e2b8356d62395b9b852b0ae5ca1a8 100644
--- a/src/post_modules/GTK/source/gnomeiconlist.pre
+++ b/src/post_modules/GTK/source/gnomeiconlist.pre
@@ -7,7 +7,7 @@ inherit widget;
 // for the icons. This parameters is configured when you create the
 // icon list widget.
 // <p> You can control the type of selection mode you desire by using
-// the set_selection_mode() function.
+// the set_selection_mode() function.</p>
 
 signal select_icon;
 signal unselect_icon;
@@ -30,7 +30,7 @@ NAME_ARGS(icon_width,flags);
 // If flags has the Gnome.IconListIsEditable flag set, then the
 // user will be able to edit the text in the icon captions, and the
 // "text_changed" signal will be emitted when an icon's text is
-// changed.
+// changed.</p>
 {
   INT_TYPE a, b;
   get_all_args( "create", args, "%d%d", &a, &b );
@@ -58,7 +58,7 @@ void freeze();
 // <p>
 // You can call this function multiple times, but it must be balanced
 // with the same number of calls to thaw() before the changes will
-// take effect.
+// take effect.</p>
 void thaw();
 // Unfreeze the icon list
 void insert( int pos, string icon_filename, string text );
@@ -126,7 +126,7 @@ NAME_ARGS(icon,data);
 // This data can be used to find icons, and when an icon is selected it
 // can be easily retrieved using get_icon_data.
 // <p>
-// <b>You can only use objects as icon data right now</b>
+// <b>You can only use objects as icon data right now</b></p>
 {
   INT_TYPE row;
   struct object *obj;
diff --git a/src/post_modules/GTK/source/gnomeless.pre b/src/post_modules/GTK/source/gnomeless.pre
index d1bab9c94f345902a290bcfc94a7df4038a0e66b..5eb3b4f56e7f404fa1ddc23245964fa882b53693 100644
--- a/src/post_modules/GTK/source/gnomeless.pre
+++ b/src/post_modules/GTK/source/gnomeless.pre
@@ -10,6 +10,7 @@ inherit vbox;
 // IMG: Gnome.Less()->show_string("Example string\nshown in this\nwidget")
 // IMG: Gnome.Less()->show_file("/usr/dict/words" );
 // IMG: Gnome.Less()->show_command( "psrinfo -v" )
+// </p>
 void create();
 // Creates a new GnomeLess widget.
 void clear();
@@ -57,7 +58,7 @@ void set_font( GDK.Font font );
 // gl to font.<p>
 // Note: This will not affect text already being displayed. If you use
 // this function after adding text to the widget, you must show it
-// again by using reshow or one of the show commands.
+// again by using reshow or one of the show commands.</p>
 void set_fixed_font( int fixed );
 // Specifies whether or not new text should be displayed using a fixed
 // font. Pass TRUE in fixed to use a fixed font, or FALSE to revert to
@@ -66,7 +67,7 @@ void set_fixed_font( int fixed );
 // Note: This will not affect text already being displayed. If you use
 // this function after adding text to the widget, you must show it
 // again by using gnome_less_reshow or one of the gnome_less_show
-// commands.
+// commands.</p>
 void reshow();
 // Re-displays all of the text in the GnomeLess widget gl. If the font
 // has changed since the last show/reshow of text, it will update the
diff --git a/src/post_modules/GTK/source/gnomemessagebox.pre b/src/post_modules/GTK/source/gnomemessagebox.pre
index d92a7a53f3f90b729d01568818233c3a3b689da1..b54d8c7efc0b5390504f5411853c742bedc85567 100644
--- a/src/post_modules/GTK/source/gnomemessagebox.pre
+++ b/src/post_modules/GTK/source/gnomemessagebox.pre
@@ -15,11 +15,12 @@ constant string GNOME_MESSAGE_BOX_GENERIC;
 // strings are any of the GNOME_STOCK macros, then instead of creating
 // a button with the text, the button will be a GNOME stock button
 // with a stock icon.
+// </p><p>
 // The list of known types for message boxes are:
 // CONST(GNOME_MESSAGE_BOX).
 // TIMG: Gnome.MessageBox( "This is a nice message", Gnome.MessageBoxInfo, Gnome.StockButtonOk,  Gnome.StockButtonCancel );
 // TIMG: Gnome.MessageBox( "This is another not so nice message", Gnome.MessageBoxError, Gnome.StockButtonClose,  Gnome.StockButtonCancel );
-
+// </p>
 FUNCTION(create, "function(string, string, string ...:object)");
 NAME_ARGS(message, messagebox_type, buttons);
 // Creates a dialog box of type message_box_type with message. A
diff --git a/src/post_modules/GTK/source/gnomepixmapentry.pre b/src/post_modules/GTK/source/gnomepixmapentry.pre
index 6610afdeb0d94f24ba00efb84ed0facb24de6d67..834fe2b5a57f5f1aa4c5185e50e7b6e679b3556c 100644
--- a/src/post_modules/GTK/source/gnomepixmapentry.pre
+++ b/src/post_modules/GTK/source/gnomepixmapentry.pre
@@ -6,7 +6,7 @@ inherit vbox;
 // 1:1. This is perfect for selection of backgrounds and such. It also
 // allows DND to be performed on the preview box. It also provides all
 // the GnomeEntry functionality as well.
-// IMG: Gnome.PixmapEntry("","browse...","");
+// IMG: Gnome.PixmapEntry("","browse...",1);
 void create(string history_id, string browse_dialog_title, int do_preview );
 // Creates a new pixmap entry widget, if do_preview is false, the
 // preview is hidden but the files are still loaded so that it's easy
diff --git a/src/post_modules/GTK/source/gnomepropertybox.pre b/src/post_modules/GTK/source/gnomepropertybox.pre
index bb369c4ee8ca2c32e36eb6df4c2236456e38a3e1..ce44b1bf6a5b1e7d988b4f097c898cd3d3784d85 100644
--- a/src/post_modules/GTK/source/gnomepropertybox.pre
+++ b/src/post_modules/GTK/source/gnomepropertybox.pre
@@ -7,7 +7,7 @@ inherit gnome_dialog;
 // The Gnome.PropertyBox is a toplevel widget (it will create its own
 // window), inside it contains a GtkNotebook which is used to hold the
 // various property pages.
-// <p>
+// </p><p>
 // The box will include ok, cancel, apply and help buttons (the actual
 // buttons depends on the settings the user has, for example, apply
 // can be hidden). The ok and apply buttons will start up in
@@ -15,15 +15,16 @@ inherit gnome_dialog;
 // inserted into the property box to inform the widget of any state
 // changes to enable the ok and apply buttons. This is done by calling
 // the changed() function.
-// <p>
+// </p><p>
 // To use this widget, you create the widget and then you call
 // append_page() for each property page you want in the property box.
-// <p>
+// </p><p>
 // The widget emits two signals: "apply" and "help". To make a
 // functional dialog box you will want to connect to at least the
 // "apply" signal. Your function will be invoked once for each page
 // and one more time at the end, passing a special value of -1 for the
 // page number.
+// </p>
 void create();
 // Creates a new Gnome.PropertyBox widget.
 void changed();
diff --git a/src/post_modules/GTK/source/gnomescores.pre b/src/post_modules/GTK/source/gnomescores.pre
index 1f8420f1aa2bf0b1c4dd7a9c9fdfb66d4d5cfc45..0df1d7a4b95297cdfcc1aac1f47ae2bdc96b0e09 100644
--- a/src/post_modules/GTK/source/gnomescores.pre
+++ b/src/post_modules/GTK/source/gnomescores.pre
@@ -5,7 +5,7 @@ inherit gnome_dialog;
 // loading/saving systemwide high scores in a secure way.
 // <p>
 // TIMG: Gnome.Scores( 17, ({ "per" })*17, map((array(float))indices(allocate(17)),`*,42), map(indices(allocate(17)), `*, 10 ), 1 )
-
+// </p>
 void create(int n_scores,stringarray names,floatarray scores,intarray times,int clear);
 void set_logo_pixmap( string logofile );
 void set_logo_widget( widget widget );
diff --git a/src/post_modules/GTK/source/gnomestatusdocklet.pre b/src/post_modules/GTK/source/gnomestatusdocklet.pre
index c663f177ea2a422ca3119679c15f9973d9628a33..6fc22e04ba39dcbfd0d6629149bbeecf453a0b43 100644
--- a/src/post_modules/GTK/source/gnomestatusdocklet.pre
+++ b/src/post_modules/GTK/source/gnomestatusdocklet.pre
@@ -25,9 +25,9 @@ inherit object;
 // though the panel will never restart by itself, the user might not
 // run session management and thus might restart panel by hand, or due
 // to a bug, the panel might crash and restart itself.
-// <p>
+// </p><p>
 // Docklets are not available in GNOME 1.0.
-// <p>
+// </p>
 #define GNOME_STATUS_DOCKLET(X) ((StatusDocklet *)X)
 #define GnomeStatusDocklet StatusDocklet
 #define gnome_status_docklet_new status_docklet_new
diff --git a/src/post_modules/GTK/source/gtkadjustment.pre b/src/post_modules/GTK/source/gtkadjustment.pre
index 205797d1bf2650ca087ef1c56dccab7b02bf04c2..1bc6b53a967ca58cfb6112bd237743b115ef7389 100644
--- a/src/post_modules/GTK/source/gtkadjustment.pre
+++ b/src/post_modules/GTK/source/gtkadjustment.pre
@@ -9,12 +9,12 @@ inherit data;
 // The GtkAdjustment object does not update the value itself. Instead
 // it is left up to the owner of the GtkAdjustment to control the
 // value.
-// <p>
+// </p><p>
 // The owner of the GtkAdjustment typically calls the value_changed()
 // and changed() functions after changing the value or its
 // bounds. This results in the emission of the "value_changed" or
 // "changed" signal respectively.
-// <p>
+// </p>
 signal changed;
 // The adjustment changed in some way
 
diff --git a/src/post_modules/GTK/source/gtkalignment.pre b/src/post_modules/GTK/source/gtkalignment.pre
index a3549637d741121eff3f0600f285f4c25b0e03a5..a9b4a88d587b964f039c482fcc4279ee95b4cda5 100644
--- a/src/post_modules/GTK/source/gtkalignment.pre
+++ b/src/post_modules/GTK/source/gtkalignment.pre
@@ -9,12 +9,12 @@ inherit bin;
 // values can range from 0 (meaning the child doesn't expand at all)
 // to 1 (meaning the child expands to fill all of the available
 // space).
-// <p>
+// </p><p>
 // The align settings are used to place the child widget within the
 // available area. The values range from 0 (top or left) to 1 (bottom
 // or right). Of course, if the scale settings are both set to 1, the
 // alignment settings have no effect.
-//
+// </p>
 // NOIMG
 
 void create( float xalign, float yalign, float xscale, float yscale);
diff --git a/src/post_modules/GTK/source/gtkbox.pre b/src/post_modules/GTK/source/gtkbox.pre
index 38fb51f146191d5dcf1bd008a5b6b585982de8d4..2627adffe4a5d500764afeb7a706f543d663b847 100644
--- a/src/post_modules/GTK/source/gtkbox.pre
+++ b/src/post_modules/GTK/source/gtkbox.pre
@@ -30,12 +30,12 @@ void set_child_packing(widget child_widget,int expandp,int fillp,int padding,int
 // space. Padding is the amount of padding to use, and pack_type is
 // one of CONST(GTK_PACK).
 // <p>
-// You can emulate pack_start and pack_end with add and set_child_packing.
+// You can emulate pack_start and pack_end with add and set_child_packing.</p>
 FUNCTION(query_child_packing, "function(object:mapping)");
 ARGS(GTK.Widget);
 NAME_ARGS(child);
 RETURNS("mapping(string:int)");
-// Return a mapping:<br>
+// Return a mapping:<br />
 // ([ "expand":expandp, "fill":fillp, "padding":paddingp, "type":type ])
 {
   struct object *o;
diff --git a/src/post_modules/GTK/source/gtkcalendar.pre b/src/post_modules/GTK/source/gtkcalendar.pre
index cf40f9c571227644537da8165c8bc8b860b88c8c..1cf4cf9870d70c5b7f3b7dcd0b056a2486f9b3fa 100644
--- a/src/post_modules/GTK/source/gtkcalendar.pre
+++ b/src/post_modules/GTK/source/gtkcalendar.pre
@@ -33,7 +33,7 @@ void display_options( int options );
 // Bitwise or of one or more of CONST(GTK_CALENDAR).
 
 FUNCTION(get_date, "function(void:mapping)");
-// returns a mapping:<br>
+// returns a mapping:<br />
 // ([ "year":year, "month":month, "day":day ])
 {
   guint y, m, d;
diff --git a/src/post_modules/GTK/source/gtkclist.pre b/src/post_modules/GTK/source/gtkclist.pre
index fd62966e42932dcbd92efc246f691ea1de1d765b..17507da55dd06b912350a0e7b309640b86dc818d 100644
--- a/src/post_modules/GTK/source/gtkclist.pre
+++ b/src/post_modules/GTK/source/gtkclist.pre
@@ -33,10 +33,9 @@ signal abort_column_resize;
 void create( int columns );
 // Create a new empty clist, columns columns wide.
 // <p>
-// Not all
-// columns have to be visible, some can be used to store data that is
+// Not all columns have to be visible, some can be used to store data that is
 // related to a certain cell in the list.
-
+//</p>
 void set_hadjustment( adjustment adjustment );
 // Set the W(Adjustment) object used for horizontal scrolling
 void set_vadjustment( adjustment adjustment );
@@ -52,14 +51,14 @@ void set_shadow_type( int shadowtype );
 // One of CONST(GTK_SHADOW)
 
 void set_selection_mode( int mode );
-// One of CONST(GTK_SELECTION)<br>
+// One of CONST(GTK_SELECTION)<br />
 
 void set_reorderable( int reorderablep );
 // If true, the user can drag around the rows in the list.
 void set_use_drag_icons( int dragiconsp );
 // If true, hard coded drag icons will be used.
 void set_button_actions( int button, int action );
-// Action is a bitwise or of CONST(GTK_BUTTON)<br>
+// Action is a bitwise or of CONST(GTK_BUTTON)<br />
 // Button is the mouse button (normally 1-3, 4 and 5 sometimes beeing
 // scroll wheel up and scroll wheel down)
 
@@ -129,7 +128,7 @@ void set_row_height( int pixels );
 void moveto( int row, int column, float xpos, float ypos );
 // Make the specified row and column visible, and place it relative to
 // xpos and ypos in the area the Clist occupies.  <p> xpos and ypos
-// are relative, 0.0 == top, 1.0 == bottom
+// are relative, 0.0 == top, 1.0 == bottom</p>
 
 int get_cell_type( int row, int column );
 // Return value is one of CONST(GTK_CELL)
@@ -234,7 +233,7 @@ NAME_ARGS(row,column,text,spacing,image,mask);
 
 FUNCTION(get_pixtext, "function(int,int:mapping)");
 NAME_ARGS(row, column);
-// Return the pixmap and text for the specified cell as a mapping:<br>
+// Return the pixmap and text for the specified cell as a mapping:<br />
 // ([ "spacing":spacing, "text":text, "pixmap":pixmap ])
 {
   INT_TYPE x, y, s;
@@ -319,6 +318,7 @@ void set_shift( int row, int column, int yshift, int xshift );
 // <p>
 // This can be useful to generate a tree-like layout when you do not
 // want to make a W(Ctree)
+// </p>
 void set_selectable( int row, int selectablep );
 // If true, the row can be selected by the user, otherwise it cannot
 // be selected, only focused.
@@ -329,14 +329,14 @@ int append( stringarray/GTK_CLIST{THIS->obj}->columns columns );
 //  added.
 // <p>
 // 'columns' are the texts we want to put in the columns. The size of
-// the array should equal the number of columns in the list.
+// the array should equal the number of columns in the list.</p>
 
 int prepend( stringarray/GTK_CLIST{THIS->obj}->columns columns );
 //  The return value of indicates the index of the row that was just
 //  added.
 // <p>
 // 'columns' are the texts we want to put in the columns. The size of
-// the array should equal the number of columns in the list.
+// the array should equal the number of columns in the list.</p>
 
 int insert( int row, stringarray/GTK_CLIST{THIS->obj}->columns columns );
 // Insert a row after a specified row.<p>
@@ -344,9 +344,9 @@ int insert( int row, stringarray/GTK_CLIST{THIS->obj}->columns columns );
 //  added, please note that this is not nessasarily the same row as
 //  the specified one, if autosort is activated, the row will be
 //  inserted so that the list is sill sorted.
-// <p>
+// </p><p>
 // 'columns' are the texts we want to put in the columns. The size of
-// the array should equal the number of columns in the list.
+// the array should equal the number of columns in the list.</p>
 
 void remove( int row );
 // Delete a specified row. If you want to remove all rows in a Clist,
@@ -365,7 +365,7 @@ NAME_ARGS(row,data);
 // This data can be used to find rows, and when a row is selected it
 // can be easily retrieved using node_get_row_data.
 // <p>
-// <b>You can only use objects as row data right now</b>
+// <b>You can only use objects as row data right now</b></p>
 {
   INT_TYPE row;
   struct object *obj;
@@ -595,7 +595,7 @@ static void my_free_svalue( struct svalue *s )
 FUNCTION(set_compare_func, "function(function|void:object)");
 NAME_ARGS(cmpfun);
 // Set the compare function. The function will be called with a
-// mapping as it's only argument, like this:<br><pre>
+// mapping as it's only argument, like this:<br /><pre>
 // &nbsp; ([
 // &nbsp;    "clist":the clist widget,
 // &nbsp;    "sort_column":the column to sort on,
@@ -603,12 +603,12 @@ NAME_ARGS(cmpfun);
 // &nbsp;    "row2_data":The user data pointer for the second row,
 // &nbsp;    "row1_text":The text in the sort cell in the first row
 // &nbsp;    "row2_text":The text in the sort cell in the second row
-// &nbsp: ])
+// &nbsp; ])
 // </pre>
 // The return value is one of:<p>
-//   1: Row 1 is more than row 2<br>
-//   0: The rows are equal<br>
-//  -1: Row 1 is lesser than row 2<br>
+//   1: Row 1 is more than row 2<br />
+//   0: The rows are equal<br />
+//  -1: Row 1 is lesser than row 2</p>
 {
   if(IS_ZERO(Pike_sp-1))
   {
diff --git a/src/post_modules/GTK/source/gtkclock.pre b/src/post_modules/GTK/source/gtkclock.pre
index 5eff72eaf013916e6495e450b06efff673646a79..f4c9e8ca90566b1ad3e71a6dd3b584b964f64396 100644
--- a/src/post_modules/GTK/source/gtkclock.pre
+++ b/src/post_modules/GTK/source/gtkclock.pre
@@ -11,9 +11,9 @@ inherit label;
 // displays the current time, count-up/increasing - which counts up
 // from an initial value (like a stopwatch), and count-down/decreasing
 // - which counts down from an initial value.
-// <p>
+// </p><p>
 // Note, however, that the accuracy of the gtkclock widget is limited
-// to 1 second.
+// to 1 second.</p>
 // IMG: GTK.Clock( GTK.ClockRealtime );
 // IMG: GTK.Clock( GTK.ClockDecreasing )->set_seconds(10000)->start();
 
diff --git a/src/post_modules/GTK/source/gtkcolorselection.pre b/src/post_modules/GTK/source/gtkcolorselection.pre
index 29503e08ab626681951e99225d8b3ddf61aa4b27..3f80497caf96a8cb2a71f6ecf5cf2219d4794ccf 100644
--- a/src/post_modules/GTK/source/gtkcolorselection.pre
+++ b/src/post_modules/GTK/source/gtkcolorselection.pre
@@ -12,7 +12,7 @@ inherit vbox;
 // "color_changed", which is emitted whenever the current color in the
 // widget changes, either when the user changes it or if it's set
 // explicitly through set_color().
-// <p>
+// </p>
 // IMG: GTK.ColorSelection()
 void create();
 // Create a new color selection.
@@ -23,7 +23,7 @@ void set_update_policy( int policy );
 // current color is updated continuously when the user drags the
 // sliders or presses the mouse and drags in the hue-saturation wheel
 // or value bar. If you experience performance problems, you may want
-// to set the policy to GTK.UpdateDiscontinuous or GTK.UpdateDelayed.
+// to set the policy to GTK.UpdateDiscontinuous or GTK.UpdateDelayed.</p>
 void set_opacity( int opacity );
 // The color selection widget supports adjusting the opacity of a
 // color (also known as the alpha channel). This is disabled by
diff --git a/src/post_modules/GTK/source/gtkcolorselectiondialog.pre b/src/post_modules/GTK/source/gtkcolorselectiondialog.pre
index 707c74b6651b2e237916a74fcc2f88a48e5e1769..a8fb30705b5be2f2a871519d62639e19c5ca8db1 100644
--- a/src/post_modules/GTK/source/gtkcolorselectiondialog.pre
+++ b/src/post_modules/GTK/source/gtkcolorselectiondialog.pre
@@ -5,6 +5,7 @@ inherit window;
 // different subwidgets directly.
 // <p>
 // TIMG: GTK.ColorSelectionDialog("Select color")
+// </p>
 signal color_changed;
 // Called when the color is changed
 void create( string title );
diff --git a/src/post_modules/GTK/source/gtkcombo.pre b/src/post_modules/GTK/source/gtkcombo.pre
index b0454428e369d09df189f269f333134181d91123..e58fab059cbacda967f3e9a4f1d8570d09363b9e 100644
--- a/src/post_modules/GTK/source/gtkcombo.pre
+++ b/src/post_modules/GTK/source/gtkcombo.pre
@@ -9,7 +9,7 @@ inherit hbox;
 // <p>
 // The combo box has two principal parts that you as the programmer
 // really care about: The W(entry) and the W(list).
-// <p>
+// </p>
 // IMG: GTK.Combo()
 void create();
 // Create a new combo box
diff --git a/src/post_modules/GTK/source/gtkctree.pre b/src/post_modules/GTK/source/gtkctree.pre
index 6e6431a86f4f38b7f30d49c03150a44b6ec9db29..04451c8079f9c3ecf5e15d417d04c8164fc4e60d 100644
--- a/src/post_modules/GTK/source/gtkctree.pre
+++ b/src/post_modules/GTK/source/gtkctree.pre
@@ -5,16 +5,16 @@ inherit clist;
 // <p>
 // The tree is internally represented as a set of GtkCTreeNode
 // structures.
-// <p>
+// </p><p>
 // The interface has much in common with the GtkCList widget: rows
 // (nodes) can be selected by the user etc.
-// <p>
+// </p><p>
 // Positions in the tree are often indicated by two arguments, a
 // parent and a sibling, both GtkCTreeNode pointers. If the parent is
 // NULL, the position is at the root of the tree and if the sibling is
 // NULL, it will be the last child of parent, otherwise it will be
 // inserted just before the sibling.
-
+// </p>
 #define GtkCtreerow GtkCTreeRow
 #define GtkCtree GtkCTree
 
@@ -65,7 +65,7 @@ RETURNS(GTK.CTreeNode);
 // If the parent and sibling is 0, the position is at the root of the
 // tree, if the sibling is NULL, it will be the last child of parent,
 // otherwise it will be inserted just before the sibling.
-// <p>
+// </p>
 {
   GtkCTreeNode *parent = NULL, *sibling = NULL;
   struct array *text = NULL;
@@ -116,7 +116,7 @@ void remove_node( ?CTreeNode node );
 int is_viewable( ?CTreeNode node );
 // Returns 1 if a certain node can be viewed (with or without
 // scrolling of the tree).<p>
-// Returns 0 if the node is in a folded part of the tree.
+// Returns 0 if the node is in a folded part of the tree.</p>
 CTreeNode last( ?CTreeNode node );
 // Returns the last child of the last child of the last child... of
 // the given node.
@@ -127,7 +127,7 @@ CTreeNode node_nth( int row );
 // Return the node that is currently visible on the specified row.
 int find( CTreeNode node, ?CTreeNode start );
 // Returns true if the node is a child of the start node.
-// <br>If you omit the starting node, the tree will be searched from
+// <br />If you omit the starting node, the tree will be searched from
 // the root.
 int is_ancestor( CTreeNode node, CTreeNode child );
 // Returns true if <b>node</b> is an ancestor of <b>child</b>
@@ -246,7 +246,7 @@ NAME_ARGS(node, column);
 
 FUNCTION(node_get_pixmap, "function(object,int:mapping)");
 NAME_ARGS(row, column);
-// Returns the pixmap and mask of this node in a mapping:<br>
+// Returns the pixmap and mask of this node in a mapping:<br />
 // ([ "pixmap":the_pixmap, "mask":the_bitmap ])
 {
   struct object *x;
@@ -282,7 +282,7 @@ NAME_ARGS(row, column);
 
 FUNCTION(node_get_pixtext, "function(object,int:mapping)");
 NAME_ARGS(row, column);
-// Returns the pixmap, mask and text of this node in a mapping:<br>
+// Returns the pixmap, mask and text of this node in a mapping:<br />
 // ([ "pixmap":the_pixmap, "mask":the_bitmap, "text":the_text ])
 {
   struct object *x;
@@ -352,7 +352,7 @@ NAME_ARGS(node,data);
 // This data can be used to find nodes, and when a node is selected it
 // can be easily retrieved using node_get_row_data.
 // <p>
-// <b>You can only use objects as row data right now</b>
+// <b>You can only use objects as row data right now</b></p>
 {
   struct object *row;
   struct object *obj;
@@ -412,12 +412,12 @@ void sort_recursive( ?CTreeNode node );
 // Sort the specified node and it's children.
 
 class CTreeNode;
-// This is one of the nodes (branch or leaf) of the CTree.<br>
+// This is one of the nodes (branch or leaf) of the CTree.<br />
 // They are the equivalent of row numbers in a normal CList.
 #define GTK_CTREENODE(X) ((GtkCTreeNode *)X)
 FUNCTION(row, "function(void:object)");
 RETURNS(GTK.CTreeRow);
-// Returns the CTreeRow associated with this CTreeNode.<br>
+// Returns the CTreeRow associated with this CTreeNode.<br />
 // <b>DEPRECATED</b>, all CTreeRow functions are also available
 // directly in this object.
 {
diff --git a/src/post_modules/GTK/source/gtkdatabox.pre b/src/post_modules/GTK/source/gtkdatabox.pre
index 125b5feec4eb701902b18476b1d8a1ec772838fd..6f5bfc757af11d6b2f95defaf6769a055c2733d9 100644
--- a/src/post_modules/GTK/source/gtkdatabox.pre
+++ b/src/post_modules/GTK/source/gtkdatabox.pre
@@ -10,6 +10,7 @@ ADD_INCLUDE(#include <gtkdatabox.h>);
 // <p>
 // The widget may be used as display for oscilloscopes or other
 // applications that need to display fast changes in their data.
+// </p>
 // IMG:   GTK.Databox x=GTK.Databox(); x->data_add_x_y(3, ({ 1.0, 0.5, 0.0 }), ({1.0, -1.0, 0.0}),GDK.Color(Image.Color.red), GTK.DataboxLines,2); x->rescale(); x->set_usize(300,300); return x;
 
 constant int GTK_DATABOX_NOT_DISPLAYED;
diff --git a/src/post_modules/GTK/source/gtkdial.pre b/src/post_modules/GTK/source/gtkdial.pre
index 6c406ec3e04d27ccdedc88d62a8fd9c7bb30dc7d..5e872259caa267d0436a45d61f41a6c3933dc6c7 100644
--- a/src/post_modules/GTK/source/gtkdial.pre
+++ b/src/post_modules/GTK/source/gtkdial.pre
@@ -17,17 +17,17 @@ void set_update_policy( int when );
 // and emit the "value_changed" signal on this Adjustment. The update
 // policies are:
 // <dl>
-// <dt>GTK.UpdatePolicyContinuous
+// <dt>GTK.UpdatePolicyContinuous</dt>
 // <dd>This is the default. The "value_changed" signal is emitted
 // continuously, i.e., whenever the slider is moved by even the
-// tiniest amount.
-// <dt>GTK.UpdatePolicyDiscontinuous
+// tiniest amount.</dd>
+// <dt>GTK.UpdatePolicyDiscontinuous</dt>
 // <dd> The "value_changed" signal is only emitted once the slider has
-// stopped moving and the user has released the mouse button.
-// <dt>GTK.UpdatePolicyDelayed
+// stopped moving and the user has released the mouse button.</dd>
+// <dt>GTK.UpdatePolicyDelayed</dt>
 // <dd>The "value_changed" signal is emitted when the user releases
 // the mouse button, or if the slider stops moving for a short period
-// of time.
+// of time.</dd>
 // </dl>
 
 void set_adjustment( adjustment pos );
diff --git a/src/post_modules/GTK/source/gtkeventbox.pre b/src/post_modules/GTK/source/gtkeventbox.pre
index 90eff9748404724af1b166b2bf08900fa9c8173d..9e6cd14796be6f245137206706b3432a8f454c5a 100644
--- a/src/post_modules/GTK/source/gtkeventbox.pre
+++ b/src/post_modules/GTK/source/gtkeventbox.pre
@@ -16,11 +16,11 @@ inherit bin;
 // clipping on it's contents. Although the name EventBox emphasizes
 // the event-handling function, the widget can also be used for
 // clipping.
-//<p>
+// </p><p>
 // The primary use for this widget is when you want to receive events
 // for a widget without a window. Examples of such widgets are labels
 // and images.
-//
+// </p>
 // IMG: GTK.EventBox()->set_usize(100,100)
 void create();
 // Create a new event box widget
diff --git a/src/post_modules/GTK/source/gtkfileselection.pre b/src/post_modules/GTK/source/gtkfileselection.pre
index d7e951ec70b19d6dc4ee888dc08a283128b0c67b..537ab5ca3bcdace3dfca6cc2cca50b5cd44c8f1a 100644
--- a/src/post_modules/GTK/source/gtkfileselection.pre
+++ b/src/post_modules/GTK/source/gtkfileselection.pre
@@ -10,17 +10,18 @@ inherit window;
 // <p>
 // The default filename can be set using set_filename() and the
 // selected filename retrieved using get_filename().
-// <p>
+// </p><p>
 // Use complete() to display files that match a given pattern. This
 // can be used for example, to show only *.txt files, or only files
 // beginning with gtk*.
-// <p>
+// </p><p>
 // Simple file operations; create directory, delete file, and rename
 // file, are available from buttons at the top of the dialog. These
 // can be hidden using hide_fileop_buttons() and shown again using
 // show_fileop_buttons().
-// <p>
+// </p><p>
 // TIMG: GTK.FileSelection("File selector")
+// </p>
 
 subwidget button ok_button;
 // The ok button
diff --git a/src/post_modules/GTK/source/gtkfixed.pre b/src/post_modules/GTK/source/gtkfixed.pre
index 2fffc5d6cebc09ca020ba71683f66a8af092fa9d..2b0187c243a72e1dadcfcb0f3e0e6617895d7cb6 100644
--- a/src/post_modules/GTK/source/gtkfixed.pre
+++ b/src/post_modules/GTK/source/gtkfixed.pre
@@ -5,6 +5,7 @@ inherit container;
 // <p>
 //  Example:
 // IMG: GTK.Fixed()->put(GTK.Label("100,100"), 100, 100)->put(GTK.Label("0,0"), 0, 0)->set_usize(150,115)
+// </p>
 void create();
 // Create a new fixed widget
 void put( widget widget, int x, int y );
diff --git a/src/post_modules/GTK/source/gtkfontselectiondialog.pre b/src/post_modules/GTK/source/gtkfontselectiondialog.pre
index f907c8a65d20e609d66a09709da8d61c0c082b01..fe4f553ea88f6cd0539395418824c301ec4f1bcd 100644
--- a/src/post_modules/GTK/source/gtkfontselectiondialog.pre
+++ b/src/post_modules/GTK/source/gtkfontselectiondialog.pre
@@ -3,14 +3,14 @@ inherit window;
 // The GtkFontSelectionDialog widget is a dialog box for selecting a font.
 // <p>
 // To set the font which is initially selected, use set_font_name().
-// <p>
+// </p><p>
 // To get the selected font use get_font() or get_font_name().
-// <p>
+// </p><p>
 // To change the text which is shown in the preview area, use
 // set_preview_text().
-// <p>
+// </p><p>
 // The base filter is not yet implemented in Pike GTK.
-// <p><i><font size=-1>
+// </p><p><i><font size="-1">
 // Filters can be used to limit the fonts shown. There are 2 filters in
 // the GtkFontSelectionDialog - a base filter and a user filter. The
 // base filter can not be changed by the user, so this can be used when
@@ -19,7 +19,7 @@ inherit window;
 // fixed-width font). The user filter can be changed or reset by the
 // user, by using the 'Reset Filter' button or changing the options on
 // the 'Filter' page of the dialog.
-// <font size=-1></i>
+// </font></i></p>
 // TIMG: GTK.FontSelectionDialog("Select a font")
 subwidget font_selection fontsel;
 // The W(FontSelection) widget
diff --git a/src/post_modules/GTK/source/gtkframe.pre b/src/post_modules/GTK/source/gtkframe.pre
index bd13cc6fd81ca460c71b10cbd73cbf1b9b58fc61..29d3b74e87e4cbeb211d8d580022eab00d2b5cff 100644
--- a/src/post_modules/GTK/source/gtkframe.pre
+++ b/src/post_modules/GTK/source/gtkframe.pre
@@ -6,17 +6,18 @@ inherit container;
 // label can be controlled with set_label_align().
 // <p>
 // Used to visually group objects.
-// <p>
+// </p><p>
 // IMG: GTK.Frame("Title")->add(GTK.Label("Contents"))
 // IMG: GTK.Frame()->add(GTK.Label("Contents"))
 // IMG: GTK.Frame()->add(GTK.Label("Contents"))->set_shadow_type(GTK.SHADOW_IN)
+// </p>
 void create( ?string label_text );
 // Create a new W(Frame) widget.
 void set_label( ?string label_text );
 // Set the text of the label.
 void set_label_align( float xalign, float yalign );
 // Arguments are xalignment and yalignment.
-// 0.0 is left or topmost, 1.0 is right or bottommost.<br>
+// 0.0 is left or topmost, 1.0 is right or bottommost.<br />
 // The default value for a newly created Frame is 0.0.
 void set_shadow_type( int shadow_type );
 // Set the shadow type for the Frame widget. The type is one of
diff --git a/src/post_modules/GTK/source/gtkgammacurve.pre b/src/post_modules/GTK/source/gtkgammacurve.pre
index 55abdf64b865c52358f1327dfabafd1d45e8e893..1936ac9b82990c0ac56f4bdd50dcddc6b0572b97 100644
--- a/src/post_modules/GTK/source/gtkgammacurve.pre
+++ b/src/post_modules/GTK/source/gtkgammacurve.pre
@@ -7,7 +7,7 @@ class gamma_curve;
 // for input and output. You can set the initial vector as well. You
 // are guaranteed that every input value will have a (not necessarily
 // unique) output value specified.
-//
+// </p>
 // IMG: GTK.GammaCurve()->set_usize(210,130)
 inherit vbox;
 void create();
diff --git a/src/post_modules/GTK/source/gtkhpaned.pre b/src/post_modules/GTK/source/gtkhpaned.pre
index b74edde7f0ac590685c3122a5ed264d9f22619c4..264cf9107a5ada9ef842eb48b298cd4a581df800 100644
--- a/src/post_modules/GTK/source/gtkhpaned.pre
+++ b/src/post_modules/GTK/source/gtkhpaned.pre
@@ -7,7 +7,8 @@ inherit paned;
 // makes a horizontal division
 // <p>
 // See W(Paned) for details.
-// <p>
+// </p><p>
 // IMG: GTK.Hpaned()->add1(GTK.Label("Left\nSide\nOf\nPane"))->add2(GTK.Label("Right\nSide\nOf\nPane"))->set_usize(100,100)
+//</p>
 void create();
 
diff --git a/src/post_modules/GTK/source/gtkhscale.pre b/src/post_modules/GTK/source/gtkhscale.pre
index 60b7bb84c0f4fddaae0e358adcb8bd6bd11ccf7f..ec75fde25884c97655d5a7dc217d73431aa85912 100644
--- a/src/post_modules/GTK/source/gtkhscale.pre
+++ b/src/post_modules/GTK/source/gtkhscale.pre
@@ -6,10 +6,11 @@ inherit scale;
 // increments.
 // <p>
 // See W(Scale) for details
-// <p>
+// </p><p>
 // The position to show the current value, and the number of decimal
 // places shown can be set using the parent W(Scale) class's
 // functions.
+// </p>
 // IMG: GTK.Hscale(GTK.Adjustment())->set_usize(300,30)
 void create( ?adjustment settings );
 // Used to create a new hscale widget.
diff --git a/src/post_modules/GTK/source/gtkhscrollbar.pre b/src/post_modules/GTK/source/gtkhscrollbar.pre
index 31374469ac1fe2c20014591367072ad735eaad99..8fbae51236571e6c9ab6715b11c27b7a3318ecbf 100644
--- a/src/post_modules/GTK/source/gtkhscrollbar.pre
+++ b/src/post_modules/GTK/source/gtkhscrollbar.pre
@@ -3,7 +3,7 @@ inherit scrollbar;
 // A horizontal scrollbar.<p>
 // General documentation: See W(Scrollbar)
 // IMG: GTK.Hscrollbar(GTK.Adjustment())->set_usize(300,15)
-//
+//</p>
 void create( ?adjustment adjustment );
 // Used to create a new vscale widget.
 // The adjustment argument can either be an existing W(Adjustment), or
diff --git a/src/post_modules/GTK/source/gtkimage.pre b/src/post_modules/GTK/source/gtkimage.pre
index 15eaabd716142ecf7f717f44c35560e819aa3147..80b6aecd115ad79c06d3a666c84e0afcbbf8d8fd 100644
--- a/src/post_modules/GTK/source/gtkimage.pre
+++ b/src/post_modules/GTK/source/gtkimage.pre
@@ -5,7 +5,7 @@ inherit misc;
 // See GDK.Image and GDK.Pixmap.
 //<p>
 // IMG: GTK.Image( GDK.Image(0)->set(Image.image(200,200)->test() ) );
-
+//</p>
 void create( GdkImage image, ?GdkBitmap mask );
 // You can skip the mask. The mask is used to mask the drawing of the image
 // on it's background. It will not make the container transparent, though.
@@ -21,6 +21,7 @@ void set( GdkImage image, ?GdkBitmap mask );
 // you have modified the image. You must, however, use -&gt;queue_draw()
 // to redraw the image. Otherwise the old contens will be shown until
 // an refresh of the widget is done for any other reason.
+// </p>
 
 FUNCTION(get, "function(void:mapping)");
 // returns ([ "image":GDK.Image img, "mask":GDK.Bitmap mask ])
diff --git a/src/post_modules/GTK/source/gtkinputdialog.pre b/src/post_modules/GTK/source/gtkinputdialog.pre
index 8bd49dacdacbcbf13fce1ef4da6e7d983b715128..25add1ac97a9834da8cf276781f25420f98d4e2b 100644
--- a/src/post_modules/GTK/source/gtkinputdialog.pre
+++ b/src/post_modules/GTK/source/gtkinputdialog.pre
@@ -7,7 +7,7 @@ inherit dialog;
 // procedure manages an InputDialog widget. It creates the dialog if
 // it isn't present, and shows it otherwise.
 // <p>
-// <pre><font size=-1>
+// <pre><font size="-1">
 // GTK.InputDialog inputd;
 // void&nbsp;create_input_dialog&nbsp;()
 // {
@@ -21,7 +21,7 @@ inherit dialog;
 // &nbsp;&nbsp;else
 // &nbsp;&nbsp;&nbsp;&nbsp;inputd-&gt;show();
 // }
-// </font></pre>
+// </font></pre></p>
 // TIMG: GTK.InputDialog()
 signal enable_device;
 // This signal is emitted when the user changes the mode of a device from GDK_MODE_DISABLED to a GDK_MODE_SCREEN or GDK_MODE_WINDOW.
diff --git a/src/post_modules/GTK/source/gtklabel.pre b/src/post_modules/GTK/source/gtklabel.pre
index 68ba44b0cf93a4b7d438d740e55ae04796c897d9..d3478d5d98789094d13638c50760d7b8dbc75697 100644
--- a/src/post_modules/GTK/source/gtklabel.pre
+++ b/src/post_modules/GTK/source/gtklabel.pre
@@ -20,12 +20,12 @@ void set_justify( int justify );
 void set_line_wrap( int wrapp );
 // Should the label autolinewrap?
 void set_pattern( string pattern_string );
-// A string with either spaces or underscores.<br>
+// A string with either spaces or underscores.<br />
 // It should be of the same length as the text.
 // <p>
 // When a character in the text has a matching _ in the pattern, the
 // character in the label will be underlined.
-// <p>
+// </p>
 int parse_uline( string uline_string );
 // Convenience function to set the text and pattern by parsing
 // a string with embedded underscores, returns the appropriate
diff --git a/src/post_modules/GTK/source/gtkmenu.pre b/src/post_modules/GTK/source/gtkmenu.pre
index 551a727828613716e7154954a385232fb6a91912..f5f99122c7c33196e32e657190af12765382e6cf 100644
--- a/src/post_modules/GTK/source/gtkmenu.pre
+++ b/src/post_modules/GTK/source/gtkmenu.pre
@@ -7,16 +7,16 @@ inherit menu_shell;
 // A GTK.Menu is most commonly dropped down by activating a W(MenuItem)
 // in a W(MenuBar) or popped up by activating a W(MenuItem) in another
 // GTK.Menu.
-// <p>
+// </p><p>
 // A GTK.Menu can also be popped up by activating a
 // W(OptionMenu). Other composite widgets such as the W(Notebook) can
 // pop up a GTK.Menu as well.
-// <p>
+// </p><p>
 // Applications can display a GTK.Menu as a popup menu by calling the
 // popup() function. The example below shows how an application can
 // pop up a menu when the 3rd mouse button is pressed.
-// <p>
-// <pre><font size=-1>
+// </p><p>
+// <pre><font size="-1">
 // &nbsp; GTK.Menu menu = create_menu();
 // &nbsp; GTK.Window window = create_window();
 // &nbsp; window->signal_connect( "button_press_event", lambda(GTK.Menu m,
@@ -25,7 +25,7 @@ inherit menu_shell;
 // &nbsp;           if( e->button == 3 )
 // &nbsp;            menu->popup();
 // &nbsp;        }, menu );
-// <font size=-1></pre>
+// </font></pre></p>
 FUNCTION(popup, "function(int|void:object)")
 RETURNS(GTK.Menu);
 NAME_ARGS(button_pressed_to_show_menu);
@@ -66,7 +66,7 @@ void set_title( string new_title );
 // Sets the title string for the menu. The title is displayed when the
 // menu is shown as a tearoff menu.
 widget get_active();
-// Returns the selected menu item from the menu.<br>
+// Returns the selected menu item from the menu.<br />
 //  This is used by the W(OptionMenu).
 widget get_attach_widget();
 // Returns the W(Widget) that the menu is attached to.
diff --git a/src/post_modules/GTK/source/gtkmenubar.pre b/src/post_modules/GTK/source/gtkmenubar.pre
index 0398b590c8beb9a86d1723d1259413cd720f05be..c48aeca174024f574a0c8e85a2add5333d50e0e6 100644
--- a/src/post_modules/GTK/source/gtkmenubar.pre
+++ b/src/post_modules/GTK/source/gtkmenubar.pre
@@ -1,10 +1,11 @@
 class menu_bar;
 inherit menu_shell;
-// Basically a horizontal W(Menu)<p>
-// The menu image cannot be
+// Basically a horizontal W(Menu).
+// <p>The menu image cannot be
 // grabbed automatically, but this is how you would create a menu all
-// in one line. This is not the recommended coding style.<p>
+// in one line. This is not the recommended coding style.</p><p>
 // IMG: GTK.MenuBar()->add(GTK.Menu_item("Menu")->set_submenu(GTK.Menu()->add(GTK.Menu_item("Sub")))->select()->activate())->add(GTK.Menu_item("Bar"))
+// </p>
 void create();
 void append( widget menu );
 void prepend( widget menu );
diff --git a/src/post_modules/GTK/source/gtkmenuitem.pre b/src/post_modules/GTK/source/gtkmenuitem.pre
index 19305d29d599a2d1c7e5572d5af46278f21bc5b1..1afb94d6ce563378bc2dc773ca10504da2fec186 100644
--- a/src/post_modules/GTK/source/gtkmenuitem.pre
+++ b/src/post_modules/GTK/source/gtkmenuitem.pre
@@ -1,7 +1,6 @@
 class menu_item;
 inherit item;
 // Menu items, to be added to menues.
-// <p>
 FUNCTION(create, "function(string|void:void)")
 NAME_ARGS(label);
 // If a string is supplied, a W(Label) widget is created using that
diff --git a/src/post_modules/GTK/source/gtkmenushell.pre b/src/post_modules/GTK/source/gtkmenushell.pre
index d986ae6e4da59367f35b0854901488ea58f0754c..bacc692c634a88f8371ad7355888aa24d3314b78 100644
--- a/src/post_modules/GTK/source/gtkmenushell.pre
+++ b/src/post_modules/GTK/source/gtkmenushell.pre
@@ -7,6 +7,7 @@ inherit container;
 // list which can be navigated, selected, and activated by the user to
 // perform application functions. A W(MenuItem) can have a submenu
 // associated with it, allowing for nested hierarchical menus.
+// </p>
 
 signal deactivate;
 // This signal is emitted when a menu shell is deactivated.
diff --git a/src/post_modules/GTK/source/gtkmisc.pre b/src/post_modules/GTK/source/gtkmisc.pre
index d6c60fd5cdeadd13bcf9d7bdf88899e56c5da1bc..988bffdedf47d8fc5e64539cddb45af3633ce46a 100644
--- a/src/post_modules/GTK/source/gtkmisc.pre
+++ b/src/post_modules/GTK/source/gtkmisc.pre
@@ -6,12 +6,13 @@ inherit widget;
 // <p>
 // The horizontal and vertical padding attributes allows extra space
 // to be added around the widget.
-// <p>
+// </p><p>
 // The horizontal and vertical alignment attributes enable the widget
 // to be positioned within its allocated area. Note that if the widget
 // is added to a container in such a way that it expands automatically
 // to fill its allocated area, the alignment settings will not alter
 // the widgets position.
+// </p>
 //
 // IMG: GTK.Vbox(0,0)->add(GTK.Label("Label"))->set_usize(100,20)
 // IMG: GTK.Vbox(0,0)->add(GTK.Label("Label")->set_alignment(1.0,0.0))->set_usize(100,20)
diff --git a/src/post_modules/GTK/source/gtkobject.pre b/src/post_modules/GTK/source/gtkobject.pre
index 729dc3f7e7983e25f33c3c3a34367778cf2ebb8b..2431c8840b01362a8a813191180b661735005568 100644
--- a/src/post_modules/GTK/source/gtkobject.pre
+++ b/src/post_modules/GTK/source/gtkobject.pre
@@ -74,6 +74,7 @@ NAME_ARGS(signal_name,callback_function,callback_arg);
 // The return value of this function can be used to remove a signal
 // with signal_disconnect, and block and unblock the signal will
 // signal_block and signal_unblock.
+// </p>
 {
   char *a;
   int id;
diff --git a/src/post_modules/GTK/source/gtkoptionmenu.pre b/src/post_modules/GTK/source/gtkoptionmenu.pre
index 8da1ae41e8adb00496659411d567a863ff11fb2e..397f3e399438336408764bd86a1708529782c90a 100644
--- a/src/post_modules/GTK/source/gtkoptionmenu.pre
+++ b/src/post_modules/GTK/source/gtkoptionmenu.pre
@@ -6,6 +6,7 @@ inherit button;
 // which allows the user to make a new choice.
 // <p>
 // IMG: GTK.OptionMenu()->set_menu(GTK.Menu()->add( GTK.Menu_item("Option 1") ));
+// </p>
 void create();
 // Create a new option menu widget
 void set_menu( menu menu );
diff --git a/src/post_modules/GTK/source/gtkpaned.pre b/src/post_modules/GTK/source/gtkpaned.pre
index 207a8a0a164209e0fbe6034fa122895d0bc0a16e..338ac34be7908cbe25efb1006fb2baf93a1a3640 100644
--- a/src/post_modules/GTK/source/gtkpaned.pre
+++ b/src/post_modules/GTK/source/gtkpaned.pre
@@ -14,7 +14,7 @@ inherit container;
 // gutter). Often, it is useful to put each child inside a W(Frame)
 // with the shadow type set to GTK.ShadowIn so that the gutter
 // appears as a ridge.
-// <p>
+// </p><p>
 // Each child has two options that can be set, resize and shrink. If
 // resize is true, then when the GTK.Paned is resized, that child will
 // expand or shrink along with the paned widget. If shrink is true,
@@ -22,14 +22,15 @@ inherit container;
 // the user. Setting shrink to 0 allows the application to set a
 // minimum size. If resize is false for both children, then this is
 // treated as if resize is true for both children.
-// <p>
+// </p><p>
 // The application can set the position of the slider as if it were
 // set by the user, by calling set_position().
+// </p>
 void add1( widget left_or_top );
-// Set the left or topmost item.<br>
+// Set the left or topmost item.<br />
 // This is equivalent to pack1(left_or_top,0,1)
 void add2( widget right_or_bottom );
-// Set the right or bottommost item<br>
+// Set the right or bottommost item<br />
 // This is equivalent to pack2(left_or_top,0,1)
 void set_handle_size( int hsize );
 // The size of the handle in pixels
diff --git a/src/post_modules/GTK/source/gtkpixmap.pre b/src/post_modules/GTK/source/gtkpixmap.pre
index 9d3c95c4d08503dfc0259282620ca33ecbafbebe..bb6279f12415e0b535b9da225ae10e008ab30112 100644
--- a/src/post_modules/GTK/source/gtkpixmap.pre
+++ b/src/post_modules/GTK/source/gtkpixmap.pre
@@ -6,15 +6,16 @@ inherit misc;
 // <p>
 // To use pixmaps in GTK, you must first build a GDK.Pixmap object
 // using GDK.Pixmap.
-// <p>
+// </p><p>
 // The pixels in a GTK.Pixmap cannot be manipulated by the application
 // after creation, since under the X Window system the pixel data is
 // stored on the X server and so is not available to the client
 // application. If you want to create graphical images which can be
 // manipulated by the application, look at W(Image).
-// <p>
+// </p><p>
 // IMG: GTK.Pixmap( GDK.Pixmap( Image.image(100,100)->test()) )
 // IMG: GTK.Pixmap( GDK.Pixmap( Image.image(100,100)->test()), GDK.Bitmap(Image.image(100,100,255,255,255)->box(10,10,80,80, 0,0,0) ))
+// </p>
 
 void create( GdkPixmap pixmap, ?GdkBitmap mask );
 // Create a new pixmap object, and sets the image and the mask.
@@ -26,11 +27,11 @@ ARGS(GDK.Pixmap,GDK.Bitmap|void);
 member int build_insensitive;
 
 FUNCTION(get, "function(void:mapping)");
-// Returns ([ <br>
-//            "pixmap":pixmap, <br>
-//            "mask":mask,  <br>
-//            "pixmap_insensitive":insensitive version of the pixmap <br>
-//          ]) <br>
+// Returns ([ <br />
+//            "pixmap":pixmap, <br />
+//            "mask":mask,  <br />
+//            "pixmap_insensitive":insensitive version of the pixmap <br />
+//          ]) <br />
 {
   my_pop_n_elems( args );
 
diff --git a/src/post_modules/GTK/source/gtkprogress.pre b/src/post_modules/GTK/source/gtkprogress.pre
index 8fa79cfc32fd37db6a24dc265ca0c4fb5fadea20..2d009d248a58044ac65b0e7c076dc75bc89f2951 100644
--- a/src/post_modules/GTK/source/gtkprogress.pre
+++ b/src/post_modules/GTK/source/gtkprogress.pre
@@ -3,25 +3,27 @@ inherit widget;
 void set_show_text( int textp );
 // If true, write a text in the progress bar.
 void set_text_alignment( float xalign, float yalign );
-// The location for the text in the progress bar.<br>
-// xalign is between 0.0 (leftmost) and 1.0 (rightmost)<br>
-// yalign is between 0.0 (topmost) and 1.0 (bottommost)<br>
+// The location for the text in the progress bar.<br />
+// xalign is between 0.0 (leftmost) and 1.0 (rightmost)<br />
+// yalign is between 0.0 (topmost) and 1.0 (bottommost)<br />
 // <p>
 // Default is xalign == yalign == 0.5
+// </p>
 void set_format_string( string format );
 //
 // More or less like sprintf.<p>
-// %[field width][character]<p>
-// 0&lt;=width&gt;=2<p>
+// %[field width][character]</p><p>
+// 0&lt;=width&gt;=2</p><p>
 // Supported characters:
-// <dl><dt><dd><pre>
-// %: Insert a %<br>
+// <blockquote><pre>
+// %: Insert a %<br />
 // p or P: The percentage completed, with 'digits' number of decimals
 // v or V: The actual value, with digits decimals.
 // l or L: The lower value (from the adjustment)
 // u or U: The higer value (from the adjustment)
 // %: Insert a %
-// </pre></dl>The default format is '%P%%'
+// </pre></blockquote>The default format is '%P%%'
+// </p>
 void set_adjustment( Adjustment adjustment );
 // Sets the adjustment to use. See the adjustment documentation for more info
 void configure( float value, float min, float max );
@@ -34,9 +36,10 @@ void set_activity_mode( int modep );
 // progress bar may be set to just indicate that there is some
 // activity. This can be useful in situations where progress cannot be
 // measured against a value range.<p>
-// Mode is:<br>
-// 1: active<br>
-// 0: inactive<br>
+// Mode is:<br />
+// 1: active<br />
+// 0: inactive<br />
+// </p>
 void set_value( float value );
 // Set the value.
 float get_value();
diff --git a/src/post_modules/GTK/source/gtkprogressbar.pre b/src/post_modules/GTK/source/gtkprogressbar.pre
index e88116c7525cc800e5ce9c2d7459afc724988c74..f025cc4330a7dcc612e845500b1eb098a0e9b5a9 100644
--- a/src/post_modules/GTK/source/gtkprogressbar.pre
+++ b/src/post_modules/GTK/source/gtkprogressbar.pre
@@ -8,8 +8,8 @@ inherit progress;
 // IMG: GTK.ProgressBar()->update(1.0)
 void create();
 // Create a new progress bar.
-// The default values are:<br>
-// Min 0.0, max 1.0, current 0.0<br>
+// The default values are:<br />
+// Min 0.0, max 1.0, current 0.0<br />
 void update( float fraction );
 // 0.0 is the minimum value, 1.0 is the maximum value.
 void set_bar_style( int style );
diff --git a/src/post_modules/GTK/source/gtkradiobutton.pre b/src/post_modules/GTK/source/gtkradiobutton.pre
index 93f3bb9779fe3e262b4a34edcd01a13308359e72..d821fee3e18bd8ffb352750c2185bf7f8e7ffac1 100644
--- a/src/post_modules/GTK/source/gtkradiobutton.pre
+++ b/src/post_modules/GTK/source/gtkradiobutton.pre
@@ -3,17 +3,20 @@ inherit check_button;
 // Radio buttons are similar to check buttons except they are grouped
 // so that only one may be selected/depressed at a time. This is good
 // for places in your application where you need to select from a
-// short list of options.  <p> To connect the buttons, use another
-// button in the desired group as the second argument to
-// GTK.RadioButton().
+// short list of options.
+
+// <p> To connect the buttons, use another button in the desired group
+// as the second argument to GTK.RadioButton().
+// </p>
 // IMG: GTK.Radio_button("Button");
 FUNCTION(create, "function(string|void,object|void:void)")
 NAME_ARGS(title,groupmember);
 //  Normal creation:<p>
-// object GTK.RadioButton(string title) - First button (with label)<br>
-// object GTK.RadioButton()->add(widget) - First button (with widget)<br>
-// object GTK.RadioButton(title, another_radio_button) - Second to n:th button (with title)<br>
-// object GTK.RadioButton(0,another_radio_button)->add(widget) - Second to n:th button (with widget)<br>
+// object GTK.RadioButton(string title) - First button (with label)<br />
+// object GTK.RadioButton()->add(widget) - First button (with widget)<br />
+// object GTK.RadioButton(title, another_radio_button) - Second to n:th button (with title)<br />
+// object GTK.RadioButton(0,another_radio_button)->add(widget) - Second to n:th button (with widget)<br />
+// </p>
 {
   GSList *mylist = NULL;
   gchar *label=NULL;
diff --git a/src/post_modules/GTK/source/gtkradiomenuitem.pre b/src/post_modules/GTK/source/gtkradiomenuitem.pre
index 484fe41e28a4142d2c4b0e6479f1f564d3d2e5dc..72829a21e757f420e3f1be8744d3aca016348860 100644
--- a/src/post_modules/GTK/source/gtkradiomenuitem.pre
+++ b/src/post_modules/GTK/source/gtkradiomenuitem.pre
@@ -4,10 +4,10 @@ inherit menu_item;
 // IMG: GTK.RadioMenuItem("Menu item")
 FUNCTION(create, "function(string|void,object|void:void)")
 NAME_ARGS(title,groupmember);
-// object GTK.RadioMenuItem(string title) - First button (with label)<br>
-// object GTK.RadioMenuItem()->add(widget) - First button (with widget)<br>
-// object GTK.RadioMenuItem(title, another_radio_button) - Second to n:th button (with title)<br>
-// object GTK.RadioMenuItem(0,another_radio_button)->add(widget) - Second to n:th button (with widget)<br>
+// object GTK.RadioMenuItem(string title) - First button (with label)<br />
+// object GTK.RadioMenuItem()->add(widget) - First button (with widget)<br />
+// object GTK.RadioMenuItem(title, another_radio_button) - Second to n:th button (with title)<br />
+// object GTK.RadioMenuItem(0,another_radio_button)->add(widget) - Second to n:th button (with widget)<br />
 {
   GSList *mylist = NULL;
   gchar *label=NULL;
diff --git a/src/post_modules/GTK/source/gtkrange.pre b/src/post_modules/GTK/source/gtkrange.pre
index 0a1d470741ad38c532bec43c29a6ab69f748960c..da887a8d8ac1c67d05696f8c601a0740a416632a 100644
--- a/src/post_modules/GTK/source/gtkrange.pre
+++ b/src/post_modules/GTK/source/gtkrange.pre
@@ -12,12 +12,12 @@ inherit widget;
 // the slider towards the location of the click, either completely, or
 // by a designated amount, depending on which mouse button is used.
 // <p>
-// As mentioned in the W(Adjustments) page, all range widgets are
+// As mentioned in the W(Adjustment) page, all range widgets are
 // associated with an adjustment object, from which they calculate the
 // length of the slider and its position within the trough. When the
 // user manipulates the slider, the range widget will change the value
 // of the adjustment.
-// <p>
+// </p><p>
 // All of the GTK range widgets react to mouse clicks in more or less
 // the same way. Clicking button-1 in the trough will cause its
 // adjustment's page_increment to be added or subtracted from its
@@ -26,15 +26,15 @@ inherit widget;
 // the button was clicked. Clicking any button on a scrollbar's arrows
 // will cause its adjustment's value to change step_increment at a
 // time.
-// <p>
+// </p><p>
 // It may take a little while to get used to, but by default,
 // scrollbars as well as scale widgets can take the keyboard focus in
 // GTK. If you think your users will find this too confusing, you can
 // always disable this by unsetting the GTK.CanFocus flag on the
 // scrollbar, like this:
-// <p>
+// </p><p>
 // <tt>scrollbar->unset_flag( GTK.CanFocus );</tt>
-// <p>
+// </p><p>
 // The key bindings (which are, of course, only active when the widget
 // has focus) are slightly different between horizontal and vertical
 // range widgets, for obvious reasons. They are also not quite the
@@ -42,25 +42,25 @@ inherit widget;
 // less obvious reasons (possibly to avoid confusion between the keys
 // for horizontal and vertical scrollbars in scrolled windows, where
 // both operate on the same area).
-// <p>
+// </p>
 void set_update_policy( int when );
 // The "update policy" of a range widget defines at what points during
 // user interaction it will change the value field of its Adjustment
 // and emit the "value_changed" signal on this Adjustment. The update
 // policies are:
-// <dl>
-// <dt>GTK.UpdatePolicyContinuous
+// <p><dl>
+// <dt>GTK.UpdatePolicyContinuous</dt>
 // <dd>This is the default. The "value_changed" signal is emitted
 // continuously, i.e., whenever the slider is moved by even the
-// tiniest amount.
-// <dt>GTK.UpdatePolicyDiscontinuous
+// tiniest amount.</dd>
+// <dt>GTK.UpdatePolicyDiscontinuous</dt>
 // <dd> The "value_changed" signal is only emitted once the slider has
-// stopped moving and the user has released the mouse button.
-// <dt>GTK.UpdatePolicyDelayed
+// stopped moving and the user has released the mouse button.</dd>
+// <dt>GTK.UpdatePolicyDelayed</dt>
 // <dd>The "value_changed" signal is emitted when the user releases
 // the mouse button, or if the slider stops moving for a short period
-// of time.
-// </dl>
+// of time.</dd>
+// </dl></p>
 void set_adjustment( adjustment pos );
 // set_adjustment() does absolutely nothing if you pass it the
 // adjustment that range is already using, regardless of whether you
diff --git a/src/post_modules/GTK/source/gtkruler.pre b/src/post_modules/GTK/source/gtkruler.pre
index 9b86abfbfc3beab5f554344696fd433cb9b59fbe..c20b9554f4d9e7aad99ac4cdcb19f0774413ea98 100644
--- a/src/post_modules/GTK/source/gtkruler.pre
+++ b/src/post_modules/GTK/source/gtkruler.pre
@@ -6,8 +6,8 @@ inherit widget;
 // the height. A small triangular indicator on the ruler shows the
 // exact location of the pointer relative to the ruler.
 void set_metric( int unit );
-// Either GTK.Pixels, GTK.Centimers or GTK.Inches<p>
-// The default measure is GTK.Pixels
+// Either GTK.Pixels, GTK.Centimers or GTK.Inches.
+// <p>The default measure is GTK.Pixels.</p>
 void set_range( float lower, float upper, float position, float max_size );
 // The lower and upper arguments define the extent of the ruler, and
 // max_size is the largest possible number that will be displayed.
diff --git a/src/post_modules/GTK/source/gtkscale.pre b/src/post_modules/GTK/source/gtkscale.pre
index e3d1ff3676c8c3c79dbe7ed93eb5babd7f251a4b..d62de6f6920329eba0320960f1af06e8345302e1 100644
--- a/src/post_modules/GTK/source/gtkscale.pre
+++ b/src/post_modules/GTK/source/gtkscale.pre
@@ -3,7 +3,7 @@ class scale;
 // the subclasses GTK.Hscale and GTK.Vscale.
 // <p>
 // See W(Range) for generic range documentation
-// <p>
+// </p>
 inherit range;
 void set_digits( int precision );
 // Sets the number of decimal places that are displayed in the value.
diff --git a/src/post_modules/GTK/source/gtkscrolledwindow.pre b/src/post_modules/GTK/source/gtkscrolledwindow.pre
index a6847aa4f6b6da323719686b42fe467714c7683e..2e7159dd98a994acca88cd65cc003fad35718178 100644
--- a/src/post_modules/GTK/source/gtkscrolledwindow.pre
+++ b/src/post_modules/GTK/source/gtkscrolledwindow.pre
@@ -9,6 +9,7 @@ inherit window;
 // IMG: GTK.ScrolledWindow(GTK.Adjustment(),GTK.Adjustment())->add(GTK.Label("A small label"))->set_usize(70,80)->set_policy(GTK.POLICY_AUTOMATIC,GTK.POLICY_AUTOMATIC)
 // IMG: GTK.ScrolledWindow(GTK.Adjustment(),GTK.Adjustment())->add(GTK.Label("A small label"))->set_usize(80,80)
 // IMG: GTK.ScrolledWindow(GTK.Adjustment(),GTK.Adjustment())->add(GTK.Label("A very huge label")->set_usize(700,700))->set_usize(80,80)
+// </p>
 void create( ?adjustment hadjustment, ?adjustment vadjustments );
 // The two adjustments are most commonly set to 0.
 void set_hadjustment( adjustment hadjustment );
@@ -32,6 +33,7 @@ NAME_ARGS(victim);
 // <p>
 // What this means in practice is that you do not have to care about
 // this at all, it's all handled automatically.
+// </p>
 {
   GtkWidget *victim;
   struct object *o;
diff --git a/src/post_modules/GTK/source/gtkselectiondata.pre b/src/post_modules/GTK/source/gtkselectiondata.pre
index 066e8f92b6038a959fbac4322b8f373cfefad778..5d534f22e5b044de6fef5a57e0b239ccf09538a7 100644
--- a/src/post_modules/GTK/source/gtkselectiondata.pre
+++ b/src/post_modules/GTK/source/gtkselectiondata.pre
@@ -31,7 +31,7 @@ FUNCTION(data, "function(void:string)");
   }
 }
 FUNCTION(format, "function(void:int)");
-// Returns the selction format.<br>
+// Returns the selction format.<br />
 // The format is the number of bits per character.
 {
   my_pop_n_elems( args );
@@ -41,7 +41,8 @@ FUNCTION(length, "function(void:int)");
 // Return the size of the selection data, in bytes.
 // <p>
 // The size of the data in characters (as returned by data()) is not
-// nessasarily the same.
+// necessarily the same.
+// </p>
 {
   my_pop_n_elems( args );
   push_int( ((GtkSelectionData *)THIS->obj)->length );
diff --git a/src/post_modules/GTK/source/gtksocket.pre b/src/post_modules/GTK/source/gtksocket.pre
index 046dbe4f9f2418d5655c5fd684573c795d23a2d4..f7d7b0b851a93397c5fe4c7b9c9d746a8631d548 100644
--- a/src/post_modules/GTK/source/gtksocket.pre
+++ b/src/post_modules/GTK/source/gtksocket.pre
@@ -17,18 +17,19 @@ inherit container;
 // created. Violating this rule will cause unpredictable
 // consequences, the most likely consequence being that the plug will
 // appear as a separate toplevel window.
-// <p>
+// </p><p>
 //  A socket can also be used to swallow arbitrary pre-existing
 //  top-level windows using steal(), though the integration when this
 //  is done will not be as close as between a W(Plug) and a
-//  GTK.Socket
+//  GTK.Socket.
+// </p>
 void create();
 void steal( int window_id );
 // Reparents a pre-existing toplevel window (not nessesarily a GTK
 // window) into a socket.
 FUNCTION(id, "function(void:int)");
 // Returns the window id, to be sent to the application providing the plug.
-// <br>You must realize this widget before calling this function.
+// <br />You must realize this widget before calling this function.
 {
   if( !GTK_WIDGET( THIS->obj )->window )
     error("You must realize this widget before calling this function.\n");
diff --git a/src/post_modules/GTK/source/gtkspinbutton.pre b/src/post_modules/GTK/source/gtkspinbutton.pre
index c11d51a1578ecf952ed88bcc7cf8818370600a1b..0a806203e7670a0a18c42e598729ee5238e75776 100644
--- a/src/post_modules/GTK/source/gtkspinbutton.pre
+++ b/src/post_modules/GTK/source/gtkspinbutton.pre
@@ -12,25 +12,25 @@ inherit entry;
 // steps. The action of holding down one of the buttons optionally
 // results in an acceleration of change in the value according to how
 // long it is depressed.
-// <p>
+// </p><p>
 // The Spin Button uses an W(Adjustment) object to hold information about
 // the range of values that the spin button can take.
-// <p>
+// </p><p>
 // The attributes of an W(Adjustment) are used by the Spin Button in the
 // following way:
-// <ul><li>value: initial value for the Spin Button
-//     <li>lower: lower range value
-//     <li>upper: upper range value
-//     <li>step_increment: value to increment/decrement when pressing mouse button 1 on a button
-//     <li>page_increment: value to increment/decrement when pressing mouse button 2 on a button
-//     <li>page_size: unused
+// <ul><li>value: initial value for the Spin Button</li>
+//     <li>lower: lower range value</li>
+//     <li>upper: upper range value</li>
+//     <li>step_increment: value to increment/decrement when pressing mouse button 1 on a button</li>
+//     <li>page_increment: value to increment/decrement when pressing mouse button 2 on a button</li>
+//     <li>page_size: unused</li>
 // </ul>
-// <p>
-// The argument order for the W(Adjustment) constructor is:<br>
-// value, lower, upper, step_increment, page_increment, page_size<br>
+// </p><p>
+// The argument order for the W(Adjustment) constructor is:<br />
+// value, lower, upper, step_increment, page_increment, page_size<br />
 //
 // IMG: GTK.SpinButton( GTK.Adjustment(),0.1, 1 )->set_usize(60,20)
-// <p>
+// </p>
 void create( adjustment range, float climb_rate, int precision );
 //  The climb_rate argument take a value between 0.0 and 1.0 and
 //  indicates the amount of acceleration that the Spin Button has. The
@@ -55,14 +55,14 @@ void set_update_policy( int policy );
 // These policies affect the behavior of a Spin Button when parsing
 // inserted text and syncing its value with the values of the
 // Adjustment.
-// <p>
+// </p><p>
 // In the case of GTK.UpdateIfValid the Spin Button value only gets
 // changed if the text input is a numeric value that is within the
 // range specified by the Adjustment. Otherwise the text is reset
 // to the current value.
-// <p>
+// </p><p>
 // In case of GTK.UpdateAlways errors are ignored while converting text
-// into a numeric value.
+// into a numeric value.</p>
 void set_numeric( int numericp );
 // If true, it is a numeric value.  This prevents a user from typing
 // anything other than numeric values into the text box of a Spin
@@ -72,23 +72,23 @@ void spin( int direction, float increment );
 // current value, then this ffunction can be used.
 // <p>
 // The direction paramenter is one of CONST(GTK_SPIN)
-// <p>
+// </p><p>
 //  GTK.SpinStepForward and GTK.SpinStepBackward change the value
 //  of the Spin Button by the amount specified by increment, unless
 //  increment is equal to 0, in which case the value is changed by the
 //  value of step_increment in theAdjustment.
-// <p>
+// </p><p>
 // GTK.SpinPageForward and GTK.SpinPageBackward simply alter the
 // value of the Spin Button by increment.
-// <p>
+// </p><p>
 // GTK.SpinHome sets the value of the Spin Button to the bottom of the
 // Adjustments range.
-// <p>
+// </p><p>
 // GTK.SpinEnd sets the value of the Spin Button to the top of the
 // Adjustments range.
-// <p>
+// </p><p>
 // GTK.SpinUserDefined simply alters the value of the Spin Button by
-// the specified amount.
+// the specified amount.</p>
 void set_wrap( int wrapp );
 // If true, the spin button will wrap from the lowest to the highest
 // value, and the highest to the lowest.
diff --git a/src/post_modules/GTK/source/gtkstatusbar.pre b/src/post_modules/GTK/source/gtkstatusbar.pre
index 7574447983d32c403282d4f3b238fd1899cf5dbe..5d55270c67ec0df41b627fe2d82f68e173ac8cea 100644
--- a/src/post_modules/GTK/source/gtkstatusbar.pre
+++ b/src/post_modules/GTK/source/gtkstatusbar.pre
@@ -10,9 +10,10 @@ inherit hbox;
 // message on top of the stack is the one displayed, no matter what
 // context it is in. Messages are stacked in last-in-first-out order,
 // not context identifier order.
-//  <p>
+//  </p><p>
 // IMG: lambda() {object sb = GTK.Statusbar();int id = sb->get_context_id("test");sb->push(id,"A message");sb->push(id,"Another message");return sb;}()
 // IMG: lambda() {object sb = GTK.Statusbar();int id = sb->get_context_id("test");sb->push(id,"A message");sb->push(id,"Another message");sb->pop(id);return sb;}()
+// </p>
 signal text_pushed;
 signal text_poped;
 void create();
diff --git a/src/post_modules/GTK/source/gtkstyle.pre b/src/post_modules/GTK/source/gtkstyle.pre
index 51f4c5d5bd69c809f460fc443904a699b451d6c9..3ef528f8bc43a151d36a135996bb593ee965f187 100644
--- a/src/post_modules/GTK/source/gtkstyle.pre
+++ b/src/post_modules/GTK/source/gtkstyle.pre
@@ -21,7 +21,7 @@ void apply_default_background( GdkWindow window, int set_bgp, int state_type, ?G
 // specified by state_type.
 // <p>
 // If set_bgp is true, the background of the widget will be set,
-// otherwise it will only be drawn into the window.
+// otherwise it will only be drawn into the window.</p>
 COPY array GDK.Color &fg[5];
 COPY array GDK.Color &bg[5];
 COPY array GDK.Color &light[5];
diff --git a/src/post_modules/GTK/source/gtktable.pre b/src/post_modules/GTK/source/gtktable.pre
index 677691fddd3eecbc6c497b35ade6f9a69ee0584c..c0f6812f300bd3cfd4161aa82bc7e8b28b7225f9 100644
--- a/src/post_modules/GTK/source/gtktable.pre
+++ b/src/post_modules/GTK/source/gtktable.pre
@@ -6,15 +6,16 @@ inherit container;
 // <p>
 // IMG: GTK.Table(2,2,0)->attach_defaults( GTK.Label("0,0"), 0, 1, 0, 1)->attach_defaults( GTK.Label("0,1"), 0, 1, 1, 2)->attach_defaults( GTK.Label("1,0"), 1, 2, 0, 1)->attach_defaults( GTK.Label("1,1"), 1, 2, 1, 2)->set_col_spacings(10)->set_row_spacings(10)
 // IMG: GTK.Table(2,2,0)->attach_defaults( GTK.Label("0,0-1,0"), 0, 2, 0, 1)->attach_defaults( GTK.Label("0,1"), 0, 1, 1, 2)->attach_defaults( GTK.Label("1,1"), 1, 2, 1, 2)->set_col_spacings(10)->set_row_spacings(10)
+// </p>
 void create( int width, int height, int homogeneousp );
 // Used to create a new table widget. An initial size must be given by
 // specifying how many rows and columns the table should have,
 // although this can be changed later with resize().
 // <p>
 // There can never be more than 65535 colums nor more than 65535 rows.
-// <p>
+// </p><p>
 // setting homogeneousp to 1 forces the all tablecells to be exactly
-// the same size.
+// the same size.</p>
 void resize( int rows, int columns );
 // If you need to change a table's size after it has been created,
 // this function allows you to do so.
@@ -30,24 +31,25 @@ void attach( widget subwidget, int left, int right, int top, int bottom, int xop
 // table, you'd use left_attach = 0, right_attach = 2, top_attach = 0,
 // bottom_attach = 1.
 // </p>
-// The xoptions and yoptions are used to specify packing options and
-// may be OR'ed together to allow multiple options.
+// <p>The xoptions and yoptions are used to specify packing options and
+// may be OR'ed together to allow multiple options.</p>
 // <p>
 // These options are:
 // <ul>
 // <li> GTK.Fill - If the table box is larger than the widget, and
 // GTK_FILL is specified, the widget will expand to use all the room
-// available.
+// available.</li>
 // <li> GTK.Shrink - If the table widget was allocated less space then
 // was requested (usually by the user resizing the window), then the
 // widgets would normally just be pushed off the bottom of the window
 // and disappear. If GTK_SHRINK is specified, the widgets will shrink
-// with the table.
+// with the table.</li>
 // <li> GTK.Expand - This will cause the table cell to expand to use
-// up any remaining space in the window.  </ul>
-// <p>
+// up any remaining space in the window.</li>
+//  </ul>
+// </p><p>
 // Padding is just like in boxes, creating a clear area around the
-// widget specified in pixels
+// widget specified in pixels</p>
 void attach_defaults( widget subwidget, int left, int right, int top, int bottom );
 // As there are many options associated with attach(), this
 // convenience function provides the programmer with a means to add
@@ -55,7 +57,7 @@ void attach_defaults( widget subwidget, int left, int right, int top, int bottom
 // <p>
 // xoptions, yoptions, xpadding and ypadding are all set the their
 // default values. For the options that is GTK.Fill|GTK.Expand. For
-// the padding it is 0.
+// the padding it is 0.</p>
 void set_col_spacing( int x, int spacing );
 // alters the amount of space between a given table column and the
 // adjacent columns.
diff --git a/src/post_modules/GTK/source/gtktearoffmenuitem.pre b/src/post_modules/GTK/source/gtktearoffmenuitem.pre
index 3557430e6518053546847fdc9536c28e7488036c..2b6ce18d6603cd3d1ee48e69e7dcef85cb6c81c7 100644
--- a/src/post_modules/GTK/source/gtktearoffmenuitem.pre
+++ b/src/post_modules/GTK/source/gtktearoffmenuitem.pre
@@ -7,12 +7,13 @@ inherit menu_item;
 // as a dotted line indicating that the menu can be torn
 // off. Activating it causes its menu to be torn off and displayed in
 // its own window as a tearoff menu.
-// <p>
+// </p><p>
 // When its menu is shown as a tearoff menu, the GTK.TearoffMenuItem
 // is drawn as a dotted line which has a left pointing arrow graphic
 // indicating that the tearoff menu can be reattached. Activating it
 // will erase the tearoff menu window.
-// <p> IMG: GTK.TearoffMenuItem()->set_usize( 100,0 )
+// </p><p> IMG: GTK.TearoffMenuItem()->set_usize( 100,0 )
+// </p>
 void create();
 // Create a new tear of menu item
 member int torn_off;
diff --git a/src/post_modules/GTK/source/gtktext.pre b/src/post_modules/GTK/source/gtktext.pre
index 29bcd749c21c9d341f89215993baa1b332078b26..a09877d14c892f71f4ca786119f96c06fb6f3fe8 100644
--- a/src/post_modules/GTK/source/gtktext.pre
+++ b/src/post_modules/GTK/source/gtktext.pre
@@ -9,10 +9,12 @@ inherit editable;
 // The text widget supports full cut-and-paste facilities, including
 // the use of double- and triple-click to select a word and a whole
 // line, respectively.
+// </p>
 // <p>
 // Bugs:<ul>
-//      <li> You cannot add text to the widget before it is realized.
+//      <li> You cannot add text to the widget before it is realized.</li>
 //     </ul>
+// </p>
 // IMG: GTK.Text(GTK.Adjustment(),GTK.Adjustment())
 // IMG: function_object(call_out(GTK.Text(GTK.Adjustment(),GTK.Adjustment())->set_text, 0, "Some text")[0])
 // IMG: function_object(call_out(GTK.Text(GTK.Adjustment(),GTK.Adjustment())->insert, 0, "Some text", 0, GDK.Color(255,255,0), GDK.Color(0,0,0))[0])
@@ -52,14 +54,14 @@ ARGS(string,GDK.Font,GDK.Color,GDK.Color);
 RETURNS(GTK.Text);
 NAME_ARGS(string,font,bg,fg);
 // syntax:<p>
-// object insert(string what); OR<br>
-// object insert(string what, GDK.Font font, GDK.Color fg, GDK.Color bg); OR<br>
-// object insert(string what, 0, GDK.Color fg, GDK.Color bg); OR<br>
-// object insert(string what, 0, GDK.Color fg); OR<br>
-// object insert(string what, 0, 0, GDK.Color bg);<br>
-// <p>
+// object insert(string what); OR<br />
+// object insert(string what, GDK.Font font, GDK.Color fg, GDK.Color bg); OR<br />
+// object insert(string what, 0, GDK.Color fg, GDK.Color bg); OR<br />
+// object insert(string what, 0, GDK.Color fg); OR<br />
+// object insert(string what, 0, 0, GDK.Color bg);<br />
+// </p><p>
 //
-// Insert new text, optionally with colors.
+// Insert new text, optionally with colors.</p>
 {
   struct svalue *a, *b, *c;
   struct pike_string *s;
diff --git a/src/post_modules/GTK/source/gtktogglebutton.pre b/src/post_modules/GTK/source/gtktogglebutton.pre
index 50a07701518cfd96ae7dc9ddcfce987d335e19da..c7d3153a618413ff2bdee195b9dfb228211da24c 100644
--- a/src/post_modules/GTK/source/gtktogglebutton.pre
+++ b/src/post_modules/GTK/source/gtktogglebutton.pre
@@ -8,6 +8,7 @@ inherit button;
 // <p>
 // IMG: GTK.ToggleButton("Toggle button")
 // IMG: GTK.ToggleButton("Toggle button")->set_active( 1 )
+// </p>
 signal toggled;
 FUNCTION(create, "function(string|void:void)");
 NAME_ARGS(label);
diff --git a/src/post_modules/GTK/source/gtktoolbar.pre b/src/post_modules/GTK/source/gtktoolbar.pre
index bfdcf060149a9411cec431b19fee750ee5440df6..a9c332af6fb1b85093097bfce204df813cc4db45 100644
--- a/src/post_modules/GTK/source/gtktoolbar.pre
+++ b/src/post_modules/GTK/source/gtktoolbar.pre
@@ -12,6 +12,7 @@ inherit container;
 // IMG: lambda(){object t=GTK.Toolbar( GTK.ORIENTATION_HORIZONTAL, GTK.TOOLBAR_TEXT );t->append_item( "Button 1", "Tooltip 1", "", GTK.Frame(), lambda(){},0);t->append_space();t->append_item( "Button 2", "Tooltip 2", "", GTK.Frame(), lambda(){},0);t->append_item( "Button 3", "Tooltip 3", "", GTK.Frame(), lambda(){},0);t->append_space();t->append_item( "Button 4", "Tooltip 4", "", GTK.Frame(), lambda(){},0);t->append_item( "Button 5", "Tooltip 5", "", GTK.Frame(), lambda(){},0);return t;}()
 // IMG: lambda(){object t=GTK.Toolbar( GTK.ORIENTATION_VERTICAL, GTK.TOOLBAR_TEXT );t->append_item( "Button 1", "Tooltip 1", "", GTK.Frame(), lambda(){},0);t->append_space();t->append_item( "Button 2", "Tooltip 2", "", GTK.Frame(), lambda(){},0);t->append_item( "Button 3", "Tooltip 3", "", GTK.Frame(), lambda(){},0);t->append_space();t->append_item( "Button 4", "Tooltip 4", "", GTK.Frame(), lambda(){},0);t->append_item( "Button 5", "Tooltip 5", "", GTK.Frame(), lambda(){},0);return t;}()
 // IMG: lambda(){object i=GDK.Image()->set(Image.image(20,20)->test());object t=GTK.Toolbar( GTK.ORIENTATION_HORIZONTAL, GTK.TOOLBAR_BOTH );t->append_item( "Button 1", "Tooltip 1", "", GTK.Image(i), lambda(){},0);t->append_space();t->append_item( "Button 2", "Tooltip 2", "", GTK.Image(i), lambda(){},0);t->append_item( "Button 3", "Tooltip 3", "", GTK.Image(i), lambda(){},0);t->append_space();t->append_item( "Button 4", "Tooltip 4", "", GTK.Image(i), lambda(){},0);t->append_item( "Button 5", "Tooltip 5", "", GTK.Image(i), lambda(){},0);return t;}()
+// </p>
 signal orientation_changed;
 signal style_changed;
 void create( int orientation, int style );
@@ -20,13 +21,13 @@ void create( int orientation, int style );
 
 void append_item( string label, string tooltip, string private, widget icon, callback clicked );
 // Arguments are: Label, Tooltip, Private data, Icon, clicked_callback_function, clicked_callback_argument.
-// <p>Adds a new button to the start of the toolbar.
+// <p>Adds a new button to the start of the toolbar.</p>
 void prepend_item( string label, string tooltip, string private, widget icon, callback clicked );
 // Arguments as for append_item
-// <p>Adds a new button to the end of the toolbar.
+// <p>Adds a new button to the end of the toolbar.</p>
 void insert_item( string label, string tooltip, string private, widget icon, callback clicked, int cbargument );
 // Arguments as for append_item, but an extra position argument at the end.
-// <p>Adds a new button after the item at the specified position.
+// <p>Adds a new button after the item at the specified position.</p>
 void append_space();
 // Adds a small space.
 void prepend_space();
diff --git a/src/post_modules/GTK/source/gtktooltips.pre b/src/post_modules/GTK/source/gtktooltips.pre
index 75e1e05ac53a172f46cc1668c64760c06081761d..fe65d01ca4f99a54350318b2dc241614b7731ee2 100644
--- a/src/post_modules/GTK/source/gtktooltips.pre
+++ b/src/post_modules/GTK/source/gtktooltips.pre
@@ -8,18 +8,18 @@ inherit data;
 // An individual tooltip belongs to a group of tooltips. A group is
 // created with a call to GTK.Tooltips(). Every tooltip in the
 // group can then be turned off with a call to disable()
-// and enabled with enable().
+// and enabled with enable().</p>
 // <p>
 // The length of time the user must keep the mouse over a widget
 // before the tip is shown, can be altered with set_delay(). This is
-// set on a 'per group of tooltips' basis.
+// set on a 'per group of tooltips' basis.</p>
 // <p>
-// To assign a tip to a particular W(Widget), set_tip() is used.
+// To assign a tip to a particular W(Widget), set_tip() is used.</p>
 // <p>
 // The default appearance of all tooltips in a program is determined
 // by the current gtk theme that the user has selected. To change the
 // tooltip appearance manually, use set_colors(). Again, this is per
-// group of tooltips.
+// group of tooltips.</p>
 void create();
 // Creates an empty group of tooltips. This function initialises a
 // GTK.Tooltips structure. Without at least one such structure, you
diff --git a/src/post_modules/GTK/source/gtktree.pre b/src/post_modules/GTK/source/gtktree.pre
index 661b96848103f02af77922c6b7ae7f6d3ce24a9a..8236e1db20a1b7e873808e6d912f20d3810dd464 100644
--- a/src/post_modules/GTK/source/gtktree.pre
+++ b/src/post_modules/GTK/source/gtktree.pre
@@ -1,11 +1,12 @@
 class tree;
 inherit container;
 // A 'tree' with subnodes etc.  Do not have a tree with more than 100
-// or so entries. It will be very slow.<br>
+// or so entries. It will be very slow.<br />
 // Whenever possible, use W(Ctree) instead, it's way faster.
 // <p>
 // IMG: lambda() { object t = GTK.Tree();  object i, t2;  t->add(i = GTK.Tree_item("Sub node 1"));  i->set_subtree( GTK.Tree() );  t->add(i = GTK.Tree_item("Sub node 2"));  i->set_subtree( t2=GTK.Tree() );  call_out(i->expand, 0);  t2->add( GTK.Tree_item("Sub sub 1") );  t2->add( GTK.Tree_item("Sub sub 2") );  t->add(i = GTK.Tree_item("Sub node 3"));  i->set_subtree( GTK.Tree() );  return t;}()
 // IMG: lambda() { object t = GTK.Tree();  object i, t2;  t->add(i = GTK.Tree_item("Sub node 1"));  i->set_subtree( GTK.Tree() );  t->add(i = GTK.Tree_item("Sub node 2"));  i->set_subtree( t2=GTK.Tree() );  call_out(i->expand, 0);  t2->add( GTK.Tree_item("Sub sub 1") );  t2->add( GTK.Tree_item("Sub sub 2") );  t->add(i = GTK.Tree_item("Sub node 3"));  i->set_subtree( GTK.Tree() );  return t;}()->set_view_lines(0)
+// </p>
 signal selection_changed;
 signal select_child;
 signal unselect_child;
diff --git a/src/post_modules/GTK/source/gtktreeitem.pre b/src/post_modules/GTK/source/gtktreeitem.pre
index 50461dfcc59c0d12797c6cb40ab7fc840e5dc0a0..bd418416cbc6a8bdeacaa051330740f28ae7c01e 100644
--- a/src/post_modules/GTK/source/gtktreeitem.pre
+++ b/src/post_modules/GTK/source/gtktreeitem.pre
@@ -1,8 +1,8 @@
 class tree_item;
 inherit item;
 // A item to be places in a W(Tree).
-// <br>The item can have a subtree attached to it.
-// <br>A subtree is a normal tree.
+// <br />The item can have a subtree attached to it.
+// <br />A subtree is a normal tree.
 signal expand;
 signal collapse;
 FUNCTION(create, "function(string|void:void)");
@@ -28,17 +28,17 @@ void remove_subtree();
 // Removes the subtree.
 void select();
 // Select this item. The item must be realized (the tree and all it's
-// parents shown) for this to work.<br>
+// parents shown) for this to work.<br />
 // This generates a 'select' event.
 void deselect();
-// Deselect this item.<br>
+// Deselect this item.<br />
 // This generates a 'deselect' event.
 void expand();
 // Expand this subtree. The item must be realized (the tree and all it's
-// parents shown) for this to work.<br>
+// parents shown) for this to work.<br />
 // This generates a 'expand' event.
 void collapse();
 // Collapse this subtree. The item must be realized (the tree and all it's
-// parents shown) for this to work.<br>
+// parents shown) for this to work.<br />
 // This generates a 'collapse' event.
 
diff --git a/src/post_modules/GTK/source/gtkvscale.pre b/src/post_modules/GTK/source/gtkvscale.pre
index 15b48201d70f81f1acade534c3ca14a5cc7d0d3b..86ebc00ff1f3d858241b0aaa079064b9003d92a4 100644
--- a/src/post_modules/GTK/source/gtkvscale.pre
+++ b/src/post_modules/GTK/source/gtkvscale.pre
@@ -7,9 +7,10 @@ inherit scale;
 // <p>
 // The position to show the current value, and the number of decimal
 // places shown can be set using the parent W(Scale) class's
-// functions.
+// functions.</p>
 // <p>
 // IMG: GTK.Vscale(GTK.Adjustment())->set_usize(30,100)
+// </p>
 void create( ?adjustment settings );
 // Used to create a new vscale widget.
 // The adjustment argument can either be an existing W(Adjustment), or
diff --git a/src/post_modules/GTK/source/gtkwidget.pre b/src/post_modules/GTK/source/gtkwidget.pre
index d25ba338a4470eccfc4c3eed9a1dd0fc9a89ab9d..88eb4299cd32d9b2cf071a4e5220db8a5e3d8c50 100644
--- a/src/post_modules/GTK/source/gtkwidget.pre
+++ b/src/post_modules/GTK/source/gtkwidget.pre
@@ -12,7 +12,7 @@ inherit object;
 // the whole window pops up at once rather than seeing the individual
 // widgets come up on the screen as they're formed. The children of a
 // widget (a window is a widget too) will not be displayed until the
-// window itself is shown using the show() function.
+// window itself is shown using the show() function.</p>
 signal show;
 // Called when the widget is shown
 signal hide;
@@ -141,7 +141,7 @@ FUNCTION(set_background, "function(object:object)");
 NAME_ARGS(background);
 // Set the background color or image.
 // The argument is either a GDK.Pixmap or a GDK.Color object.
-// <br>NOTE: The widget must be realized before this function can be used
+// <br />NOTE: The widget must be realized before this function can be used
 {
   struct object *o;
   get_all_args("set_background", args, "%o", &o);
@@ -161,7 +161,7 @@ NAME_ARGS(gc,xdest,ydest,source,xsource,ysource,width,height);
 // Copies the rectangle defined by xsource,ysource and width,height
 // from the source widget, and places the results at xdest,ydest in
 // the widget in which this function is called.
-// <br>NOTE: The widget must be realized before this function can be used
+// <br />NOTE: The widget must be realized before this function can be used
 {
   struct object *gc, *source;
   GdkWindow *win;
@@ -204,7 +204,7 @@ NAME_ARGS(shape, xoffset,yoffset);
 // the supplied bitmap. Notice how the window behind the example
 // window can be seen because of the rather odd shape the example window has.
 // TIMG: GTK.Window( GTK.WINDOW_TOPLEVEL )->add(GTK.Label("A rather Oddly shaped\n" "Window\n" "Indeed\n" "Or what do you\nthink?\n" "This text\n" "should\n" "be long enough"))->shape_combine_mask( GDK.Bitmap(Image.image(100,100,255,255,255)->rotate(10,0,0,0) ), 20,20)
-// <br>NOTE: The widget must be realized before this function can be used
+// <br />NOTE: The widget must be realized before this function can be used
 {
   struct object *m;
   INT_TYPE x, y;
@@ -260,25 +260,25 @@ void add_accelerator( string signal, accel_group group, int key, int modifiers,
 // Add an accelerator (keyboard shortcut).
 // <p>
 // Flag is one of CONST(GTK_ACCE)
-// <br>
+// <br />
 // The signal is the signal to invoke when the accelerator key is pressed.
-// <br>
+// <br />
 // The modifiers is a bitwise or of one or more of GDK.ShiftMask,
 // GDK.LockMask, GDK.ControlMask, CONST(GDK_MOD).
-// <br>
+// <br />
 // The group is the accelerator group in which the accelerator should be added.
-// <br>
-// The key is the unicode code for the key to bind.
+// <br />
+// The key is the unicode code for the key to bind.</p>
 
 void remove_accelerator( accel_group group, int key, int modifiers );
 // Remove an accelerator (keyboard shortcut).
 // <p>
 // The modifiers is a bitwise or of one or more of GDK.ShiftMask,
 // GDK.LockMask, GDK.ControlMask, CONST(GDK_MOD).
-// <br>
+// <br />
 // The group is the accelerator group in which the accelerator should be added.
-// <br>
-// The key is the unicode code for the key to bind.
+// <br />
+// The key is the unicode code for the key to bind.</p>
 
 void set_usize( int xsize, int ysize );
 // Set the absolute size of the widget. It might resize itself anyway,
@@ -293,8 +293,8 @@ void set_uposition( int xpos, int ypos );
 void set_name( string name );
 // Set the name of the widget. The name is used when the rc-file is
 // parsed, you can also parse your own resources by calling
-// GTK.parse_rc() with a resource string. <br>Example: <p>
-// TODO
+// GTK.parse_rc() with a resource string. <br />Example: <p>
+// TODO</p>
 void set_state( int state );
 // One of CONST(GTK_STATE).
 // This function should normaly not be used directly.
@@ -313,10 +313,10 @@ string get_name();
 FUNCTION(set_cursor, "function(int,void|object,void|object:object)");
 ARGS(int|void,void|GDK.Color,void|GDK.Color);
 NAME_ARGS(cursor_type, fg, bg);
-// Change the widget cursor.<br>
-// If no arguments are passed, restore the default cursor.<br>
-// Both fg and bg must be specified if either one is.<br>
-// <table border=0 cellpadding=3 cellspacing=0>
+// Change the widget cursor.<br />
+// If no arguments are passed, restore the default cursor.<br />
+// Both fg and bg must be specified if either one is.<br />
+// <table border="0" cellpadding="3" cellspacing="0">
 // CURS(GDK.Arrow)
 // CURS(GDK.BasedArrowDown)
 // CURS(GDK.BasedArrowUp)
@@ -678,12 +678,12 @@ RETURNS(GTK.Widget);
 
 FUNCTION(drag_dest_set, "function(int,array(array(int|string)),int:object)");
 NAME_ARGS(flags,targets,actions);
-//     Register a drop site, and possibly add default behaviors.<br>
-//   arguments:<br>
-//     flags:     Which types of default drag behavior to use (one of CONST(GTK_DEST_DEFAULT))<br>
+//     Register a drop site, and possibly add default behaviors.<br />
+//   arguments:<br />
+//     flags:     Which types of default drag behavior to use (one of CONST(GTK_DEST_DEFAULT))<br />
 //     targets:   Table of targets that can be accepted
 //            ({ ({ content_type(string), flags(int(try 0)), id(int) }), ...})
-//       The id will be received in the signal handlers.<br>
+//       The id will be received in the signal handlers.<br />
 //     actions:   one of CONST(GDK_ACTION_)
 //   results:
 RETURNS(GTK.Widget);
@@ -720,12 +720,12 @@ RETURNS(GTK.Widget);
 
 FUNCTION(drag_source_set, "function(int,array(array(int|string)),int:object)");
 NAME_ARGS(flags,targets,actions);
-//     Register a drop site, and possibly add default behaviors.<br>
-//   arguments:<br>
-//     buttons:     Which mouse buttons can be used to start the drag<br>
+//     Register a drop site, and possibly add default behaviors.<br />
+//   arguments:<br />
+//     buttons:     Which mouse buttons can be used to start the drag<br />
 //     targets:   Table of targets that can be accepted
 //            ({ ({ content_type(string), flags(int(try 0)), id(int) }), ...})
-//       The id will be received in the signal handlers.<br>
+//       The id will be received in the signal handlers.<br />
 //     actions:   one of CONST(GDK_ACTION_)
 //   results:
 RETURNS(GTK.Widget);
@@ -798,10 +798,10 @@ NAME_ARGS(image,mask);
 FUNCTION(drag_get_data, "function(object,int:object)");
 // Get the data from a context and an integer timestamp, requesting
 // it from the dropping client. This will probably never be used
-// directly.<p>
+// directly.
 //
-// Use the selection argument passed to the drag_data_received signal
-// instead.
+//<p>Use the selection argument passed to the drag_data_received signal
+// instead.</p>
 RETURNS(GTK.Widget);
 ARGS(GDK.DragContext,int);
 NAME_ARGS(context,time);
diff --git a/src/post_modules/GTK/source/gtkwindow.pre b/src/post_modules/GTK/source/gtkwindow.pre
index 5183ce3897d1635b0749caf83adde308e03ec424..2ad9f3b5eb9d95aa5852b8316186607526ad4034 100644
--- a/src/post_modules/GTK/source/gtkwindow.pre
+++ b/src/post_modules/GTK/source/gtkwindow.pre
@@ -31,7 +31,7 @@ void set_transient_for( window parent );
 // Most window managers renders transient windows differently (different
 // borders, sometimes no resize widgets etc)
 // <p>
-// Useful for short lived dialogs.
+// Useful for short lived dialogs.</p>
 void set_default_size( int width, int height );
 // The following differs from set_usize, in that
 // set_usize() overrides the requisition, and thus sets a minimum