diff --git a/include/boost/preprocessor/arithmetic/add.hpp b/include/boost/preprocessor/arithmetic/add.hpp
index c1f3397..4f0be0b 100644
--- a/include/boost/preprocessor/arithmetic/add.hpp
+++ b/include/boost/preprocessor/arithmetic/add.hpp
@@ -13,22 +13,19 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/arithmetic/add.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/dec.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/while.hpp>
 
-/** Expands to the sum of X and Y.
+/** <P>Expands to the sum of X and Y.</P>
 
-For example, BOOST_PP_ADD(4,3) expands to 7 (a single token).
+<P>For example, BOOST_PP_ADD(4,3) expands to 7 (a single token).</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_ADD(X,Y) BOOST_PP_ADD_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/arithmetic/div.hpp b/include/boost/preprocessor/arithmetic/div.hpp
index 5e4e5e3..30718e9 100644
--- a/include/boost/preprocessor/arithmetic/div.hpp
+++ b/include/boost/preprocessor/arithmetic/div.hpp
@@ -13,20 +13,17 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/arithmetic/div.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/comparison/less_equal.hpp>
 #include <boost/preprocessor/inc.hpp>
 
-/** Expands to the quotient of X and Y.
+/** <P>Expands to the quotient of X and Y.</P>
 
-For example, BOOST_PP_DIV(4,3) expands to 1 (a single token).
+<P>For example, BOOST_PP_DIV(4,3) expands to 1 (a single token).</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_DIV(X,Y) BOOST_PP_DIV_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/arithmetic/mod.hpp b/include/boost/preprocessor/arithmetic/mod.hpp
index 8b95ccc..ce66f1d 100644
--- a/include/boost/preprocessor/arithmetic/mod.hpp
+++ b/include/boost/preprocessor/arithmetic/mod.hpp
@@ -13,19 +13,16 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/arithmetic/mod.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/comparison/less_equal.hpp>
 
-/** Expands to the remainder of X and Y.
+/** <P>Expands to the remainder of X and Y.</P>
 
-For example, BOOST_PP_MOD(4,3) expands to 1 (a single token).
+<P>For example, BOOST_PP_MOD(4,3) expands to 1 (a single token).</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_MOD(X,Y) BOOST_PP_MOD_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/arithmetic/mul.hpp b/include/boost/preprocessor/arithmetic/mul.hpp
index 4b63c23..780e0de 100644
--- a/include/boost/preprocessor/arithmetic/mul.hpp
+++ b/include/boost/preprocessor/arithmetic/mul.hpp
@@ -13,19 +13,16 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/arithmetic/mul.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/arithmetic/add.hpp>
 
-/** Expands to the product of X and Y.
+/** <P>Expands to the product of X and Y.</P>
 
-For example, BOOST_PP_MUL(4,3) expands to 12 (a single token).
+<P>For example, BOOST_PP_MUL(4,3) expands to 12 (a single token).</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_MUL(X,Y) BOOST_PP_MUL_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/arithmetic/sub.hpp b/include/boost/preprocessor/arithmetic/sub.hpp
index 715d35c..7a2fe4a 100644
--- a/include/boost/preprocessor/arithmetic/sub.hpp
+++ b/include/boost/preprocessor/arithmetic/sub.hpp
@@ -13,21 +13,18 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/arithmetic/sub.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/dec.hpp>
 #include <boost/preprocessor/tuple/elem.hpp>
 #include <boost/preprocessor/while.hpp>
 
-/** Expands to the difference of X and Y.
+/** <P>Expands to the difference of X and Y.</P>
 
-For example, BOOST_PP_SUB(4,3) expands to 1 (a single token).
+<P>For example, BOOST_PP_SUB(4,3) expands to 1 (a single token).</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_SUB(X,Y) BOOST_PP_SUB_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/comparison/equal.hpp b/include/boost/preprocessor/comparison/equal.hpp
index 051a69c..ac00a75 100644
--- a/include/boost/preprocessor/comparison/equal.hpp
+++ b/include/boost/preprocessor/comparison/equal.hpp
@@ -13,18 +13,15 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/comparison/equal.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/comparison/not_equal.hpp>
 #include <boost/preprocessor/logical/not.hpp>
 
-/** Expands to 1 if X==Y and 0 otherwise.
+/** <P>Expands to 1 if X==Y and 0 otherwise.</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_EQUAL(X,Y) BOOST_PP_EQUAL_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/comparison/greater.hpp b/include/boost/preprocessor/comparison/greater.hpp
index de7afca..4a9c38b 100644
--- a/include/boost/preprocessor/comparison/greater.hpp
+++ b/include/boost/preprocessor/comparison/greater.hpp
@@ -13,17 +13,14 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/comparison/greater.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/comparison/less.hpp>
 
-/** Expands to 1 if X>Y and 0 otherwise.
+/** <P>Expands to 1 if X>Y and 0 otherwise.</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_GREATER(X,Y) BOOST_PP_GREATER_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/comparison/greater_equal.hpp b/include/boost/preprocessor/comparison/greater_equal.hpp
index a732b1b..6587ace 100644
--- a/include/boost/preprocessor/comparison/greater_equal.hpp
+++ b/include/boost/preprocessor/comparison/greater_equal.hpp
@@ -13,17 +13,14 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/comparison/greater_equal.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/comparison/less_equal.hpp>
 
-/** Expands to 1 if X>=Y and 0 otherwise.
+/** <P>Expands to 1 if X>=Y and 0 otherwise.</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_GREATER_EQUAL(X,Y) BOOST_PP_GREATER_EQUAL_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/comparison/less.hpp b/include/boost/preprocessor/comparison/less.hpp
index 98e9fe6..11ed184 100644
--- a/include/boost/preprocessor/comparison/less.hpp
+++ b/include/boost/preprocessor/comparison/less.hpp
@@ -13,19 +13,16 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/comparison/less.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/comparison/less_equal.hpp>
 #include <boost/preprocessor/comparison/not_equal.hpp>
 #include <boost/preprocessor/logical/and.hpp>
 
-/** Expands to 1 if X<Y and 0 otherwise.
+/** <P>Expands to 1 if X<Y and 0 otherwise.</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_LESS(X,Y) BOOST_PP_LESS_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/comparison/less_equal.hpp b/include/boost/preprocessor/comparison/less_equal.hpp
index 87f746d..9976bed 100644
--- a/include/boost/preprocessor/comparison/less_equal.hpp
+++ b/include/boost/preprocessor/comparison/less_equal.hpp
@@ -13,18 +13,15 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/comparison/less_equal.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/logical/not.hpp>
 
-/** Expands to 1 if X<=Y and 0 otherwise.
+/** <P>Expands to 1 if X<=Y and 0 otherwise.</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_LESS_EQUAL(X,Y) BOOST_PP_LESS_EQUAL_D(0,X,Y)
 
diff --git a/include/boost/preprocessor/comparison/not_equal.hpp b/include/boost/preprocessor/comparison/not_equal.hpp
index 739ed2a..dfac0af 100644
--- a/include/boost/preprocessor/comparison/not_equal.hpp
+++ b/include/boost/preprocessor/comparison/not_equal.hpp
@@ -13,19 +13,16 @@
  * See http://www.boost.org for most recent version.
  */
 
-/** \file
-
-<a href="../../../../boost/preprocessor/comparison/not_equal.hpp">Click here to see the header.</a>
-*/
-
 #include <boost/preprocessor/arithmetic/add.hpp>
 #include <boost/preprocessor/arithmetic/sub.hpp>
 #include <boost/preprocessor/logical/bool.hpp>
 
-/** Expands to 1 if X!=Y and 0 otherwise.
+/** <P>Expands to 1 if X!=Y and 0 otherwise.</P>
 
 <H3>Uses</H3>
-- BOOST_PP_WHILE()
+<UL>
+  <LI>BOOST_PP_WHILE()
+</UL>
 */
 #define BOOST_PP_NOT_EQUAL(X,Y) BOOST_PP_NOT_EQUAL_D(0,X,Y)