diff --git a/Text/Wiki/Render/Cowiki/Prefilter.php b/Text/Wiki/Render/Cowiki/Prefilter.php
index ee95d62..62e83c0 100644
--- a/Text/Wiki/Render/Cowiki/Prefilter.php
+++ b/Text/Wiki/Render/Cowiki/Prefilter.php
@@ -1,35 +1,20 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at                              |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Paul M. Jones <pmjones@php.net>                          |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-
+// vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
 /**
-* 
-* This class implements a Text_Wiki_Render_Xhtml to "pre-filter" source text so
-* that line endings are consistently \n, lines ending in a backslash \
-* are concatenated with the next line, and tabs are converted to spaces.
-*
-* @author Paul M. Jones <pmjones@php.net>
-*
-* @package Text_Wiki
-*
-*/
+ * This class implements a Text_Wiki_Render_CoWiki to "pre-filter" source text so
+ * that line endings are consistently \n, lines ending in a backslash \
+ * are concatenated with the next line, and tabs are converted to spaces.
+ *
+ * PHP versions 4 and 5
+ *
+ * @category   Text
+ * @package    Text_Wiki
+ * @author     Paul M. Jones <pmjones@php.net>
+ * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Wiki
+ */
+
 
 class Text_Wiki_Render_CoWiki_Prefilter extends Text_Wiki_Render {
     function token()
diff --git a/Text/Wiki/Render/Doku/Prefilter.php b/Text/Wiki/Render/Doku/Prefilter.php
index 86cd7b2..622d313 100644
--- a/Text/Wiki/Render/Doku/Prefilter.php
+++ b/Text/Wiki/Render/Doku/Prefilter.php
@@ -1,35 +1,20 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at                              |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Paul M. Jones <pmjones@php.net>                          |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-
+// vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
 /**
-* 
-* This class implements a Text_Wiki_Render_Xhtml to "pre-filter" source text so
-* that line endings are consistently \n, lines ending in a backslash \
-* are concatenated with the next line, and tabs are converted to spaces.
-*
-* @author Paul M. Jones <pmjones@php.net>
-*
-* @package Text_Wiki
-*
-*/
+ * This class implements a Text_Wiki_Render_Doku to "pre-filter" source text so
+ * that line endings are consistently \n, lines ending in a backslash \
+ * are concatenated with the next line, and tabs are converted to spaces.
+ *
+ * PHP versions 4 and 5
+ *
+ * @category   Text
+ * @package    Text_Wiki
+ * @author     Paul M. Jones <pmjones@php.net>
+ * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Wiki
+ */
+
 
 class Text_Wiki_Render_Doku_Prefilter extends Text_Wiki_Render {
     function token()
diff --git a/Text/Wiki/Render/Latex/Prefilter.php b/Text/Wiki/Render/Latex/Prefilter.php
index 974697a..97fa666 100644
--- a/Text/Wiki/Render/Latex/Prefilter.php
+++ b/Text/Wiki/Render/Latex/Prefilter.php
@@ -1,7 +1,7 @@
 <?php
 // vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
 /**
- * This class implements a Text_Wiki_Render_Xhtml to "pre-filter" source text so
+ * This class implements a Text_Wiki_Render_Latex to "pre-filter" source text so
  * that line endings are consistently \n, lines ending in a backslash \
  * are concatenated with the next line, and tabs are converted to spaces.
  *
@@ -15,38 +15,6 @@
  * @link       http://pear.php.net/package/Text_Wiki
  */
 
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at                              |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors:                            |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-
-/**
-* 
-* This class implements a Text_Wiki_Render_Latex to "pre-filter" source text so
-* that line endings are consistently \n, lines ending in a backslash \
-* are concatenated with the next line, and tabs are converted to spaces.
-*
-* @author Jeremy Cowgar <jeremy@cowgar.com>
-*
-* @package Text_Wiki
-*
-*/
-
 class Text_Wiki_Render_Latex_Prefilter extends Text_Wiki_Render {
     function token()
     {
diff --git a/Text/Wiki/Render/Plain/Prefilter.php b/Text/Wiki/Render/Plain/Prefilter.php
index 17d48eb..1879fd1 100755
--- a/Text/Wiki/Render/Plain/Prefilter.php
+++ b/Text/Wiki/Render/Plain/Prefilter.php
@@ -1,7 +1,7 @@
 <?php
 // vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
 /**
- * This class implements a Text_Wiki_Render_Xhtml to "pre-filter" source text so
+ * This class implements a Text_Wiki_Render_Plain to "pre-filter" source text so
  * that line endings are consistently \n, lines ending in a backslash \
  * are concatenated with the next line, and tabs are converted to spaces.
  *
diff --git a/Text/Wiki/Render/Tiki/Prefilter.php b/Text/Wiki/Render/Tiki/Prefilter.php
index 936349d..84fcd3e 100644
--- a/Text/Wiki/Render/Tiki/Prefilter.php
+++ b/Text/Wiki/Render/Tiki/Prefilter.php
@@ -1,35 +1,20 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at                              |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Paul M. Jones <pmjones@php.net>                          |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-
+// vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
 /**
-* 
-* This class implements a Text_Wiki_Render_Xhtml to "pre-filter" source text so
-* that line endings are consistently \n, lines ending in a backslash \
-* are concatenated with the next line, and tabs are converted to spaces.
-*
-* @author Paul M. Jones <pmjones@php.net>
-*
-* @package Text_Wiki
-*
-*/
+ * This class implements a Text_Wiki_Render_Plain to "pre-filter" source text so
+ * that line endings are consistently \n, lines ending in a backslash \
+ * are concatenated with the next line, and tabs are converted to spaces.
+ *
+ * PHP versions 4 and 5
+ *
+ * @category   Text
+ * @package    Text_Wiki
+ * @author     Paul M. Jones <pmjones@php.net>
+ * @license    http://www.gnu.org/copyleft/lesser.html  LGPL License 2.1
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Wiki
+ */
+
 
 class Text_Wiki_Render_Tiki_Prefilter extends Text_Wiki_Render {
     function token()