diff --git a/doc/CoeffwiseMathFunctionsTable.dox b/doc/CoeffwiseMathFunctionsTable.dox
index 53e3e18b1..ae4053360 100644
--- a/doc/CoeffwiseMathFunctionsTable.dox
+++ b/doc/CoeffwiseMathFunctionsTable.dox
@@ -474,8 +474,8 @@ This also means that, unless specified, if the function \c std::foo is available
 <tr>
   <td class="code">
   \anchor cwisetable_less
-  a \link ArrayBase::operator<  operator< \endlink(b); \n
-  a \link ArrayBase::operator<  operator< \endlink(s);
+  a.\c operator<(b); \n
+  a.\c operator<(s);
   </td>
   <td>coefficient-wise less than comparison (\f$ a_i \lt b_i \f$). \n
   \c a and \c b can be either an array or scalar.</td>
@@ -487,8 +487,8 @@ This also means that, unless specified, if the function \c std::foo is available
 <tr>
   <td class="code">
   \anchor cwisetable_less_equal
-  a \link ArrayBase::operator<=  operator<= \endlink(b); \n
-  a \link ArrayBase::operator<=  operator<= \endlink(s);
+  a.\c operator<=(b); \n
+  a.\c operator<=(s);
   </td>
   <td>coefficient-wise less than or equal comparison (\f$ a_i \le b_i \f$). \n
   \c a and \c b can be either an array or scalar.</td>
@@ -500,8 +500,8 @@ This also means that, unless specified, if the function \c std::foo is available
 <tr>
   <td class="code">
   \anchor cwisetable_greater
-  a \link ArrayBase::operator>  operator> \endlink(b); \n
-  a \link ArrayBase::operator>  operator> \endlink(s);
+  a.\c operator>(b); \n
+  a.\c operator>(s);
   </td>
   <td>coefficient-wise greater than comparison (\f$ a_i \gt b_i \f$). \n
   \c a and \c b can be either an array or scalar.</td>
@@ -513,8 +513,8 @@ This also means that, unless specified, if the function \c std::foo is available
 <tr>
   <td class="code">
   \anchor cwisetable_greater_equal
-  a \link ArrayBase::operator>=  operator>= \endlink(b); \n
-  a \link ArrayBase::operator>=  operator>= \endlink(s);
+  a.\c operator>=(b); \n
+  a.\c operator>=(s);
   </td>
   <td>coefficient-wise greater than or equal comparison (\f$ a_i \ge b_i \f$). \n
   \c a and \c b can be either an array or scalar.</td>
@@ -526,8 +526,8 @@ This also means that, unless specified, if the function \c std::foo is available
 <tr>
   <td class="code">
   \anchor cwisetable_equal
-  a \link ArrayBase::operator==  operator== \endlink(b); \n
-  a \link ArrayBase::operator==  operator== \endlink(s);
+  a.\c operator==(b); \n
+  a.\c operator==(s);
   </td>
   <td>coefficient-wise equality comparison (\f$ a_i = b_i \f$). \n
   \c a and \c b can be either an array or scalar. \n
@@ -540,8 +540,8 @@ This also means that, unless specified, if the function \c std::foo is available
 <tr>
   <td class="code">
   \anchor cwisetable_not_equal
-  a \link ArrayBase::operator!=  operator!= \endlink(b); \n
-  a \link ArrayBase::operator!=  operator!= \endlink(s);
+  a.\c operator!=(b); \n
+  a.\c operator!=(s);
   </td>
   <td>coefficient-wise not-equal comparison (\f$ a_i \ne b_i \f$). \n
   \c a and \c b can be either an array or scalar. \n
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 367f70707..445fc0a6f 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -128,8 +128,6 @@ PREDEFINED             = EIGEN_EMPTY_STRUCT \
                          EIGEN_STRONG_INLINE=inline \
                          EIGEN_DEVICE_FUNC= \
                          "EIGEN_MAKE_CWISE_BINARY_OP(METHOD,FUNCTOR)=template<typename OtherDerived> const CwiseBinaryOp<FUNCTOR<Scalar>, const Derived, const OtherDerived> METHOD(const EIGEN_CURRENT_STORAGE_BASE_CLASS<OtherDerived> &other) const;" \
-                         "EIGEN_MAKE_CWISE_COMP_OP(OP,COMPARATOR)=template<typename OtherDerived> const CwiseBinaryOp<internal::scalar_cmp_op<Scalar, typename OtherDerived::Scalar, EIGEN_CAT(internal::cmp_,COMPARATOR)>, const Derived, const OtherDerived> OP(const EIGEN_CURRENT_STORAGE_BASE_CLASS<OtherDerived> &other) const;" \
-                         "EIGEN_MAKE_CWISE_COMP_R_OP(OP,R_OP,RCOMPARATOR)=template<typename OtherDerived> const CwiseBinaryOp<internal::scalar_cmp_op<typename OtherDerived::Scalar, Scalar, EIGEN_CAT(internal::cmp_,RCOMPARATOR)>, const OtherDerived, const Derived> OP(const EIGEN_CURRENT_STORAGE_BASE_CLASS<OtherDerived> &other) const;" \
                          "EIGEN_CWISE_PRODUCT_RETURN_TYPE(LHS,RHS)=CwiseBinaryOp<internal::scalar_product_op<LHS::Scalar,RHS::Scalar>, const LHS, const RHS>" \
                          "EIGEN_CAT2(a,b)= a ## b" \
                          "EIGEN_CAT(a,b)=EIGEN_CAT2(a,b)" \