Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/DNUtils.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/DNUtils.java	(revision 469785)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/util/DNUtils.java	(working copy)
@@ -174,7 +174,7 @@
 
 
     /**
-     * Walk the buffer while characters are Alpha characters : <alpha> ::=
+     * Walk the buffer while characters are Alpha characters : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param byteArray
@@ -206,7 +206,7 @@
 
 
     /**
-     * Walk the buffer while characters are Alpha characters : <alpha> ::=
+     * Walk the buffer while characters are Alpha characters : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param charArray
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java	(revision 469785)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifReader.java	(working copy)
@@ -933,9 +933,9 @@
      * <mod-spec> <mod-specs-e> <mod-spec> ::= "add:" <mod-val> | "delete:"
      * <mod-val-del> | "replace:" <mod-val> <mod-specs-e> ::= <mod-spec>
      * <mod-specs-e> | e <mod-val> ::= FILL ATTRIBUTE-DESCRIPTION SEP
-     * ATTRVAL-SPEC <attrval-specs-e> "-" SEP <mod-val-del> ::= FILL
-     * ATTRIBUTE-DESCRIPTION SEP <attrval-specs-e> "-" SEP <attrval-specs-e> ::=
-     * ATTRVAL-SPEC <attrval-specs> | e *
+     * ATTRVAL-SPEC &lt;attrval-specs-e> "-" SEP <mod-val-del> ::= FILL
+     * ATTRIBUTE-DESCRIPTION SEP <attrval-specs-e> "-" SEP &lt;attrval-specs-e> ::=
+     * ATTRVAL-SPEC &lt;attrval-specs> | e *
      * 
      * @param entry
      *            The entry to feed
@@ -1061,7 +1061,7 @@
      * "newsuperior:" line is expected 5) Modify :
      * 
      * The grammar is : <changerecord> ::= "changetype:" FILL "add" SEP
-     * <attrval-spec> <attrval-specs-e> | "changetype:" FILL "delete" |
+     * <attrval-spec> &lt;attrval-specs-e> | "changetype:" FILL "delete" |
      * "changetype:" FILL "modrdn" SEP <newrdn> SEP <deleteoldrdn> SEP | // To
      * be checked "changetype:" FILL "moddn" SEP <newrdn> SEP <deleteoldrdn> SEP
      * <newsuperior> SEP | "changetype:" FILL "modify" SEP <mod-spec>
@@ -1070,8 +1070,8 @@
      * FILL "1" <newsuperior> ::= "newsuperior:" FILL DN | "newsuperior::" FILL
      * BASE64-DN <mod-specs-e> ::= <mod-spec> <mod-specs-e> | e <mod-spec> ::=
      * "add:" <mod-val> | "delete:" <mod-val> | "replace:" <mod-val> <mod-val>
-     * ::= FILL ATTRIBUTE-DESCRIPTION SEP ATTRVAL-SPEC <attrval-specs-e> "-" SEP
-     * <attrval-specs-e> ::= ATTRVAL-SPEC <attrval-specs> | e
+     * ::= FILL ATTRIBUTE-DESCRIPTION SEP ATTRVAL-SPEC &lt;attrval-specs-e> "-" SEP
+     * <attrval-specs-e> ::= ATTRVAL-SPEC &lt;attrval-specs> | e
      * 
      * @param entry
      *            The entry to feed
@@ -1160,7 +1160,7 @@
      * 
      * <ldif-file> ::= <ldif-attrval-record> <ldif-attrval-records> |
      * <ldif-change-record> <ldif-change-records> <ldif-attrval-record> ::=
-     * <dn-spec> <sep> <attrval-spec> <attrval-specs> <ldif-change-record> ::=
+     * <dn-spec> <sep> <attrval-spec> &lt;attrval-specs> <ldif-change-record> ::=
      * <dn-spec> <sep> <controls-e> <changerecord> <dn-spec> ::= "dn:" <fill>
      * <distinguishedName> | "dn::" <fill> <base64-distinguishedName>
      * <changerecord> ::= "changetype:" <fill> <change-op>
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java	(revision 469785)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/DNUtils.java	(working copy)
@@ -239,7 +239,7 @@
 
 
     /**
-     * Walk the buffer while characters are Alpha characters : <alpha> ::=
+     * Walk the buffer while characters are Alpha characters : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param byteArray
@@ -271,7 +271,7 @@
 
 
     /**
-     * Walk the buffer while characters are Alpha characters : <alpha> ::=
+     * Walk the buffer while characters are Alpha characters : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param charArray
Index: shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java
===================================================================
--- shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java	(revision 469785)
+++ shared/ldap/src/main/java/org/apache/directory/shared/ldap/util/StringTools.java	(working copy)
@@ -81,7 +81,7 @@
 
     private static final int UTF8_SIX_BYTES = 0x00FC;
 
-    /** <alpha> ::= [0x41-0x5A] | [0x61-0x7A] */
+    /** &lt;alpha> ::= [0x41-0x5A] | [0x61-0x7A] */
     public static final boolean[] ALPHA =
         { 
             false, false, false, false, false, false, false, false, 
@@ -102,7 +102,7 @@
             true,  true,  true,  false, false, false, false, false 
         };
 
-    /** <alpha> | <digit> | '-' */
+    /** &lt;alpha> | <digit> | '-' */
     public static final boolean[] CHAR =
         { 
             false, false, false, false, false, false, false, false, 
@@ -1610,7 +1610,7 @@
 
 
     /**
-     * Test if the current character is an Alpha character : <alpha> ::=
+     * Test if the current character is an Alpha character : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param byteArray
@@ -1643,7 +1643,7 @@
 
 
     /**
-     * Test if the current character is an Alpha character : <alpha> ::=
+     * Test if the current character is an Alpha character : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param chars
@@ -1675,7 +1675,7 @@
     }
 
     /**
-     * Test if the current character is an Alpha character : <alpha> ::=
+     * Test if the current character is an Alpha character : &lt;alpha> ::=
      * [0x41-0x5A] | [0x61-0x7A]
      * 
      * @param string
@@ -1802,7 +1802,7 @@
 
     /**
      * Check if the current character is an 7 bits ASCII CHAR (between 0 and
-     * 127). <char> ::= <alpha> | <digit> | '-'
+     * 127). <char> ::= &lt;alpha> | <digit> | '-'
      * 
      * @param byteArray
      *            The buffer which contains the data
@@ -1834,7 +1834,7 @@
 
     /**
      * Check if the current character is an 7 bits ASCII CHAR (between 0 and
-     * 127). <char> ::= <alpha> | <digit> | '-'
+     * 127). <char> ::= &lt;alpha> | <digit> | '-'
      * 
      * @param chars
      *            The buffer which contains the data
@@ -1865,7 +1865,7 @@
 
     /**
      * Check if the current character is an 7 bits ASCII CHAR (between 0 and
-     * 127). <char> ::= <alpha> | <digit> | '-'
+     * 127). <char> ::= &lt;alpha> | <digit> | '-'
      * 
      * @param string
      *            The string which contains the data